| Message ID | 20230324004040.572525-2-konrad.dybcio@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/7] mmc: msm_sdhci: Match clocks through "clocks" property | expand |
On Fri, 24 Mar 2023 at 06:10, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: > > "clocks" is the standard property used in Linux, "clock" seems to be > an U-Boot invention. Use the one that's more standardized. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > > arch/arm/dts/qcom-ipq4019.dtsi | 2 +- > drivers/serial/serial_msm.c | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi > index 6edc69da6747..dee3159e5893 100644 > --- a/arch/arm/dts/qcom-ipq4019.dtsi > +++ b/arch/arm/dts/qcom-ipq4019.dtsi > @@ -87,7 +87,7 @@ > blsp1_uart1: serial@78af000 { > compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; > reg = <0x78af000 0x200>; > - clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>; > + clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>; You have to update other platform dts files as well to avoid breaking them. -Sumit > bit-rate = <0xFF>; > status = "disabled"; > u-boot,dm-pre-reloc; > diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c > index a22623c316ed..9c370cac323f 100644 > --- a/drivers/serial/serial_msm.c > +++ b/drivers/serial/serial_msm.c > @@ -166,8 +166,7 @@ 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(dev), "clock", > - clkd, 2); > + ret = fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev), "clocks", clkd, 2); > if (ret) > return ret; > > -- > 2.40.0 >
On 24.03.2023 07:00, Sumit Garg wrote: > On Fri, 24 Mar 2023 at 06:10, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: >> >> "clocks" is the standard property used in Linux, "clock" seems to be >> an U-Boot invention. Use the one that's more standardized. >> >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >> --- >> >> arch/arm/dts/qcom-ipq4019.dtsi | 2 +- >> drivers/serial/serial_msm.c | 3 +-- >> 2 files changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi >> index 6edc69da6747..dee3159e5893 100644 >> --- a/arch/arm/dts/qcom-ipq4019.dtsi >> +++ b/arch/arm/dts/qcom-ipq4019.dtsi >> @@ -87,7 +87,7 @@ >> blsp1_uart1: serial@78af000 { >> compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; >> reg = <0x78af000 0x200>; >> - clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>; >> + clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>; > > You have to update other platform dts files as well to avoid breaking them. Right, my grep pattern didn't include dragonboard* (which I should probably update to include the SoC name too, anyway..). Konrad > > -Sumit > >> bit-rate = <0xFF>; >> status = "disabled"; >> u-boot,dm-pre-reloc; >> diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c >> index a22623c316ed..9c370cac323f 100644 >> --- a/drivers/serial/serial_msm.c >> +++ b/drivers/serial/serial_msm.c >> @@ -166,8 +166,7 @@ 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(dev), "clock", >> - clkd, 2); >> + ret = fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev), "clocks", clkd, 2); >> if (ret) >> return ret; >> >> -- >> 2.40.0 >>
diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi index 6edc69da6747..dee3159e5893 100644 --- a/arch/arm/dts/qcom-ipq4019.dtsi +++ b/arch/arm/dts/qcom-ipq4019.dtsi @@ -87,7 +87,7 @@ blsp1_uart1: serial@78af000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x78af000 0x200>; - clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>; + clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>; bit-rate = <0xFF>; status = "disabled"; u-boot,dm-pre-reloc; diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index a22623c316ed..9c370cac323f 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -166,8 +166,7 @@ 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(dev), "clock", - clkd, 2); + ret = fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev), "clocks", clkd, 2); if (ret) return ret;
"clocks" is the standard property used in Linux, "clock" seems to be an U-Boot invention. Use the one that's more standardized. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- arch/arm/dts/qcom-ipq4019.dtsi | 2 +- drivers/serial/serial_msm.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)