aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-07 10:37:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-07 10:37:09 +0000
commit461cef419390d15106894bc0df513df86b3cadeb (patch)
tree6aaa0e62e22196a1393d629cad72b018f2503766 /target/linux/cns3xxx
parentc623065eac4250abbb3c3b3472b39bd2cfbbcd3f (diff)
downloadupstream-461cef419390d15106894bc0df513df86b3cadeb.tar.gz
upstream-461cef419390d15106894bc0df513df86b3cadeb.tar.bz2
upstream-461cef419390d15106894bc0df513df86b3cadeb.zip
cns3xxx: fix register for enabling MMC/SD pins
also fixes a GPIO related regression from the upgrade to 3.10 Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42829 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
index 9021f3d65f..d61dad9b81 100644
--- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
+++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
@@ -818,8 +818,7 @@ static void __init laguna_init(void)
*reg |= BIT(12) | BIT(13);
/* Enable MMC/SD pins */
- reg = MISC_GPIOA_PIN_ENABLE_REG;
- *reg |= 0xf80;
+ *reg |= BIT(7) | BIT(8) | BIT(9) | BIT(10) | BIT(11);
cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_SPI_PCM_I2C);
cns3xxx_pwr_power_up(1 << PM_CLK_GATE_REG_OFFSET_SPI_PCM_I2C);