[Armadeus-commitlog] SF.net SVN: armadeus:[851] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[851] trunk
|
From: <ar...@us...> - 2008-07-23 12:51:16
|
Revision: 851
http://armadeus.svn.sourceforge.net/armadeus/?rev=851&view=rev
Author: artemys
Date: 2008-07-23 12:51:25 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
[LINUX] Cleanup apf9328_init() + remove unneeded request_mem_region(IMX_CS1_PHYS)
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
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-23 12:42:22 UTC (rev 850)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/021-linux-2.6.23.1-apf9328.diff 2008-07-23 12:51:25 UTC (rev 851)
@@ -2,8 +2,8 @@
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-2.6.23.1.mod/arch/arm/mach-imx/apf9328.c 2008-07-23 14:39:36.000000000 +0200
+@@ -0,0 +1,558 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -484,42 +484,33 @@
+{
+ printk("--- Registering APF9328 ressources\n");
+
-+ // Serial
-+ /*UFCR(IMX_UART1_BASE) = 0xa81; To be removed
-+ UFCR(IMX_UART2_BASE) = 0xa81;*/
-+ // LCD
-+#ifdef CONFIG_FB_IMX
++#ifdef CONFIG_FB_IMX /* LCD */
+ set_imx_fb_info(&apf9328_fb_info);
-+ printk("Set apf9328_fb_info\n");
-+ // init PORTD ....//
-+ imx_fb_set_gpios();
-+#endif // CONFIG_FB_IMX
++ imx_fb_set_gpios(); /* init PORTD ....*/
++#endif
+
+#ifdef CONFIG_SENSORS_MAX1027
+ max1027_init_cs();
-+#endif //CONFIG_SENSORS_MAX1027
++#endif
+#ifdef CONFIG_SPI_TSC2102
+ tsc2102_init_gpio();
-+#endif // CONFIG_SPI_TSC2102
++#endif
+#ifdef CONFIG_CAN_MCP251X
+ mcp251X_init_gpio();
-+#endif // CONFIG_CAN_MCP251X
++#endif
+
+ platform_add_devices(devices, ARRAY_SIZE(devices));
++
+#if defined (CONFIG_SENSORS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
+ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+#endif
+
-+#ifdef CONFIG_ARMADEUS_FPGA_DRIVERS
-+ request_mem_region(IMX_CS1_PHYS,IMX_CS1_SIZE,"FPGA");
-+#endif // CONFIG_ARMADEUS_FPGA_DRIVERS
-+
+ printk("--- APF9328 ressources registered\n");
+}
+
+/*
+ * Register here the memory addresses we want to access from our drivers and
-+ * which are not already registerd in generic.c
++ * which are not already registered in generic.c
+ */
+static struct map_desc apf9328_io_desc[] __initdata = {
+#ifdef CONFIG_FB_IMX
@@ -575,7 +566,7 @@
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
++++ linux-2.6.23.1.mod/arch/arm/mach-imx/apf9328_lcd_config.h 2008-07-23 14:39:36.000000000 +0200
@@ -0,0 +1,199 @@
+/*
+ *
@@ -780,7 +771,7 @@
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
++++ linux-2.6.23.1.mod/include/asm-arm/arch-imx/apf9328.h 2008-07-23 14:39:36.000000000 +0200
@@ -0,0 +1,54 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/target/linux/arch/arm/mach-imx/apf9328.c
===================================================================
--- trunk/target/linux/arch/arm/mach-imx/apf9328.c 2008-07-23 12:42:22 UTC (rev 850)
+++ trunk/target/linux/arch/arm/mach-imx/apf9328.c 2008-07-23 12:51:25 UTC (rev 851)
@@ -478,42 +478,33 @@
{
printk("--- Registering APF9328 ressources\n");
- // Serial
- /*UFCR(IMX_UART1_BASE) = 0xa81; To be removed
- UFCR(IMX_UART2_BASE) = 0xa81;*/
- // LCD
-#ifdef CONFIG_FB_IMX
+#ifdef CONFIG_FB_IMX /* LCD */
set_imx_fb_info(&apf9328_fb_info);
- printk("Set apf9328_fb_info\n");
- // init PORTD ....//
- imx_fb_set_gpios();
-#endif // CONFIG_FB_IMX
+ imx_fb_set_gpios(); /* init PORTD ....*/
+#endif
#ifdef CONFIG_SENSORS_MAX1027
max1027_init_cs();
-#endif //CONFIG_SENSORS_MAX1027
+#endif
#ifdef CONFIG_SPI_TSC2102
tsc2102_init_gpio();
-#endif // CONFIG_SPI_TSC2102
+#endif
#ifdef CONFIG_CAN_MCP251X
mcp251X_init_gpio();
-#endif // CONFIG_CAN_MCP251X
+#endif
platform_add_devices(devices, ARRAY_SIZE(devices));
+
#if defined (CONFIG_SENSORS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
#endif
-#ifdef CONFIG_ARMADEUS_FPGA_DRIVERS
- request_mem_region(IMX_CS1_PHYS,IMX_CS1_SIZE,"FPGA");
-#endif // CONFIG_ARMADEUS_FPGA_DRIVERS
-
printk("--- APF9328 ressources registered\n");
}
/*
* Register here the memory addresses we want to access from our drivers and
- * which are not already registerd in generic.c
+ * which are not already registered in generic.c
*/
static struct map_desc apf9328_io_desc[] __initdata = {
#ifdef CONFIG_FB_IMX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|