Commit 9bfa3829 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'juno-fix-5.14' of... 

Merge tag 'juno-fix-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/dt

ARMv8 Juno fix for v5.14

Just a single fix to use standard and generic nodes names for SCMI
power domain controller and clock controller devicetree nodes.

* tag 'juno-fix-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Update SCPI nodes as per the YAML schema

Link: https://lore.kernel.org/r/20210611075805.2813712-1-sudeep.holla@arm.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fb755b07 70010556

arch/arm64/boot/dts/arm/juno-base.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -568,13 +568,13 @@ scpi { 
		clocks {

			compatible = "arm,scpi-clocks";



			scpi_dvfs: scpi-dvfs {

			scpi_dvfs: clocks-0 {

				compatible = "arm,scpi-dvfs-clocks";

				#clock-cells = <1>;

				clock-indices = <0>, <1>, <2>;

				clock-output-names = "atlclk", "aplclk","gpuclk";

			};

			scpi_clk: scpi-clk {

			scpi_clk: clocks-1 {

				compatible = "arm,scpi-variable-clocks";

				#clock-cells = <1>;

				clock-indices = <3>;
@@ -582,7 +582,7 @@ scpi_clk: scpi-clk { 
			};

		};



		scpi_devpd: scpi-power-domains {

		scpi_devpd: power-controller {

			compatible = "arm,scpi-power-domains";

			num-domains = <2>;

			#power-domain-cells = <1>;