* [PATCH] arm64: dts: sc7180: Swap order of gpucc and sdhc_2
@ 2020-03-31 16:29 Douglas Anderson
2020-03-31 16:56 ` Matthias Kaehlcke
0 siblings, 1 reply; 2+ messages in thread
From: Douglas Anderson @ 2020-03-31 16:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: mka, Douglas Anderson, Mark Rutland, Rob Herring, devicetree,
linux-arm-msm, linux-kernel
Devices are supposed to be sorted by unit address. These two got
swapped when they landed. Fix.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 998f101ad623..4bdadfd9efb9 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1294,6 +1294,20 @@ pinconf-sd-cd {
};
};
+ gpucc: clock-controller@5090000 {
+ compatible = "qcom,sc7180-gpucc";
+ reg = <0 0x05090000 0 0x9000>;
+ clocks = <&rpmhcc RPMH_CXO_CLK>,
+ <&gcc GCC_GPU_GPLL0_CLK_SRC>,
+ <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
+ clock-names = "bi_tcxo",
+ "gcc_gpu_gpll0_clk_src",
+ "gcc_gpu_gpll0_div_clk_src";
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ #power-domain-cells = <1>;
+ };
+
sdhc_2: sdhci@8804000 {
compatible = "qcom,sc7180-sdhci", "qcom,sdhci-msm-v5";
reg = <0 0x08804000 0 0x1000>;
@@ -1312,20 +1326,6 @@ sdhc_2: sdhci@8804000 {
status = "disabled";
};
- gpucc: clock-controller@5090000 {
- compatible = "qcom,sc7180-gpucc";
- reg = <0 0x05090000 0 0x9000>;
- clocks = <&rpmhcc RPMH_CXO_CLK>,
- <&gcc GCC_GPU_GPLL0_CLK_SRC>,
- <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
- clock-names = "bi_tcxo",
- "gcc_gpu_gpll0_clk_src",
- "gcc_gpu_gpll0_div_clk_src";
- #clock-cells = <1>;
- #reset-cells = <1>;
- #power-domain-cells = <1>;
- };
-
qspi: spi@88dc000 {
compatible = "qcom,qspi-v1";
reg = <0 0x088dc000 0 0x600>;
--
2.26.0.rc2.310.g2932bb562d-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] arm64: dts: sc7180: Swap order of gpucc and sdhc_2
2020-03-31 16:29 [PATCH] arm64: dts: sc7180: Swap order of gpucc and sdhc_2 Douglas Anderson
@ 2020-03-31 16:56 ` Matthias Kaehlcke
0 siblings, 0 replies; 2+ messages in thread
From: Matthias Kaehlcke @ 2020-03-31 16:56 UTC (permalink / raw)
To: Douglas Anderson
Cc: Andy Gross, Bjorn Andersson, Mark Rutland, Rob Herring,
devicetree, linux-arm-msm, linux-kernel
On Tue, Mar 31, 2020 at 09:29:00AM -0700, Douglas Anderson wrote:
> Devices are supposed to be sorted by unit address. These two got
> swapped when they landed. Fix.
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
>
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 998f101ad623..4bdadfd9efb9 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -1294,6 +1294,20 @@ pinconf-sd-cd {
> };
> };
>
> + gpucc: clock-controller@5090000 {
> + compatible = "qcom,sc7180-gpucc";
> + reg = <0 0x05090000 0 0x9000>;
> + clocks = <&rpmhcc RPMH_CXO_CLK>,
> + <&gcc GCC_GPU_GPLL0_CLK_SRC>,
> + <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
> + clock-names = "bi_tcxo",
> + "gcc_gpu_gpll0_clk_src",
> + "gcc_gpu_gpll0_div_clk_src";
> + #clock-cells = <1>;
> + #reset-cells = <1>;
> + #power-domain-cells = <1>;
> + };
> +
> sdhc_2: sdhci@8804000 {
> compatible = "qcom,sc7180-sdhci", "qcom,sdhci-msm-v5";
> reg = <0 0x08804000 0 0x1000>;
> @@ -1312,20 +1326,6 @@ sdhc_2: sdhci@8804000 {
> status = "disabled";
> };
>
> - gpucc: clock-controller@5090000 {
> - compatible = "qcom,sc7180-gpucc";
> - reg = <0 0x05090000 0 0x9000>;
> - clocks = <&rpmhcc RPMH_CXO_CLK>,
> - <&gcc GCC_GPU_GPLL0_CLK_SRC>,
> - <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
> - clock-names = "bi_tcxo",
> - "gcc_gpu_gpll0_clk_src",
> - "gcc_gpu_gpll0_div_clk_src";
> - #clock-cells = <1>;
> - #reset-cells = <1>;
> - #power-domain-cells = <1>;
> - };
> -
> qspi: spi@88dc000 {
> compatible = "qcom,qspi-v1";
> reg = <0 0x088dc000 0 0x600>;
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-31 16:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-31 16:29 [PATCH] arm64: dts: sc7180: Swap order of gpucc and sdhc_2 Douglas Anderson
2020-03-31 16:56 ` Matthias Kaehlcke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).