Commit 02c96f83 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.10-rockchip-dts32-1' of... 

Merge tag 'v5.10-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

cpu-supply fixes (supply for each cpu core not only cpu0)
and a spelling for the status property.

* tag 'v5.10-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: replace status value "ok" by "okay"
  ARM: dts: rockchip: update cpu supplies on rk3066a
  ARM: dts: rockchip: rk3066a: add label to cpu@1
  ARM: dts: rockchip: update cpu supplies on rk3288

Link: https://lore.kernel.org/r/1834049.gShM3QRH0n@diego


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a3ca4b5e 0cf10e6f

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+5 −1
Original line number Diff line number Diff line
@@ -63,7 +63,11 @@ 
};



&cpu0 {

	cpu0-supply = <&vdd_arm>;

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&i2c1 {

arch/arm/boot/dts/rk3066a-marsboard.dts

+5 −1
Original line number Diff line number Diff line
@@ -47,7 +47,11 @@ 
};



&cpu0 {

	cpu0-supply = <&vdd_arm>;

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&i2c1 {

arch/arm/boot/dts/rk3066a-rayeager.dts

+5 −1
Original line number Diff line number Diff line
@@ -128,7 +128,11 @@ 
};



&cpu0 {

	cpu0-supply = <&vdd_arm>;

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&emac {

arch/arm/boot/dts/rk3066a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;

		};

		cpu@1 {

		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			next-level-cache = <&L2>;

arch/arm/boot/dts/rk3288-evb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ 
	pinctrl-0 = <&rgmii_pins>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "ok";

	status = "okay";

};



&gpu {

CRA Git | Maintained and supported by SUSTech CRA and CCSE