summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-12-07 21:09:24 +0800
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-12-10 21:00:16 +0100
commit5d756147f7d356c3e85372373a0054dcf25a370e (patch)
treea679e31f268ddc4fb33bb7d8dad383d784faf01d
parent8005c49d9aea74d382f474ce11afbbc7d7130bec (diff)
downloadlinux-stable-5d756147f7d356c3e85372373a0054dcf25a370e.tar.gz
linux-stable-5d756147f7d356c3e85372373a0054dcf25a370e.tar.bz2
linux-stable-5d756147f7d356c3e85372373a0054dcf25a370e.zip
ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
The optional 2nd clock is CLKID_SDIO. We removed CLK_IGNORE_UNUSED from CLKID_SDIO's flag, so the sdhci2 doesn't work. This patch fixes this issue by correcting the sdhci2's 2nd clock. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-rw-r--r--arch/arm/boot/dts/berlin2q.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 8ea177f375dd..5b101290ff94 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -135,7 +135,7 @@
compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_NFC>;
+ clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_SDIO>;
clock-names = "io", "core";
status = "disabled";
};