[Armadeus-commitlog] SF.net SVN: armadeus:[847] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[847] trunk
|
From: <ar...@us...> - 2008-07-22 09:09:47
|
Revision: 847
http://armadeus.svn.sourceforge.net/armadeus/?rev=847&view=rev
Author: artemys
Date: 2008-07-22 09:09:55 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
[LINUX] Add APF9328 FPGA interrupt definition to apf9328.h & apf9328.c + little cleanup
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
trunk/target/linux/arch/arm/mach-imx/apf9328.c
trunk/target/linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-07-21 17:56:15 UTC (rev 846)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-07-22 09:09:55 UTC (rev 847)
@@ -1,6 +1,9 @@
---- linux-2.6.23.1.1/arch/arm/mach-imx/apf9328.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.1.mod/arch/arm/mach-imx/apf9328.c 2008-04-01 16:15:37.000000000 +0200
-@@ -0,0 +1,570 @@
+PATCH AUTOMATICALLY GENERATED
+DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
+(Take a look at armadeus/target/linux/ directory to know how to generate it)
+--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-07-22 11:04:04.000000000 +0200
+@@ -0,0 +1,567 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -393,7 +396,7 @@
+ .transceiver_enable = NULL,
+};
+
-+#endif
++#endif // CONFIG_CAN_MCP251X
+
+
+static struct spi_board_info spi_board_info[] __initdata = {
@@ -541,23 +544,20 @@
+{
+ // Init generic IRQs
+ imx_init_irq();
++
+ // Init our custom IRQs
-+ set_irq_type(APF9328_UART1_IRQ, IRQF_TRIGGER_FALLING);
+#ifdef CONFIG_DM9000
+ set_irq_type(APF9328_ETH_IRQ, IRQF_TRIGGER_FALLING);
-+#endif // CONFIG_DM9000
++#endif
+#ifdef CONFIG_SPI_TSC2102
+ set_irq_type( IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING );
-+#endif // CONFIG_SPI_TSC2102
++#endif
+#ifdef CONFIG_CAN_MCP251X
+ set_irq_type( IRQ_GPIOC(CAN_MPC251X_INT_GPIOC), IRQF_TRIGGER_FALLING );
-+#endif // CONFIG_CAN_MCP251X
-+
++#endif
+#ifdef CONFIG_ARMADEUS_FPGA_DRIVERS
-+#define FPGA_INT_GPIOA 1
-+ set_irq_type(IRQ_GPIOA(FPGA_INT_GPIOA),IRQF_TRIGGER_RISING);
-+#endif // CONFIG_ARMADEUS_FPGA_DRIVERS
-+
++ set_irq_type( APF9328_FPGA_IRQ, IRQF_TRIGGER_RISING );
++#endif
+}
+
+
@@ -571,9 +571,12 @@
+ .timer = &imx_timer,
+ .init_machine = apf9328_init,
+MACHINE_END
---- linux-2.6.23.1.1/arch/arm/mach-imx/apf9328_lcd_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2007-01-07 21:40:59.000000000 +0100
-@@ -0,0 +1,189 @@
+PATCH AUTOMATICALLY GENERATED
+DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
+(Take a look at armadeus/target/linux/ directory to know how to generate it)
+--- linux-2.6.23.1.original/arch/arm/mach-imx/apf9328_lcd_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-07-22 10:33:25.000000000 +0200
+@@ -0,0 +1,199 @@
+/*
+ *
+ * Armadeus LCD configuration file
@@ -601,6 +604,9 @@
+#define BACKLIGHT_ON 0x000000ff
+#define DEFAULT_DMA_SETTINGS (DMACR_BURST | DMACR_HM(8) | DMACR_TM(4))
+
++/*
++ * Power on/off LCD's internal logic
++ */
+static void apf9328_lcd_power(int on)
+{
+ pr_debug("apf9328_lcd_power: %s\n", on ? "on":"off");
@@ -613,7 +619,7 @@
+ // No LCD powerdown yet
+#elif CONFIG_FB_IMX_SHARP_LQ043_TFT
+ if(on) {
-+ mdelay(200); // at least ten frames have to be processed before
++ mdelay(200); // at least ten frames have to be processed before
+ // enabling the display
+ DR(LCD_PORT) |= (1 << SHARP_LQ043_POWER_DOWN);
+ }
@@ -627,6 +633,9 @@
+#endif // CONFIG_FB_IMX_OPTREX_F51900_CSTN
+}
+
++/*
++ * Power on/off LCD's backlight
++ */
+static void apf9328_lcd_backlight_power(int on)
+{
+ if(on)
@@ -635,6 +644,7 @@
+ LCDC_PWMR &= ~BACKLIGHT_ON;
+}
+
++
+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
+static struct imxfb_mach_info apf9328_fb_info __initdata = {
+ .pixclock = 62500,
@@ -739,6 +749,9 @@
+#error Please define a imxfb_mach_info structure with your LCD parameters here
+#endif
+
++/*
++ * Configure custom GPIOs needed by LCDs
++ */
+static void imx_fb_set_gpios(void)
+{
+
@@ -763,9 +776,12 @@
+#endif // CONFIG_FB_IMX
+
+#endif // APF9328_LCD_CONFIG_H
---- ref/linux-2.6.23.1/include/asm-arm/arch-imx/apf9328.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1/include/asm-arm/arch-imx/apf9328.h 2006-10-07 20:09:07.000000000 +0200
-@@ -0,0 +1,60 @@
+PATCH AUTOMATICALLY GENERATED
+DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
+(Take a look at armadeus/target/linux/ directory to know how to generate it)
+--- linux-2.6.23.1.original/include/asm-arm/arch-imx/apf9328.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-07-22 10:33:25.000000000 +0200
+@@ -0,0 +1,54 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
+ *
@@ -794,14 +810,6 @@
+/* Memory Map for the APF9328 Board */
+/* ------------------------------------------------------------------------ */
+
-+// Serial ports
-+#define APF9328_UART1_VIRT ( IMX_CS3_VIRT + 0x30000 )
-+#define APF9328_UART1_PHYS ( IMX_CS3_PHYS + 0x30000 )
-+#define APF9328_UART1_IRQ ( IRQ_GPIOA(1) )
-+#define APF9328_UART2_VIRT ( IMX_CS3_VIRT + 0x10000 )
-+#define APF9328_UART2_PHYS ( IMX_CS3_PHYS + 0x10000 )
-+#define APF9328_UART2_IRQ ( IRQ_GPIOA(1) )
-+
+// Ethernet
+#define APF9328_ETH_VIRT ( IMX_CS4_VIRT + 0x00C00000 )
+#define APF9328_ETH_PHYS ( IMX_CS4_PHYS + 0x00C00000 )
@@ -821,7 +829,9 @@
+// Usefull ?
+
+// FPGA
-+// TBDL
++#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
++#define APF9328_FPGA_PHYS ( IMX_CS1_PHYS )
++#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
+
+#define CLK32 32768
+
Modified: trunk/target/linux/arch/arm/mach-imx/apf9328.c
===================================================================
--- trunk/target/linux/arch/arm/mach-imx/apf9328.c 2008-07-21 17:56:15 UTC (rev 846)
+++ trunk/target/linux/arch/arm/mach-imx/apf9328.c 2008-07-22 09:09:55 UTC (rev 847)
@@ -390,7 +390,7 @@
.transceiver_enable = NULL,
};
-#endif
+#endif // CONFIG_CAN_MCP251X
static struct spi_board_info spi_board_info[] __initdata = {
@@ -538,23 +538,20 @@
{
// Init generic IRQs
imx_init_irq();
+
// Init our custom IRQs
- set_irq_type(APF9328_UART1_IRQ, IRQF_TRIGGER_FALLING);
#ifdef CONFIG_DM9000
set_irq_type(APF9328_ETH_IRQ, IRQF_TRIGGER_FALLING);
-#endif // CONFIG_DM9000
+#endif
#ifdef CONFIG_SPI_TSC2102
set_irq_type( IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING );
-#endif // CONFIG_SPI_TSC2102
+#endif
#ifdef CONFIG_CAN_MCP251X
set_irq_type( IRQ_GPIOC(CAN_MPC251X_INT_GPIOC), IRQF_TRIGGER_FALLING );
-#endif // CONFIG_CAN_MCP251X
-
+#endif
#ifdef CONFIG_ARMADEUS_FPGA_DRIVERS
-#define FPGA_INT_GPIOA 1
- set_irq_type(IRQ_GPIOA(FPGA_INT_GPIOA),IRQF_TRIGGER_RISING);
-#endif // CONFIG_ARMADEUS_FPGA_DRIVERS
-
+ set_irq_type( APF9328_FPGA_IRQ, IRQF_TRIGGER_RISING );
+#endif
}
Modified: trunk/target/linux/include/asm-arm/arch-imx/apf9328.h
===================================================================
--- trunk/target/linux/include/asm-arm/arch-imx/apf9328.h 2008-07-21 17:56:15 UTC (rev 846)
+++ trunk/target/linux/include/asm-arm/arch-imx/apf9328.h 2008-07-22 09:09:55 UTC (rev 847)
@@ -26,14 +26,6 @@
/* Memory Map for the APF9328 Board */
/* ------------------------------------------------------------------------ */
-// Serial ports
-#define APF9328_UART1_VIRT ( IMX_CS3_VIRT + 0x30000 )
-#define APF9328_UART1_PHYS ( IMX_CS3_PHYS + 0x30000 )
-#define APF9328_UART1_IRQ ( IRQ_GPIOA(1) )
-#define APF9328_UART2_VIRT ( IMX_CS3_VIRT + 0x10000 )
-#define APF9328_UART2_PHYS ( IMX_CS3_PHYS + 0x10000 )
-#define APF9328_UART2_IRQ ( IRQ_GPIOA(1) )
-
// Ethernet
#define APF9328_ETH_VIRT ( IMX_CS4_VIRT + 0x00C00000 )
#define APF9328_ETH_PHYS ( IMX_CS4_PHYS + 0x00C00000 )
@@ -53,7 +45,9 @@
// Usefull ?
// FPGA
-// TBDL
+#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
+#define APF9328_FPGA_PHYS ( IMX_CS1_PHYS )
+#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
#define CLK32 32768
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|