]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
armv8: snapdragon: make dtbs more compatible with Linux
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 8 Mar 2017 14:09:16 +0000 (15:09 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 13 Mar 2017 15:36:00 +0000 (16:36 +0100)
Linux has a 'clocks' property in DTB to specify (a list of) clocks
required for a device. The snapdragon DTS file in U-Boot uses a
'clock' property for the same purpose.

Change this to 'clocks', so that the Linux DTB can also be used to
configure U-Boot devices.

arch/arm/dts/dragonboard410c.dts
drivers/mmc/msm_sdhci.c
drivers/serial/serial_msm.c

index 7746622dda802e36bd0f56da88aeea96865a5953..a743a8cda8ea545e7b5e397aab5e54055d165235 100644 (file)
@@ -45,7 +45,7 @@
                        compatible = "qcom,msm-uartdm-v1.4";
                        reg = <0x78b0000 0x200>;
                        u-boot,dm-pre-reloc;
-                       clock = <&clkc 4>;
+                       clocks = <&clkc 4>;
                };
 
                restart@4ab000 {
@@ -73,7 +73,7 @@
                        bus-width = <0x8>;
                        index = <0x0>;
                        non-removable;
-                       clock = <&clkc 0>;
+                       clocks = <&clkc 0>;
                        clock-frequency = <100000000>;
                };
 
@@ -82,7 +82,7 @@
                        reg = <0x7864900 0x11c 0x7864000 0x800>;
                        index = <0x1>;
                        bus-width = <0x4>;
-                       clock = <&clkc 1>;
+                       clocks = <&clkc 1>;
                        clock-frequency = <200000000>;
                };
 
index 1b82991c0ee2aa23390ad225570b8d73b4cc9d04..863f569ca9006c19797d39c6ed878a9e3fcc138d 100644 (file)
@@ -58,7 +58,7 @@ static int msm_sdc_clk_init(struct udevice *dev)
        struct clk clk;
        int ret;
 
-       ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clock", clkd,
+       ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clocks", clkd,
                                   2);
        if (ret)
                return ret;
index a7cab1346f228a5ff10c55c36338876a2ce28929..4650151662e6ea33a151319453c1b4b534c292f6 100644 (file)
@@ -154,8 +154,8 @@ static int msm_uart_clk_init(struct udevice *dev)
        struct clk clk;
        int ret;
 
-       ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clock", clkd,
-                                  2);
+       ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clocks",
+                                  clkd, 2);
        if (ret)
                return ret;