[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-389-g7febe02

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7febe02a37193ed1dfe3c23134edbbd7a4f8a698 (commit)
       via  ee94bcf8447a8b7e2617afd514ee4d6e0755f11d (commit)
       via  e88d66bf9a8124f5e207a39e759d8da26b097680 (commit)
      from  b50858aab9762db5b3689af27c65d5506c10c784 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7febe02a37193ed1dfe3c23134edbbd7a4f8a698
Author: gwenhael <gw...@tr...>
Date:   Wed Mar 2 08:00:22 2011 +0100

    [LINUX][2.6.38][APF9328] Allow lcd selection through kernel commandline

commit ee94bcf8447a8b7e2617afd514ee4d6e0755f11d
Author: gwenhael <gw...@tr...>
Date:   Wed Mar 2 08:00:06 2011 +0100

    [LINUX][2.6.38][APF9328] Adapt Select for framebuffer in Kconfig

commit e88d66bf9a8124f5e207a39e759d8da26b097680
Author: gwenhael <gw...@tr...>
Date:   Wed Mar 2 07:59:51 2011 +0100

    [LINUX][2.6.38][APF9328] MX1: Add structure, registration functions for framebuffer and rename LCDC INT

-----------------------------------------------------------------------

Summary of changes:
 .../2.6.38/021-armadeus-apf9328.patch              |   47 ++++++++++++++------
 ...s-apf9328-add_board_to_linux_build_system.patch |   20 +++++---
 .../2.6.38/080-armadeus-add_fb_support.patch       |   39 ++++++++++++++++
 3 files changed, 84 insertions(+), 22 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/080-armadeus-add_fb_support.patch

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
index 01a3e7d..15adb6d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
@@ -591,7 +591,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
 ===================================================================
 --- /dev/null
 +++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
-@@ -0,0 +1,329 @@
+@@ -0,0 +1,348 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -851,18 +851,17 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
 +
 +	pr_debug("%s\n", __func__);
 +
-+# ifdef CONFIG_FB_IMX_OPTREX_F51900_CSTN
-+	gpio_set_value(OPTREX_F51900_POWER_DOWN, 1); /* Initializes it High */
-+	mxc_gpio_mode(OPTREX_F51900_POWER_DOWN | GPIO_OUT | GPIO_DR);
-+# endif
-+# ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+	/* ACD_OE (SHARP_LQ043_POWER_DOWN) used as power down signal */
-+	gpio_set_value(SHARP_LQ043_POWER_DOWN, 0); /* Initializes it Low */
-+	mxc_gpio_mode(SHARP_LQ043_POWER_DOWN | GPIO_OUT | GPIO_GPIO);//1<<16 | 3<<10);
-+# else
-+	/* otherwise use ACD_OE as standard LCD controller signal */
-+	mxc_gpio_mode(PD12_PF_ACD_OE);
-+# endif
++	if (!strcmp("Optrex-FS1900", lcd_name)) {
++		gpio_set_value(OPTREX_F51900_POWER_DOWN, 1); /* Initializes it High */
++		mxc_gpio_mode(OPTREX_F51900_POWER_DOWN | GPIO_OUT | GPIO_GPIO);
++	} else if (!strcmp("Sharp-LQ043", lcd_name)) {
++		/* ACD_OE (SHARP_LQ043_POWER_DOWN) used as power down signal */
++		gpio_set_value(SHARP_LQ043_POWER_DOWN, 0); /* Initializes it Low */
++		mxc_gpio_mode(SHARP_LQ043_POWER_DOWN | GPIO_OUT | GPIO_GPIO);//1<<16 | 3<<10);
++	} else {
++		/* otherwise use ACD_OE as standard LCD controller signal */
++		mxc_gpio_mode(PD12_PF_ACD_OE);
++	}
 +
 +	if (fb_inf->mode->pcr & PCR_TFT)
 +		width = 16;
@@ -914,7 +913,27 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
 +
 +static void apf9328_init_lcd(void)
 +{
-+	mxc_register_device(&mxc_fb_device, &apf_fb_data);
++	char *opt, *name = NULL, *options = NULL;
++
++	if (fb_get_options("imxfb", &options))
++		goto end;
++
++	if (!options || !*options)
++		goto end;
++
++	while ((opt = strsep(&options, ",")) != NULL) {
++		if (!*opt)
++			continue;
++		else
++			name = opt;
++	}
++
++	apf_set_lcd_name(name);
++	apf_fb_set_default_contrast();
++
++	imx1_add_imx_fb(&apf_fb_data);
++end:
++	return;
 +}
 +#endif /* CONFIG_MACH_APF9328 */
 +
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 7ea85e4..f226cb7 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -1,6 +1,8 @@
---- a/arch/arm/mach-imx/Kconfig	2010-11-29 07:34:56.000000000 +0100
-+++ b/arch/arm/mach-imx/Kconfig	2010-11-27 14:51:34.000000000 +0100
-@@ -13,6 +13,9 @@
+Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Kconfig
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
+@@ -37,6 +37,9 @@ comment "MX1 platforms:"
  config MACH_MXLADS
  	bool
  
@@ -10,7 +12,7 @@
  config ARCH_MX1ADS
  	bool "MX1ADS platform"
  	select MACH_MXLADS
-@@ -27,6 +30,53 @@
+@@ -51,6 +54,53 @@ config MACH_SCB9328
  	help
  	  Say Y here if you are using a Synertronixx scb9328 board
  
@@ -20,7 +22,7 @@
 +	select IMX_HAVE_PLATFORM_IMX_UART
 +	select IMX_HAVE_PLATFORM_IMX_I2C
 +	select IMX_HAVE_PLATFORM_SPI_IMX
-+	select HAVE_FB_IMX
++	select IMX_HAVE_PLATFORM_IMX_FB
 +	select SERIAL_IMX_UART1
 +	help
 +	  Say Yes here if you are using the Armadeus APF9328 development board
@@ -64,9 +66,11 @@
  endif
  
  if ARCH_MX2
---- a/arch/arm/mach-imx/Makefile	2010-11-29 07:34:56.000000000 +0100
-+++ b/arch/arm/mach-imx/Makefile	2010-11-22 18:41:14.000000000 +0100
-@@ -18,6 +18,8 @@
+Index: linux-2.6.38-rc3/arch/arm/mach-imx/Makefile
+===================================================================
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Makefile
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Makefile
+@@ -18,6 +18,8 @@ obj-$(CONFIG_MACH_MX27) += clock-imx27.o
  obj-$(CONFIG_MX1_VIDEO)	+= mx1-camera-fiq.o mx1-camera-fiq-ksym.o
  
  obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/080-armadeus-add_fb_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/080-armadeus-add_fb_support.patch
new file mode 100644
index 0000000..efe2aea
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/080-armadeus-add_fb_support.patch
@@ -0,0 +1,39 @@
+MX1: Add structure, registration functions for framebuffer and rename LCDC INT
+--- a/arch/arm/mach-imx/devices-imx1.h	2011-02-28 07:17:03.000000000 +0100
++++ b/arch/arm/mach-imx/devices-imx1.h	2011-02-25 07:12:52.000000000 +0100
+@@ -9,6 +9,10 @@
+ #include <mach/mx1.h>
+ #include <mach/devices-common.h>
+ 
++extern const struct imx_imx_fb_data imx1_imx_fb_data __initconst;
++#define imx1_add_imx_fb(pdata) \
++    imx_add_imx_fb(&imx1_imx_fb_data, pdata)
++
+ extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst;
+ #define imx1_add_imx_i2c(pdata)		\
+ 	imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)
+--- a/arch/arm/plat-mxc/devices/platform-imx-fb.c	2011-02-01 04:05:49.000000000 +0100
++++ b/arch/arm/plat-mxc/devices/platform-imx-fb.c	2011-02-25 06:56:46.000000000 +0100
+@@ -16,6 +16,11 @@
+ 		.irq = soc ## _INT_LCDC,				\
+ 	}
+ 
++#ifdef CONFIG_SOC_IMX1
++const struct imx_imx_fb_data imx1_imx_fb_data __initconst =
++	imx_imx_fb_data_entry_single(MX1, SZ_4K);
++#endif /* ifdef CONFIG_SOC_IMX1 */
++
+ #ifdef CONFIG_SOC_IMX21
+ const struct imx_imx_fb_data imx21_imx_fb_data __initconst =
+ 	imx_imx_fb_data_entry_single(MX21, SZ_4K);
+--- a/arch/arm/plat-mxc/include/mach/mx1.h	2011-02-28 07:17:03.000000000 +0100
++++ b/arch/arm/plat-mxc/include/mach/mx1.h	2011-02-25 07:13:30.000000000 +0100
+@@ -89,7 +89,7 @@
+ #define MX1_GPIO_INT_PORTA	11
+ #define MX1_GPIO_INT_PORTB	12
+ #define MX1_GPIO_INT_PORTC	13
+-#define MX1_LCDC_INT		14
++#define MX1_INT_LCDC		14
+ #define MX1_SIM_INT		15
+ #define MX1_SIM_DATA_INT	16
+ #define MX1_RTC_INT		17


hooks/post-receive
-- 
armadeus


