[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-76-g85e4189
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-76-g85e4189
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-15 17:11:48
|
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 85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c (commit)
via 9e0de650cc6274452aca9929f56bdd935dc475f4 (commit)
from 402f11431b412d52a02ecacadf6e85aded37d4b0 (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 85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Dec 15 18:10:25 2012 +0100
[LINUX][3.7] APF27: config: Add imx framebuffer support by default
commit 9e0de650cc6274452aca9929f56bdd935dc475f4
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Dec 15 18:09:55 2012 +0100
[LINUX][3.7] APF27: Update lcd support
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.7.config | 1 +
patches/linux/3.7/0021-armadeus-apf9328.patch | 25 +++---
.../linux/3.7/0200-armadeus-add_apf27_module.patch | 39 +++++-----
.../3.7/0201-armadeus-add_apf27dev_baseboard.patch | 79 +++++++++-----------
4 files changed, 68 insertions(+), 76 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index a84a516..eb9454a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -143,6 +143,7 @@ CONFIG_VIDEO_MX2=m
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
CONFIG_FB=y
+CONFIG_FB_IMX=y
# CONFIG_FB_MX3 is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
diff --git a/patches/linux/3.7/0021-armadeus-apf9328.patch b/patches/linux/3.7/0021-armadeus-apf9328.patch
index 4880ce3..c985daa 100644
--- a/patches/linux/3.7/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.7/0021-armadeus-apf9328.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
-@@ -0,0 +1,349 @@
++++ linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+@@ -0,0 +1,350 @@
+/*
+ *
+ * Armadeus LCD configuration file
@@ -30,7 +30,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+# define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
+# define MXC_IO_ADDRESS MX1_IO_ADDRESS
+#else
-+# include <mach/mx2x.h>
++# include <mach/mx27.h>
+# define LCDC_BASE_ADDR MX27_LCDC_BASE_ADDR
+# define MXC_IO_ADDRESS MX27_IO_ADDRESS
+#endif
@@ -227,12 +227,13 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+static struct imx_fb_platform_data apf_fb_data /*__initdata*/ = {
+ .mode = apf_fb_modes,
+ .num_modes = ARRAY_SIZE(apf_fb_modes),
-+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .lcd_power = apf_lcd_power,
+ .backlight_power= apf_lcd_backlight_power,
+#ifdef CONFIG_MACH_APF9328
++ .dmacr = DEFAULT_DMA_SETTINGS,
+ .init = apf9328_fb_init,
+#elif CONFIG_MACH_APF27
++ .dmacr = 0x00020010,
+ .init = apf27_fb_init,
+#endif
+};
@@ -352,10 +353,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* CONFIG_FB_IMX */
+
+#endif /* APF_LCD_CONFIG_H */
-Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/mach-apf9328.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf9328.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf9328.c
@@ -20,7 +20,16 @@
#include <linux/dm9000.h>
#include <linux/gpio.h>
@@ -695,10 +696,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
}
static void __init apf9328_timer_init(void)
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
++++ linux-3.7/arch/arm/mach-imx/apf9328-dev.c
@@ -0,0 +1,309 @@
+/*
+ * apf9328-dev.c
@@ -1009,10 +1010,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
+#endif
+}
+
-Index: linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
===================================================================
--- /dev/null
-+++ linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
@@ -0,0 +1,71 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
diff --git a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
index 5b5ac0b..2429f80 100644
--- a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
4 files changed, 273 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-imx/mach-apf27.c
-Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Kconfig 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Kconfig 2012-11-05 13:44:07.000000000 +0100
-@@ -382,6 +382,20 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -415,6 +415,21 @@ config MACH_IMX27_DT
Include support for Freescale i.MX27 based platforms
using the device tree for discovery
@@ -30,6 +30,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
+ select IMX_HAVE_PLATFORM_IMX_I2C
+ select IMX_HAVE_PLATFORM_IMX_UART
+ select IMX_HAVE_PLATFORM_MXC_NAND
++ select IMX_HAVE_PLATFORM_IMX_FB
+ select MXC_ULPI if USB_ULPI
+ help
+ Include support for APF27 platform. This includes specific
@@ -38,11 +39,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
endif
if ARCH_IMX_V6_V7
-Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Makefile 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Makefile 2012-11-05 13:44:07.000000000 +0100
-@@ -44,6 +44,7 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -50,10 +51,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
# i.MX31 based machines
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c 2012-11-05 21:29:00.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
@@ -0,0 +1,294 @@
+ /*
+ * Support for the APF27 System On Module
@@ -349,11 +350,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+ .init_machine = apf27_init,
+ .restart = mxc_restart,
+MACHINE_END
-Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-3.7-rc4.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h 2012-11-05 13:44:07.000000000 +0100
-@@ -85,6 +85,7 @@
+--- linux-3.7.orig/arch/arm/plat-mxc/include/mach/uncompress.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
+@@ -85,6 +85,7 @@ static __inline__ void __arch_decomp_set
case MACH_TYPE_PCA100:
case MACH_TYPE_MXT_TD60:
case MACH_TYPE_IMX27IPCAM:
@@ -361,11 +362,11 @@ Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
uart_base = MX2X_UART1_BASE_ADDR;
break;
case MACH_TYPE_MX31LITE:
-Index: linux-3.7-rc4/arch/arm/tools/mach-types
+Index: linux-3.7/arch/arm/tools/mach-types
===================================================================
---- linux-3.7-rc4.orig/arch/arm/tools/mach-types 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/tools/mach-types 2012-11-05 13:44:07.000000000 +0100
-@@ -297,6 +297,7 @@
+--- linux-3.7.orig/arch/arm/tools/mach-types
++++ linux-3.7/arch/arm/tools/mach-types
+@@ -297,6 +297,7 @@ smdk2416 MACH_SMDK2416 SMDK2416 1685
wbd111 MACH_WBD111 WBD111 1690
mv2120 MACH_MV2120 MV2120 1693
mx51_3ds MACH_MX51_3DS MX51_3DS 1696
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index dfd3cde..df0cf35 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Jeremie Scheer <jer...@ar...>
Signed-off-by: Kevin Joly <jol...@gm...>
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c 2012-11-14 16:26:35.000000000 +0100
-@@ -0,0 +1,1011 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
+@@ -0,0 +1,1012 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -55,6 +55,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
++#ifdef CONFIG_FB_IMX
++#include <linux/platform_data/video-imxfb.h>
++#endif
+
+#include <asm/io.h>
+#include <linux/gpio.h> /* gpio_to_irq */
@@ -64,10 +67,6 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
+#include <linux/fb.h>
+#include <mach/ulpi.h>
+#ifdef CONFIG_MAX1027
@@ -103,7 +102,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+#include <mach/mx27.h>
+#define VA_GPIO_BASE MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
+
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
++#if defined(CONFIG_FB_IMX)
+extern void apf27_lcd_init(void);
+#endif
+#ifdef CONFIG_MACH_APF27_DEV_EXT
@@ -959,7 +958,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+// imx27_add_imx_ssi(0, &apf27_ssi0_pdata);
+
+ /* APF27Dev has an LCD connector */
-+ //apf27_lcd_init();
++#ifdef CONFIG_FB_IMX
++ apf27_lcd_init();
++#endif
+
+// apf27dev_pwr_ctrl_gpio_active();
+
@@ -1024,11 +1025,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+#endif
+}
+
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c 2012-11-06 13:53:49.000000000 +0100
-@@ -0,0 +1,169 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+@@ -0,0 +1,157 @@
+/*
+ * apf27-lcd.c
+ *
@@ -1052,16 +1053,14 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#ifdef CONFIG_FB_IMX
+
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
++#include <linux/platform_data/video-imxfb.h>
+
+#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
+#include <mach/common.h>
+
+#include "devices-imx27.h"
@@ -1126,16 +1125,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+ PA31_PF_OE_ACD
+};
+
-+/* Freescale driver */
-+#ifdef CONFIG_FB_MXC
-+static struct mxc_fb_platform_data apf_fb_data = {
-+ .mode = LCD_NAME,
-+ .init = apf27_fb_init,
-+};
-+/* Mainline driver */
-+#elif CONFIG_FB_IMX
-+#include "../mach-imx/apf9328_lcd_config.h"
-+#endif
++#include "apf9328_lcd_config.h"
+
+static int apf27_fb_init(struct platform_device *pdev)
+{
@@ -1189,19 +1179,18 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+#ifdef CONFIG_FB_MXC
+ apf27_lcd_startup();
+#endif
-+#if 0
+ apf_set_lcd_name(name);
+ apf_fb_set_default_contrast();
+ imx27_add_imx_fb(&apf_fb_data);
-+#endif
+end:
+ return;
+}
+
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
++#endif
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c 2012-11-06 12:15:25.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -1378,10 +1367,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
+ printk("done\n");
+}
+
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/mach-apf27.c 2012-11-06 14:15:12.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c 2012-11-14 16:50:52.000000000 +0100
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
@@ -43,6 +43,7 @@
#include "devices-imx27.h"
@@ -1390,7 +1379,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
static const int apf27_pins[] __initconst = {
/* UART1 */
-@@ -269,6 +270,10 @@
+@@ -270,6 +271,10 @@ static void __init apf27_init(void)
i2c_register_board_info(1, apf27_i2c_devices_bus1,
ARRAY_SIZE(apf27_i2c_devices_bus1));
imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1401,11 +1390,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
}
static void __init apf27_timer_init(void)
-Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Kconfig 2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Kconfig 2011-06-03 12:44:42.000000000 +0200
-@@ -396,6 +396,103 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -430,6 +430,103 @@ config MACH_APF27
Include support for APF27 platform. This includes specific
configurations for the module and its peripherals.
@@ -1509,11 +1498,11 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
endif
if ARCH_IMX_V6_V7
-Index: linux-2.6.38.1/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Makefile 2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Makefile 2011-06-03 17:21:55.000000000 +0200
-@@ -45,6 +45,9 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
obj-$(CONFIG_MACH_APF27) += mach-apf27.o
hooks/post-receive
--
armadeus
|
