| Message ID | 1479343419-29326-1-git-send-email-riteshh@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Thu, Nov 17, 2016 at 06:13:39AM +0530, Ritesh Harjani wrote: > Add xo entry to sdhc clock node on all qcom platforms. > > Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> > --- > arch/arm/boot/dts/qcom-apq8084.dtsi | 16 ++++++++++------ > arch/arm/boot/dts/qcom-msm8974.dtsi | 16 ++++++++++------ > arch/arm64/boot/dts/qcom/msm8916.dtsi | 10 ++++++---- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 9 +++++---- > 4 files changed, 31 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi > index 39eb7a4..f756cbb 100644 > --- a/arch/arm/boot/dts/qcom-apq8084.dtsi > +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi > @@ -182,13 +182,13 @@ > }; > > clocks { > - xo_board { > + xo_board: xo_board { > compatible = "fixed-clock"; > #clock-cells = <0>; > clock-frequency = <19200000>; > }; > > - sleep_clk { > + sleep_clk: sleep_clk { > compatible = "fixed-clock"; > #clock-cells = <0>; > clock-frequency = <32768>; > @@ -416,8 +416,10 @@ > reg-names = "hc_mem", "core_mem"; > interrupts = <0 123 0>, <0 138 0>; > interrupt-names = "hc_irq", "pwr_irq"; > - clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>; > - clock-names = "core", "iface"; > + clocks = <&gcc GCC_SDCC1_APPS_CLK>, > + <&gcc GCC_SDCC1_AHB_CLK>, > + <&xo_board 0>; With clock-cells = <0>, this should be <&xo_board> Somehow this passes the dtc compiler. But it is still incorrect. Please fix all instances of this to use the correct number of cells in the xo_board references. Andy -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/18/2016 9:26 AM, Andy Gross wrote: > On Thu, Nov 17, 2016 at 06:13:39AM +0530, Ritesh Harjani wrote: >> Add xo entry to sdhc clock node on all qcom platforms. >> >> Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> >> --- >> arch/arm/boot/dts/qcom-apq8084.dtsi | 16 ++++++++++------ >> arch/arm/boot/dts/qcom-msm8974.dtsi | 16 ++++++++++------ >> arch/arm64/boot/dts/qcom/msm8916.dtsi | 10 ++++++---- >> arch/arm64/boot/dts/qcom/msm8996.dtsi | 9 +++++---- >> 4 files changed, 31 insertions(+), 20 deletions(-) >> >> diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi >> index 39eb7a4..f756cbb 100644 >> --- a/arch/arm/boot/dts/qcom-apq8084.dtsi >> +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi >> @@ -182,13 +182,13 @@ >> }; >> >> clocks { >> - xo_board { >> + xo_board: xo_board { >> compatible = "fixed-clock"; >> #clock-cells = <0>; >> clock-frequency = <19200000>; >> }; >> >> - sleep_clk { >> + sleep_clk: sleep_clk { >> compatible = "fixed-clock"; >> #clock-cells = <0>; >> clock-frequency = <32768>; >> @@ -416,8 +416,10 @@ >> reg-names = "hc_mem", "core_mem"; >> interrupts = <0 123 0>, <0 138 0>; >> interrupt-names = "hc_irq", "pwr_irq"; >> - clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>; >> - clock-names = "core", "iface"; >> + clocks = <&gcc GCC_SDCC1_APPS_CLK>, >> + <&gcc GCC_SDCC1_AHB_CLK>, >> + <&xo_board 0>; > > With clock-cells = <0>, this should be <&xo_board> Ok, done. > > Somehow this passes the dtc compiler. But it is still incorrect. Please fix > all instances of this to use the correct number of cells in the xo_board > references. Sure. > > > Andy > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index 39eb7a4..f756cbb 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -182,13 +182,13 @@ }; clocks { - xo_board { + xo_board: xo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>; }; - sleep_clk { + sleep_clk: sleep_clk { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32768>; @@ -416,8 +416,10 @@ reg-names = "hc_mem", "core_mem"; interrupts = <0 123 0>, <0 138 0>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>; - clock-names = "core", "iface"; + clocks = <&gcc GCC_SDCC1_APPS_CLK>, + <&gcc GCC_SDCC1_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; status = "disabled"; }; @@ -427,8 +429,10 @@ reg-names = "hc_mem", "core_mem"; interrupts = <0 125 0>, <0 221 0>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, <&gcc GCC_SDCC2_AHB_CLK>; - clock-names = "core", "iface"; + clocks = <&gcc GCC_SDCC2_APPS_CLK>, + <&gcc GCC_SDCC2_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index d210947..6333415 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -220,13 +220,13 @@ }; clocks { - xo_board { + xo_board: xo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>; }; - sleep_clk { + sleep_clk: sleep_clk { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32768>; @@ -558,8 +558,10 @@ reg-names = "hc_mem", "core_mem"; interrupts = <0 123 0>, <0 138 0>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>; - clock-names = "core", "iface"; + clocks = <&gcc GCC_SDCC1_APPS_CLK>, + <&gcc GCC_SDCC1_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; status = "disabled"; }; @@ -569,8 +571,10 @@ reg-names = "hc_mem", "core_mem"; interrupts = <0 125 0>, <0 221 0>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, <&gcc GCC_SDCC2_AHB_CLK>; - clock-names = "core", "iface"; + clocks = <&gcc GCC_SDCC2_APPS_CLK>, + <&gcc GCC_SDCC2_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 466ca57..7bce1b3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -512,8 +512,9 @@ interrupts = <0 123 0>, <0 138 0>; interrupt-names = "hc_irq", "pwr_irq"; clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>; - clock-names = "core", "iface"; + <&gcc GCC_SDCC1_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; bus-width = <8>; non-removable; status = "disabled"; @@ -527,8 +528,9 @@ interrupts = <0 125 0>, <0 221 0>; interrupt-names = "hc_irq", "pwr_irq"; clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>; - clock-names = "core", "iface"; + <&gcc GCC_SDCC2_AHB_CLK>, + <&xo_board 0>; + clock-names = "core", "iface", "xo"; bus-width = <4>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 338f82a..86bfc2d 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -192,14 +192,14 @@ }; clocks { - xo_board { + xo_board: xo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>; clock-output-names = "xo_board"; }; - sleep_clk { + sleep_clk: sleep_clk { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32764>; @@ -347,9 +347,10 @@ interrupts = <0 125 0>, <0 221 0>; interrupt-names = "hc_irq", "pwr_irq"; - clock-names = "iface", "core"; + clock-names = "iface", "core", "xo"; clocks = <&gcc GCC_SDCC2_AHB_CLK>, - <&gcc GCC_SDCC2_APPS_CLK>; + <&gcc GCC_SDCC2_APPS_CLK>, + <&xo_board 0>; bus-width = <4>; };
Add xo entry to sdhc clock node on all qcom platforms. Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> --- arch/arm/boot/dts/qcom-apq8084.dtsi | 16 ++++++++++------ arch/arm/boot/dts/qcom-msm8974.dtsi | 16 ++++++++++------ arch/arm64/boot/dts/qcom/msm8916.dtsi | 10 ++++++---- arch/arm64/boot/dts/qcom/msm8996.dtsi | 9 +++++---- 4 files changed, 31 insertions(+), 20 deletions(-)