[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-122-g18ae7cd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-122-g18ae7cd
|
From: Julien B a. A. <ar...@us...> - 2010-01-19 17:00:53
|
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 18ae7cd946fd58bc47b19d6553f20057acae6865 (commit)
via ccb02fe76016860a3d99da5489cfa77872774dc3 (commit)
via d22e29591b972c281f44edc1b63a9339e129f26b (commit)
from d2f36830736570566187e844a63d0bc729aff39d (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 18ae7cd946fd58bc47b19d6553f20057acae6865
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 18:00:06 2010 +0100
[LINUX] Remove old & obsolete APF27DevTest support
commit ccb02fe76016860a3d99da5489cfa77872774dc3
Merge: d22e29591b972c281f44edc1b63a9339e129f26b d2f36830736570566187e844a63d0bc729aff39d
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 17:07:26 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d22e29591b972c281f44edc1b63a9339e129f26b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 17:03:15 2010 +0100
[LINUX] Add support for WiFi module of APW
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 105 +++++++++----------
1 files changed, 50 insertions(+), 55 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 16b3f0a..b7a7f2e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-18 17:40:22.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-01-19 17:08:44.000000000 +0100
@@ -0,0 +1,712 @@
+ /*
+ * apf27.c
@@ -726,8 +726,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-18 19:29:16.000000000 +0100
-@@ -0,0 +1,1063 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 17:21:40.000000000 +0100
+@@ -0,0 +1,1018 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -1360,7 +1360,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+
-+/* APF27Dev adds an USB PHY on i.MX27 port 2 */
++/* APF27Dev adds an USB PHY on i.MX27 USB_HOST port 2 */
+#ifdef CONFIG_USB_EHCI_MXC
+static int mxc_usbh1_pins[] = {
+ PB22_PF_USBH1_SUSP,
@@ -1498,43 +1498,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+/* APF27Dev has a microSD connector */
+#ifdef CONFIG_MMC_MXC
-+# ifdef CONFIG_APF27_DEVTEST
-+static int mxc_sdhc1_pins[] = {
-+ PE18_PF_SDHC1_D0,
-+ PE19_PF_SDHC1_D1,
-+ PE20_PF_SDHC1_D2,
-+ PE21_PF_SDHC1_D3,
-+ PE22_PF_SDHC1_CMD,
-+ PE22_PF_SDHC1_CLK,
-+};
-+
-+static void apf27_sdhc1_init(struct device *dev)
-+{
-+ u16 data;
-+
-+ printk("apf27: configuring SDHC1 GPIOs\n");
-+ mxc_gpio_setup_multiple_pins(mxc_sdhc1_pins, ARRAY_SIZE(mxc_sdhc1_pins), "SDHC1");
-+ /* set 100k pull-down on sdhc1 dat3 pin (for card insertion/removal detection) */
-+ data = __raw_readw(IO_ADDRESS(SYSCTRL_BASE_ADDR + 0x54)); /* -> PSCR register */
-+ data &= ~(0x0c);
-+ __raw_writew(data, IO_ADDRESS(SYSCTRL_BASE_ADDR + 0x54));
-+ /* ?? enable clock ?? */
-+}
-+
-+static void apf27_sdhc1_exit(struct device *pdev)
-+{
-+ printk("apf27: unconfiguring SDHC1 GPIOs\n");
-+ mxc_gpio_release_multiple_pins(mxc_sdhc1_pins, ARRAY_SIZE(mxc_sdhc1_pins));
-+}
-+
-+static struct imxmmc_platform_data apf27_sdhc1_pdata = {
-+// .card_present = apf27_mmc_card_present,
-+ .clk = "sdhc_clk",
-+ .init = apf27_sdhc1_init,
-+ .exit = apf27_sdhc1_exit,
-+};
-+# endif /* CONFIG_APF27_DEVTEST */
-+
+static int mxc_sdhc2_pins[] = {
+ PB4_PF_SDHC2_D0,
+ PB5_PF_SDHC2_D1,
@@ -1548,7 +1511,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+{
+ int ret;
+
-+ printk("apf27: configuring SDHC2 GPIOs\n");
+ mxc_gpio_setup_multiple_pins(mxc_sdhc2_pins, ARRAY_SIZE(mxc_sdhc2_pins), "SDHC2");
+
+ ret = request_irq(IRQ_GPIOC(14), detect_irq, 0, "imx-mmc-detect", data);
@@ -1566,24 +1528,17 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static void apf27_sdhc2_exit(struct device *dev, void *data)
+{
-+ printk("apf27: unconfiguring SDHC2 GPIOs\n");
-+
+ free_irq(IRQ_GPIOC(14), data);
+ mxc_gpio_release_multiple_pins(mxc_sdhc2_pins, ARRAY_SIZE(mxc_sdhc2_pins));
+}
+
+static struct imxmmc_platform_data apf27_sdhc2_pdata = {
-+/* .card_present = apf27_mmc_card_present,
-+ .clk = "sdhc_clk", */
+ .init = apf27_sdhc2_init,
+ .exit = apf27_sdhc2_exit,
+};
+
+static inline void apf27dev_init_mmc(void)
+{
-+# ifdef CONFIG_APF27_DEVTEST
-+ mxc_register_device(&mxc_sdhc_device0, &apf27_sdhc1_pdata);
-+# endif
+ mxc_register_device(&mxc_sdhc_device1, &apf27_sdhc2_pdata);
+}
+#endif /* CONFIG_MMC_MXC */
@@ -1794,7 +1749,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-18 16:55:09.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-01-19 17:08:44.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2019,8 +1974,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-18 16:55:09.000000000 +0100
-@@ -0,0 +1,159 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-01-19 17:08:44.000000000 +0100
+@@ -0,0 +1,199 @@
+ /*
+ * apf27-dev-ext-apw.c
+ * Support for AFP27Dev's wireless extension board.
@@ -2045,8 +2000,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
++#include <mach/common.h>
+#include <mach/iomux-mx1-mx2.h>
+#include <mach/gpio.h>
++#include <mach/mmc.h>
++#include "devices.h"
+
+
+/* An optional GSM module can be added to wireless extension board */
@@ -2079,7 +2037,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM */
+
+
-+/* An optionnal GPS module can be added to wireless extension board */
++/* An optionnal GPS module can be mounted on wireless extension board */
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
+
+#define GPS_WAKEUP (GPIO_PORTB | 20) /* CSI_VSYNC_UART5_CTS */
@@ -2109,7 +2067,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS */
+
+
-+/* An optionnal Bluetooth + WiFi module can be added to wireless extension board */
++/* An optionnal Bluetooth + WiFi (Wi2Wi) module can be mounted on wireless
++ extension board */
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
+
+#define BT_RESET (GPIO_PORTB | 14) /* CSI_D4 */
@@ -2122,10 +2081,46 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
+};
+
++/* SDHC1 is used for WiFi */
++static int mxc_sdhc1_pins[] = {
++ PE18_PF_SDHC1_D0,
++ PE19_PF_SDHC1_D1,
++ PE20_PF_SDHC1_D2,
++ PE21_PF_SDHC1_D3,
++ PE22_PF_SDHC1_CMD,
++ PE22_PF_SDHC1_CLK,
++};
++
++static int apw_sdhc1_init(struct device *dev, irq_handler_t handler, void *data)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_sdhc1_pins,
++ ARRAY_SIZE(mxc_sdhc1_pins),
++ "SDHC1");
++}
++
++static void apw_sdhc1_exit(struct device *pdev, void *data)
++{
++ mxc_gpio_release_multiple_pins(mxc_sdhc1_pins, ARRAY_SIZE(mxc_sdhc1_pins));
++}
++
++static struct imxmmc_platform_data apw_sdhc1_pdata = {
++ .init = apw_sdhc1_init,
++ .exit = apw_sdhc1_exit,
++};
++
++/* UART6 is used for Bluetooth (init done in apf27-dev.c depending on
++ Linux config) */
++
+static int apw_bt_wifi_init(void)
+{
-+ int res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
++ int res;
++
++ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
++
++ res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
+ ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
++ if (!res)
++ mxc_register_device(&mxc_sdhc_device0, &apw_sdhc1_pdata);
+
+ return res;
+}
hooks/post-receive
--
armadeus
|
