summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2014-12-31 16:57:50 +0800
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-01-07 15:18:00 +0100
commit96ed6046d3bf1113de3bdbd6dbb7f40e6d0ae0ef (patch)
treeb2d06317f0608677034590323f4f849969091349 /arch/arm
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
downloadlinux-96ed6046d3bf1113de3bdbd6dbb7f40e6d0ae0ef.tar.gz
linux-96ed6046d3bf1113de3bdbd6dbb7f40e6d0ae0ef.tar.bz2
linux-96ed6046d3bf1113de3bdbd6dbb7f40e6d0ae0ef.zip
ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
On BG2Q, the sdhci2 host uses nfcecc for "io" clk and nfc for "core" clk. The shdci2 can't work without this patch due to the "core" clk is gated. Cc: stable@vger.kernel.org # 3.16+ Fixes: 0d859a6a9d14 ("ARM: dts: berlin: add the SDHCI nodes for the BG2Q") Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/berlin2q.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 35253c947a7c..903f3bb2ae3d 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -83,7 +83,8 @@
compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&chip CLKID_SDIO1XIN>;
+ clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>;
+ clock-names = "io", "core";
status = "disabled";
};