summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-23 21:18:28 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 15:54:37 +0400
commit85fb28bed813469ba56706a7e48fba596f47c253 (patch)
tree25a229324358e68059010b070a43b8da37b908d6 /arch/arm/boot
parentbba5f2cc2f0fe4191ad2699c7c03a6def31f54e2 (diff)
downloadlinux-85fb28bed813469ba56706a7e48fba596f47c253.tar.xz
ARM: u300: convert MMC/SD clock to device tree
This converts the last of the U300 clocks to being probed from the device tree. Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/ste-u300.dts9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 7edc5e58a5a5..05a082164c10 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -205,6 +205,11 @@
clock-id = <5>;
clocks = <&fast_clk>;
};
+ mmc_mclk: mmc_mclk {
+ #clock-cells = <0>;
+ compatible = "stericsson,u300-syscon-mclk";
+ clocks = <&mmc_pclk>;
+ };
spi_clk: spi_p_clk@26M {
#clock-cells = <0>;
compatible = "stericsson,u300-syscon-clk";
@@ -433,8 +438,8 @@
reg = <0xc0001000 0x1000>;
interrupt-parent = <&vicb>;
interrupts = <6 7>;
- clocks = <&mmc_pclk>;
- clock-names = "apb_pclk";
+ clocks = <&mmc_pclk>, <&mmc_mclk>;
+ clock-names = "apb_pclk", "mclk";
max-frequency = <24000000>;
bus-width = <4>; // SD-card slot
mmc-cap-mmc-highspeed;