aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-10 11:39:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-10-10 11:39:02 +0000
commitf89ae950b022fcc99e26f80fbad1e0d37a42c791 (patch)
tree595583296ebebcc8f92d078054b305c51375df61 /target
parentec94f89147c536af065287cdc7cd34172f9f1461 (diff)
downloadupstream-f89ae950b022fcc99e26f80fbad1e0d37a42c791.tar.gz
upstream-f89ae950b022fcc99e26f80fbad1e0d37a42c791.tar.bz2
upstream-f89ae950b022fcc99e26f80fbad1e0d37a42c791.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33684 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/cns3xxx/patches-3.3/300-laguna_support.patch23
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));