| 1 | --- a/arch/arm/mach-cns3xxx/Kconfig |
| 2 | +++ b/arch/arm/mach-cns3xxx/Kconfig |
| 3 | @@ -10,4 +10,12 @@ config MACH_CNS3420VB |
| 4 | This is a platform with an on-board ARM11 MPCore and has support |
| 5 | for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc. |
| 6 | |
| 7 | +config MACH_GW2388 |
| 8 | + bool "Support for Gateworks Laguna Platform" |
| 9 | + help |
| 10 | + Include support for the Gateworks Laguna Platform |
| 11 | + |
| 12 | + This is a platform with an on-board ARM11 MPCore and has support |
| 13 | + for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, I2C, GIG, etc. |
| 14 | + |
| 15 | endmenu |
| 16 | --- a/arch/arm/mach-cns3xxx/Makefile |
| 17 | +++ b/arch/arm/mach-cns3xxx/Makefile |
| 18 | @@ -1,6 +1,7 @@ |
| 19 | obj-$(CONFIG_ARCH_CNS3XXX) += core.o gpio.o pm.o devices.o |
| 20 | obj-$(CONFIG_PCI) += pcie.o |
| 21 | obj-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o |
| 22 | +obj-$(CONFIG_MACH_GW2388) += laguna.o |
| 23 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o |
| 24 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
| 25 | obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o |
| 26 | --- a/arch/arm/mach-cns3xxx/devices.c |
| 27 | +++ b/arch/arm/mach-cns3xxx/devices.c |
| 28 | @@ -19,6 +19,7 @@ |
| 29 | #include <mach/cns3xxx.h> |
| 30 | #include <mach/irqs.h> |
| 31 | #include <mach/pm.h> |
| 32 | +#include <asm/mach-types.h> |
| 33 | #include "core.h" |
| 34 | #include "devices.h" |
| 35 | |
| 36 | @@ -102,7 +103,11 @@ void __init cns3xxx_sdhci_init(void) |
| 37 | u32 gpioa_pins = __raw_readl(gpioa); |
| 38 | |
| 39 | /* MMC/SD pins share with GPIOA */ |
| 40 | - gpioa_pins |= 0x1fff0004; |
| 41 | + if (machine_is_gw2388()) { |
| 42 | + gpioa_pins |= 0x1fff0000; |
| 43 | + } else { |
| 44 | + gpioa_pins |= 0x1fff0004; |
| 45 | + } |
| 46 | __raw_writel(gpioa_pins, gpioa); |
| 47 | |
| 48 | cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO)); |
| 49 | |
