From 6c46f79291e9ee9cdcf656462eee37ee361d703c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 8 Mar 2017 15:09:16 +0100 Subject: [PATCH] armv8: snapdragon: make dtbs more compatible with Linux 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 | 6 +++--- drivers/mmc/msm_sdhci.c | 2 +- drivers/serial/serial_msm.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 7746622dda..a743a8cda8 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -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>; }; diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 1b82991c0e..863f569ca9 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -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; diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index a7cab1346f..4650151662 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -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; -- 2.39.2