diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 11:39:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 11:39:02 +0000 |
| commit | 85871f283a2a0af3020684eaf7b28ff43d35fce8 (patch) | |
| tree | 3a3c5a1b34786483581ba9c933841ed92c7ae590 /target/linux/cns3xxx | |
| parent | 6bb7409e5a85da6ae3323ec179311a99d0de79e5 (diff) | |
| download | upstream-85871f283a2a0af3020684eaf7b28ff43d35fce8.tar.gz upstream-85871f283a2a0af3020684eaf7b28ff43d35fce8.tar.bz2 upstream-85871f283a2a0af3020684eaf7b28ff43d35fce8.zip | |
cns3xxx: Fix GPIO configuration for Gateworks Laguna boards
The Laguna boards do not use all the same pins for SDHCI as the Cavium
reference board.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 33684
Diffstat (limited to 'target/linux/cns3xxx')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/300-laguna_support.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch index a4602f9292..b42606b508 100644 --- a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch +++ b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch @@ -963,3 +963,26 @@ obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o +--- a/arch/arm/mach-cns3xxx/devices.c ++++ b/arch/arm/mach-cns3xxx/devices.c +@@ -19,6 +19,7 @@ + #include <mach/cns3xxx.h> + #include <mach/irqs.h> + #include <mach/pm.h> ++#include <asm/mach-types.h> + #include "core.h" + #include "devices.h" + +@@ -102,7 +103,11 @@ void __init cns3xxx_sdhci_init(void) + u32 gpioa_pins = __raw_readl(gpioa); + + /* MMC/SD pins share with GPIOA */ +- gpioa_pins |= 0x1fff0004; ++ if (machine_is_gw2388()) { ++ gpioa_pins |= 0x1fff0000; ++ } else { ++ gpioa_pins |= 0x1fff0004; ++ } + __raw_writel(gpioa_pins, gpioa); + + cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO)); |