[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-204-g293f7fa
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-204-g293f7fa
|
From: Julien B a. A. <ar...@us...> - 2011-01-03 15:03:45
|
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 293f7fa6dec6b0421ca1a368138e201579e9c794 (commit)
via 6141a31584449b2991d2b0a5f7001856db4390a0 (commit)
from 11a2f51b711f128402004086f2d7607225ca7046 (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 293f7fa6dec6b0421ca1a368138e201579e9c794
Merge: 6141a31584449b2991d2b0a5f7001856db4390a0 11a2f51b711f128402004086f2d7607225ca7046
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 3 16:03:21 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6141a31584449b2991d2b0a5f7001856db4390a0
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 3 16:03:00 2011 +0100
[LINUX] 2.6.28-alpha: APF51, cleanup USB code in platform support file
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 26 +++--
.../2.6.38/400-armadeus-add_apf51_module.patch | 111 +-------------------
.../408-armadeus-add_apf51-dev_baseboard.patch | 22 +++-
3 files changed, 38 insertions(+), 121 deletions(-)
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 e472ecc..f42da2c 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
-# Wed Dec 29 09:45:32 2010
+# Mon Jan 3 15:56:42 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -968,6 +968,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
CONFIG_TOUCHSCREEN_WM831X=m
+# CONFIG_TOUCHSCREEN_WM97XX is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
@@ -1149,6 +1150,7 @@ CONFIG_WM831X_POWER=m
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_CHARGER_ISP1704 is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1262,6 +1264,7 @@ CONFIG_MFD_CORE=y
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
+# CONFIG_UCB1400_CORE is not set
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
@@ -1373,6 +1376,7 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
+CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
@@ -1395,14 +1399,16 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_SOC is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HIDRAW is not set
@@ -1591,12 +1597,14 @@ CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_G_MULTI is not set
# CONFIG_USB_G_HID is not set
# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
#
# OTG and related infrastructure
#
+CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_ULPI=y
# CONFIG_NOP_USB_XCEIV is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG 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 23ff79b..fedb4e2 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 2010-12-30 21:07:06.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2010-12-31 17:35:40.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-03 15:56:23.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-30 21:06:56.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2010-12-31 17:35:39.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-03 15:56:23.000000000 +0100
@@ -6,6 +6,7 @@
obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
@@ -35,8 +35,8 @@ 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 2010-12-31 16:14:49.000000000 +0100
-@@ -0,0 +1,522 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-03 12:01:21.000000000 +0100
+@@ -0,0 +1,421 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010 Armadeus Systems
@@ -215,115 +215,16 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ return 0;
+}
+
-+/* ULPI register addresses */
-+#define ULPI_VID_LOW 0x00 /* Vendor ID low */
-+#define ULPI_VID_HIGH 0x01 /* Vendor ID high */
-+#define ULPI_PID_LOW 0x02 /* Product ID low */
-+#define ULPI_PID_HIGH 0x03 /* Product ID high */
-+#define ULPI_FCNCTL 0x04 /* Function Control */
-+#define ULPI_ITFCTL 0x07 /* Interface Control */
-+#define ULPI_OTGCTL 0x0A /* OTG Control */
-+
-+/* 1504 Function Control Register bits */
-+#define RESET (1 << 5) /* Reset */
-+
-+/* 1504 OTG Control Register bits */
-+#define USE_EXT_VBUS_IND (1 << 7) /* Use ext. Vbus indicator */
-+#define DRV_VBUS_EXT (1 << 6) /* Drive Vbus external */
-+#define DRV_VBUS (1 << 5) /* Drive Vbus */
-+#define CHRG_VBUS (1 << 4) /* Charge Vbus */
-+#define DISCHRG_VBUS (1 << 3) /* Discharge Vbus */
-+#define DM_PULL_DOWN (1 << 2) /* enable DM Pull Down */
-+#define DP_PULL_DOWN (1 << 1) /* enable DP Pull Down */
-+#define ID_PULL_UP (1 << 0) /* enable ID Pull Up */
-+
-+
-+/* ?? Preferably use stuff from drivers/usb/otg/ulpi.c ?? */
-+static int usb3320_init(struct otg_transceiver *otg)
-+{
-+ int vid, pid;
-+
-+ printk("*** %s ***\n", __func__);
-+
-+ vid = otg->io_ops->read(otg, ULPI_VID_HIGH) << 8;
-+ vid = vid | otg->io_ops->read(otg, ULPI_VID_LOW);
-+
-+ pid = otg->io_ops->read(otg, ULPI_PID_HIGH) << 8;
-+ pid = pid | otg->io_ops->read(otg, ULPI_PID_LOW);
-+
-+ pr_info("ULPI OTG (%s) Vendor ID 0x%x Product ID 0x%x\n", otg->label, vid, pid);
-+ if (vid != 0x424 || pid != 0x07) {
-+ pr_err("No USB3320 found\n");
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+/* ?? Preferably use stuff from drivers/usb/otg/ulpi.c ?? */
-+static int usb3320_set_vbus(struct otg_transceiver *otg, bool enabled)
-+{
-+ int ret = 0;
-+ int reg;
-+
-+ printk("*** %s: %d\n", __func__, enabled);
-+
-+ if (enabled) {
-+ /* force disconnection of the DM/DP signals. This
-+ avoid powering the connected device through these lines */
-+ reg = otg->io_ops->read(otg, ULPI_FCNCTL);
-+ reg |= RESET;
-+ otg->io_ops->write(otg, reg, ULPI_FCNCTL);
-+ mdelay(10); /* wait until the supply is really down */
-+ reg = otg->io_ops->read(otg, ULPI_FCNCTL);
-+ reg &= ~RESET;
-+ otg->io_ops->write(otg, reg, ULPI_FCNCTL);
-+ mdelay(1);
-+
-+ reg = otg->io_ops->read(otg, ULPI_OTGCTL);
-+ reg |= DRV_VBUS_EXT | /* enable external Vbus */
-+ DRV_VBUS | /* enable internal Vbus */
-+ USE_EXT_VBUS_IND | /* use external indicator */
-+ CHRG_VBUS; /* charge Vbus */
-+ otg->io_ops->write(otg, reg, ULPI_OTGCTL);
-+ } else {
-+ reg = otg->io_ops->read(otg, ULPI_OTGCTL);
-+ reg &= ~(DRV_VBUS_EXT | /* disable external Vbus */
-+ DRV_VBUS); /* disable internal Vbus */
-+ reg |= USE_EXT_VBUS_IND | /* use external indicator */
-+ DISCHRG_VBUS; /* discharge Vbus */
-+ otg->io_ops->write(otg, reg, ULPI_OTGCTL);
-+ }
-+
-+ return ret;
-+}
-+
-+/* ?? Preferably use otg_ulpi_create from drivers/usb/otg/ulpi.c ?? */
-+struct otg_transceiver usb3320_1 = {
-+ .io_ops = &mxc_ulpi_access_ops,
-+ .init = usb3320_init,
-+ .set_vbus = usb3320_set_vbus,
-+};
-+
+static struct mxc_usbh_platform_data usbh1_config = {
+ .init = initialize_usbh1_port,
+ .portsc = MXC_EHCI_MODE_ULPI,
+ .flags = (MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_ITC_NO_THRESHOLD),
-+ .otg = &usb3320_1,
-+};
-+
-+/* ?? Preferably use otg_ulpi_create from drivers/usb/otg/ulpi.c ?? */
-+struct otg_transceiver usb3320_2 = {
-+ .io_ops = &mxc_ulpi_access_ops,
-+ .init = usb3320_init,
-+ .set_vbus = usb3320_set_vbus,
+};
+
+static struct mxc_usbh_platform_data usbh2_config = {
+ .init = initialize_usbh2_port,
+ .portsc = MXC_EHCI_MODE_ULPI,
+ .flags = (MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_ITC_NO_THRESHOLD),
-+ .otg = &usb3320_2,
+};
+
+#define APF51_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
@@ -364,9 +265,9 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ return 0;
+}
+
++
+/* OTG port with i.MX51 internal PHY */
+#define MX51_USB_PLL_DIV_19_2_MHZ 0x01
-+#define MX51_USB_PLL_DIV_24_MHZ 0x02
+
+/* This function is board specific as the bit mask for the plldiv will also
+be different for other Freescale SoCs, thus a common bitmask is not
@@ -386,10 +287,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+ v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
+ v |= MX51_USB_PLL_DIV_19_2_MHZ;
-+// v |= MX51_USB_PLL_DIV_24_MHZ;
+ __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+ iounmap(usb_base);
-+ printk("**** initialize_otg_port 19,2\n");
+
+ return 0;
+}
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 350b245..baea1fc 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,9 +4,17 @@ 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 2010-12-30 21:07:06.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2010-12-30 21:07:06.000000000 +0100
-@@ -114,4 +114,22 @@
+--- 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.
@@ -23,6 +31,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+ 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.
@@ -31,8 +41,8 @@ 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 2010-12-30 21:07:06.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2010-12-30 21:07:06.000000000 +0100
+--- 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 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -44,7 +54,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51-dev-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 2010-12-31 16:23:43.000000000 +0100
++++ 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 @@
+ /*
+ * Support for APF51's PROTO development baseboard
hooks/post-receive
--
armadeus
|
