diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-10-08 10:29:27 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-08 10:29:27 +0000 |
commit | c3ae6b898c102560be67a0045028cc0a60a6be3a (patch) | |
tree | b8dcc87ca9235c4881fef16d4b7ccd3dc9f0633b /target/linux/cns3xxx/files/arch/arm/mach-cns3xxx | |
parent | d769bda9553d3ca02b9cf187783f4f3afca82a67 (diff) | |
download | upstream-c3ae6b898c102560be67a0045028cc0a60a6be3a.tar.gz upstream-c3ae6b898c102560be67a0045028cc0a60a6be3a.tar.bz2 upstream-c3ae6b898c102560be67a0045028cc0a60a6be3a.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>
Backport of r42829
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42845 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/files/arch/arm/mach-cns3xxx')
-rw-r--r-- | target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c | 3 |
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); |