[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-214-gfb4f841
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-214-gfb4f841
|
From: Julien B a. A. <ar...@us...> - 2011-01-06 19:37:00
|
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 fb4f841d34ebdcdf0f8be8962eda220d1a619638 (commit)
from 227aba3b541c2d6185ba9606462273b340bdd62d (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 fb4f841d34ebdcdf0f8be8962eda220d1a619638
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 6 20:36:18 2011 +0100
[LINUX] 2.6.38: Add (preliminary) support for the APF51Dev baseboard. APF51Proto is still used as default baseboard.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 5 +-
.../2.6.38/400-armadeus-add_apf51_module.patch | 23 ++--
.../408-armadeus-add_apf51-dev_baseboard.patch | 190 ++++++++++++++------
... 408b-armadeus-add_apf51-proto_baseboard.patch} | 91 +++++-----
4 files changed, 195 insertions(+), 114 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/{408-armadeus-add_apf51-dev_baseboard.patch => 408b-armadeus-add_apf51-proto_baseboard.patch} (80%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index f42da2c..c4084d2 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.37-rc4 Kernel Configuration
-# Mon Jan 3 15:56:42 2011
+# Thu Jan 6 20:07:42 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -268,7 +268,8 @@ CONFIG_SOC_IMX51=y
# CONFIG_MACH_MX51_EFIKAMX is not set
CONFIG_MACH_APF51=y
CONFIG_MACH_APF51_HAS_BASEBOARD=y
-CONFIG_MACH_APF51_DEV=y
+# CONFIG_MACH_APF51_DEV is not set
+CONFIG_MACH_APF51_PROTO=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_TZIC=y
# CONFIG_MXC_PWM is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index ecdec98..121def2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-05 17:30:58.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-05 20:04:52.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 19:58:51.000000000 +0100
@@ -101,4 +101,17 @@
Include support for Genesi Efika MX nettop. This includes specific
configurations for the board and its peripherals.
@@ -23,7 +23,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-05 20:04:52.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 19:58:51.000000000 +0100
@@ -6,6 +6,7 @@
obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
@@ -35,11 +35,11 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-05 19:38:00.000000000 +0100
-@@ -0,0 +1,421 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-06 18:51:58.000000000 +0100
+@@ -0,0 +1,422 @@
+/*
+ * Support for APF51 System On Module
-+ * Copyright (C) 2010 Armadeus Systems
++ * Copyright (C) 2010-2011 Armadeus Systems
+ *
+ * Based on code which is:
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -400,8 +400,9 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ .touch = &apf51_wm8311_touch_pdata,
+};
+
-+static struct i2c_board_info apf51_i2c_devices[] __initdata = {
-+ { I2C_BOARD_INFO("wm8311", 0x34),
++static struct i2c_board_info apf51_i2c1_devices[] __initdata = {
++ {
++ I2C_BOARD_INFO("wm8311", 0x34),
+ .platform_data = &apf51_wm8311_pdata,
+ .irq = gpio_to_irq(APF51_WM8311_IRQ_GPIO),
+ },
@@ -418,7 +419,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ apf51_init_imx_uart();
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
-+ i2c_register_board_info(1, apf51_i2c_devices, ARRAY_SIZE(apf51_i2c_devices));
++ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
+
+ /* APF51 has an Ethernet PHY connected on internal FEC */
+ imx51_add_fec(NULL);
@@ -461,7 +462,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-05 17:30:58.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-06 15:53:53.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -483,7 +484,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-05 17:30:58.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-06 15:53:53.000000000 +0100
@@ -47,6 +47,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index baea1fc..bcf7883 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-03 15:49:17.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-03 15:56:12.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 19:51:04.000000000 +0100
@@ -106,12 +106,30 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -41,25 +41,25 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-01-03 15:49:17.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-03 15:49:27.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 19:51:04.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
obj-$(CONFIG_MACH_APF51) += board-apf51.o
-+obj-$(CONFIG_MACH_APF51_DEV) += apf51-dev-baseboard.o
++obj-$(CONFIG_MACH_APF51_DEV) += apf51dev-baseboard.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c 2011-01-03 15:49:27.000000000 +0100
-@@ -0,0 +1,184 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-01-06 19:45:35.000000000 +0100
+@@ -0,0 +1,270 @@
+ /*
-+ * Support for APF51's PROTO development baseboard
++ * Support for APF51's official development baseboard (APF51Dev)
+ *
-+ * Copyright (C) 2010 Armadeus Systems <su...@ar...>
++ * Copyright (C) 2011 Armadeus Systems <su...@ar...>
+ *
+ * Based on code which is:
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -79,6 +79,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+#include <linux/spi/spi.h>
+#include <linux/fb.h>
+#include <linux/mfd/imx-ipu-v3.h>
++#include <sound/wm8960.h>
+
+#include <mach/iomux-mx51.h>
+#include <mach/ipu-v3.h>
@@ -86,7 +87,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+#include "devices-imx51.h"
+#include "devices.h"
+
-+static iomux_v3_cfg_t apf51proto_pads[] = {
++static iomux_v3_cfg_t apf51dev_pads[] = {
+ /* SD1 */
+ MX51_PAD_SD1_CMD__SD1_CMD,
+ MX51_PAD_SD1_CLK__SD1_CLK,
@@ -95,7 +96,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ MX51_PAD_SD1_DATA2__SD1_DATA2,
+ MX51_PAD_SD1_DATA3__SD1_DATA3,
+
-+ /* SD2 */
++ /* SD2 (WiFi) */
+ MX51_PAD_SD2_CMD__SD2_CMD,
+ MX51_PAD_SD2_CLK__SD2_CLK,
+ MX51_PAD_SD2_DATA0__SD2_DATA0,
@@ -103,8 +104,22 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ MX51_PAD_SD2_DATA2__SD2_DATA2,
+ MX51_PAD_SD2_DATA3__SD2_DATA3,
+
-+ /* I2C1 */
-+ /* TBD (depends on SD2 or SPI1) */
++ MX51_PAD_EIM_EB2__GPIO_2_22, /* PWRDN# */
++ MX51_PAD_EIM_EB3__GPIO_2_23, /* RESET# */
++
++ /* UART2 (Bluetooth) */
++ MX51_PAD_UART2_RXD__UART2_RXD,
++ MX51_PAD_UART2_TXD__UART2_TXD,
++ MX51_PAD_EIM_D25__UART2_CTS,
++ MX51_PAD_EIM_D26__UART2_RTS,
++
++ MX51_PAD_EIM_CS3__GPIO_2_28, /* RESET# */
++
++ /* UART1 */
++ MX51_PAD_UART1_RXD__UART1_RXD,
++ MX51_PAD_UART1_TXD__UART1_TXD,
++ MX51_PAD_UART1_RTS__UART1_RTS,
++ MX51_PAD_UART1_CTS__UART1_CTS,
+
+ /* eCSPI1 */
+ MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
@@ -113,6 +128,13 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ MX51_PAD_CSPI1_SS0__GPIO_4_24,
+ MX51_PAD_CSPI1_SS1__GPIO_4_25,
+
++ /* eCSPI2 */
++ MX51_PAD_NANDF_RB2__ECSPI2_SCLK,
++ MX51_PAD_NANDF_RB3__ECSPI2_MISO,
++ MX51_PAD_NANDF_D15__ECSPI2_MOSI,
++ MX51_PAD_NANDF_D12__GPIO_3_28, /* SS1 */
++ MX51_PAD_NANDF_D13__GPIO_3_27, /* SS2 */
++
+ /* Display */
+ MX51_PAD_DISP1_DAT0__DISP1_DAT0,
+ MX51_PAD_DISP1_DAT1__DISP1_DAT1,
@@ -142,18 +164,24 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ MX51_PAD_DI1_PIN3__DI1_PIN3, /* VSYNC */
+ /* CLK and OE are not muxed */
+
-+ /* Debug PINS */
-+/* MX51_PAD_GPIO_1_2__GPIO_1_2,
-+ MX51_PAD_GPIO_1_3__GPIO_1_3,*/
++ /* JTAG */
++
++ /* ONEWIRE */
++
++ /* KEYPAD */
++
++ /* Other GPIOs ! TBDL ! */
++ /* HDMI_RST# */
++ /* HDMI_DETECT */
+};
+
-+static const struct imxi2c_platform_data apf51proto_i2c_data __initconst = {
++static const struct imxi2c_platform_data apf51dev_i2c_data __initconst = {
+ .bitrate = 400000,
+};
+
+/* APF51Proto has a LCD connector for a 18 bits 800x480 Chimei TFT LCD */
+
-+static struct fb_videomode apf51proto_modes[] = {
++static struct fb_videomode apf51dev_modes[] = {
+ {
+ .name = "Chimei-LW700AT9003",
+ .refresh = 60,
@@ -164,32 +192,27 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
+ .sync = FB_SYNC_CLK_IDLE_EN,
-+// | FB_SYNC_CLK_LAT_FALL,// | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
+};
+
-+static struct ipuv3_fb_platform_data apf51proto_fb0_data = {
-+// .interface_pix_fmt = IPU_PIX_FMT_RGB24,
++static struct ipuv3_fb_platform_data apf51dev_fb0_data = {
+ .interface_pix_fmt = IPU_PIX_FMT_RGB666,
-+ .modes = apf51proto_modes,
-+ .num_modes = ARRAY_SIZE(apf51proto_modes),
++ .modes = apf51dev_modes,
++ .num_modes = ARRAY_SIZE(apf51dev_modes),
+ .display = 0,
+};
+
-+static struct imx_ipuv3_platform_data ipu_data = {
-+ .fb_head0_platform_data = &apf51proto_fb0_data,
++static struct imx_ipuv3_platform_data apf51dev_ipu_data = {
++ .fb_head0_platform_data = &apf51dev_fb0_data,
+};
+
-+#define DEBUG1_GPIO (GPIO_PORTA | 2)
-+#define DEBUG2_GPIO (GPIO_PORTA | 3)
-+
-+
-+#define APF51PROTO_ECSPI1_CS0 IMX_GPIO_NR(4, 24)
-+#define APF51PROTO_ECSPI1_CS1 IMX_GPIO_NR(4, 25)
++/* ECSPI1 */
++#define APF51DEV_ECSPI1_SS0 IMX_GPIO_NR(4, 24)
++#define APF51DEV_ECSPI1_SS1 IMX_GPIO_NR(4, 25)
+
-+static struct spi_board_info apf51proto_spi_board_info[] __initdata = {
++static struct spi_board_info apf51dev_spi1_board_info[] __initdata = {
+ {
+ .modalias = "as1531",
+ .max_speed_hz = 8000000,
@@ -199,7 +222,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ .platform_data = NULL,
+ },
+ {
-+ .modalias = "spidev",
++ .modalias = "mcp4912",
+ .max_speed_hz = 8000000,
+ .bus_num = 0,
+ .chip_select = 1,
@@ -208,35 +231,98 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ },
+};
+
-+static int apf51proto_spi_cs[] = {
-+ APF51PROTO_ECSPI1_CS0,
-+ APF51PROTO_ECSPI1_CS1,
++static int apf51dev_spi1_cs[] = {
++ APF51DEV_ECSPI1_SS0,
++ APF51DEV_ECSPI1_SS1,
++};
++
++static const struct spi_imx_master apf51dev_spi1_pdata __initconst = {
++ .chipselect = apf51dev_spi1_cs,
++ .num_chipselect = ARRAY_SIZE(apf51dev_spi1_cs),
++};
++
++/* ECSPI2 */
++#define APF51DEV_ECSPI2_SS1 IMX_GPIO_NR(3, 28)
++#define APF51DEV_ECSPI2_SS2 IMX_GPIO_NR(3, 27)
++
++static struct spi_board_info apf51dev_spi2_board_info[] __initdata = {
++ {
++ .modalias = "mcp2515",
++ .max_speed_hz = 8000000,
++ .bus_num = 1,
++ .chip_select = 0,
++ .mode = SPI_MODE_0,
++ .platform_data = NULL,
++ },
++ {
++ .modalias = "spidev",
++ .max_speed_hz = 8000000,
++ .bus_num = 1,
++ .chip_select = 1,
++ .mode = SPI_MODE_0,
++ .platform_data = NULL,
++ },
++};
++
++static int apf51dev_spi2_cs[] = {
++ APF51DEV_ECSPI2_SS1,
++ APF51DEV_ECSPI2_SS2,
+};
+
-+static const struct spi_imx_master apf51proto_spi_pdata __initconst = {
-+ .chipselect = apf51proto_spi_cs,
-+ .num_chipselect = ARRAY_SIZE(apf51proto_spi_cs),
++static const struct spi_imx_master apf51dev_spi2_pdata __initconst = {
++ .chipselect = apf51dev_spi2_cs,
++ .num_chipselect = ARRAY_SIZE(apf51dev_spi2_cs),
++};
++
++
++/* Audio (Wolfson WM8960) */
++static struct wm8960_data apf51dev_wm8960_pdata = {
++ .capless = 0, /* Headphone outputs NOT configured in capless mode */
++// .dres = ??; /* Discharge resistance for headphone outputs */
+};
+
+
++/* I2C2 */
++static struct i2c_board_info apf51dev_i2c2_devices[] __initdata = {
++ {
++ I2C_BOARD_INFO("tfp410", 0x38),
++/* .platform_data = &tfp410_pdata,
++ .irq = gpio_to_irq(APF51DEV_HDMI_DETECT),*/
++ },
++#if 0
++ {
++ /* EDID ? */
++ },
++#endif
++ {
++ I2C_BOARD_INFO("wm8960", 0x36),
++ .platform_data = &apf51dev_wm8960_pdata,
++ },
++#if 0
++ {
++ /* Camera */
++ },
++#endif
++};
++
+void __init apf51_baseboard_init(void)
+{
-+ mxc_iomux_v3_setup_multiple_pads(apf51proto_pads,
-+ ARRAY_SIZE(apf51proto_pads));
-+
-+ gpio_request(DEBUG1_GPIO, "debug1");
-+ gpio_request(DEBUG2_GPIO, "debug2");
-+ gpio_set_value(DEBUG1_GPIO, 1);
-+ gpio_set_value(DEBUG2_GPIO, 1);
++ mxc_iomux_v3_setup_multiple_pads(apf51dev_pads,
++ ARRAY_SIZE(apf51dev_pads));
+
+ imx51_add_sdhci_esdhc_imx(0, NULL);
+ imx51_add_sdhci_esdhc_imx(1, NULL);
+
-+ spi_register_board_info(apf51proto_spi_board_info,
-+ ARRAY_SIZE(apf51proto_spi_board_info));
-+ imx51_add_ecspi(0, &apf51proto_spi_pdata);
++ spi_register_board_info(apf51dev_spi1_board_info,
++ ARRAY_SIZE(apf51dev_spi1_board_info));
++ imx51_add_ecspi(0, &apf51dev_spi1_pdata);
++ spi_register_board_info(apf51dev_spi2_board_info,
++ ARRAY_SIZE(apf51dev_spi2_board_info));
++ imx51_add_ecspi(1, &apf51dev_spi2_pdata);
+
-+ imx51_add_imx_i2c(0, &apf51proto_i2c_data);
++ /* I2C2 already initialized by APF51, so just register devices */
++ i2c_register_board_info(1, apf51dev_i2c2_devices,
++ ARRAY_SIZE(apf51dev_i2c2_devices));
+
-+ imx51_add_ipuv3(&ipu_data);
++ imx51_add_ipuv3(&apf51dev_ipu_data);
+}
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
similarity index 80%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
index baea1fc..996b928 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
@@ -1,65 +1,29 @@
-Add APF51Dev baseboard support.
+Add APF51Proto baseboard support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-03 15:49:17.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-03 15:56:12.000000000 +0100
-@@ -106,12 +106,30 @@
- select SOC_IMX51
- select IMX_HAVE_PLATFORM_IMX_UART
- select IMX_HAVE_PLATFORM_IMX_I2C
-- select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
- select IMX_HAVE_PLATFORM_MXC_NAND
-- select IMX_HAVE_PLATFORM_SPI_IMX
- select MXC_ULPI
- help
- Include support for Armadeus Systems APF51 System On Module. This
- includes specific configurations for the board and its peripherals.
-
-+config MACH_APF51_HAS_BASEBOARD
-+ bool
-+
-+choice
-+ prompt "Baseboard"
-+ depends on MACH_APF51
-+ default MACH_APF51_DEV
-+
-+config MACH_APF51_DEV
-+ prompt "Armadeus Systems APF51Dev development board"
-+ bool
-+ select MACH_APF51_HAS_BASEBOARD
-+ select IMX_HAVE_PLATFORM_IMX_IPUV3
-+ select IMX_HAVE_PLATFORM_SPI_IMX
-+ select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-+ help
-+ This selects the APF51Dev as baseboard and adds board's specific
-+ devices.
-+endchoice
-+
- endif
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-01-03 15:49:17.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-03 15:49:27.000000000 +0100
-@@ -7,6 +7,7 @@
-
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 15:53:53.000000000 +0100
+@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
obj-$(CONFIG_MACH_APF51) += board-apf51.o
-+obj-$(CONFIG_MACH_APF51_DEV) += apf51-dev-baseboard.o
+ obj-$(CONFIG_MACH_APF51_DEV) += apf51dev-baseboard.o
++obj-$(CONFIG_MACH_APF51_PROTO) += apf51proto-baseboard.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51proto-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c 2011-01-03 15:49:27.000000000 +0100
-@@ -0,0 +1,184 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51proto-baseboard.c 2011-01-06 15:53:53.000000000 +0100
+@@ -0,0 +1,183 @@
+ /*
+ * Support for APF51's PROTO development baseboard
++ * (This board was never publicly released)
+ *
-+ * Copyright (C) 2010 Armadeus Systems <su...@ar...>
++ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
+ *
+ * Based on code which is:
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -164,14 +128,12 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
+ .sync = FB_SYNC_CLK_IDLE_EN,
-+// | FB_SYNC_CLK_LAT_FALL,// | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
+};
+
+static struct ipuv3_fb_platform_data apf51proto_fb0_data = {
-+// .interface_pix_fmt = IPU_PIX_FMT_RGB24,
+ .interface_pix_fmt = IPU_PIX_FMT_RGB666,
+ .modes = apf51proto_modes,
+ .num_modes = ARRAY_SIZE(apf51proto_modes),
@@ -240,3 +202,34 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-baseboard.c
+
+ imx51_add_ipuv3(&ipu_data);
+}
+Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+===================================================================
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 16:11:12.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 16:13:19.000000000 +0100
+@@ -118,7 +118,7 @@
+ choice
+ prompt "Baseboard"
+ depends on MACH_APF51
+- default MACH_APF51_DEV
++ default MACH_APF51_PROTO
+
+ config MACH_APF51_DEV
+ prompt "Armadeus Systems APF51Dev development board"
+@@ -130,6 +130,17 @@
+ help
+ This selects the APF51Dev as baseboard and adds board's specific
+ devices.
++
++config MACH_APF51_PROTO
++ prompt "Armadeus Systems APF51Proto development board"
++ bool
++ select MACH_APF51_HAS_BASEBOARD
++ select IMX_HAVE_PLATFORM_IMX_IPUV3
++ select IMX_HAVE_PLATFORM_SPI_IMX
++ select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
++ help
++ This selects the APF51Proto as baseboard and adds board's specific
++ devices. This board was never made publicly available !
+ endchoice
+
+ endif
hooks/post-receive
--
armadeus
|
