Unverified Commit 44051777 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.19-rockchip-dts32-2' of... 

Merge tag 'v5.19-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/late

Amba and clock fixes to conform better to actual dt-bindings.

* tag 'v5.19-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add clocks property to cru node rk3228
  ARM: dts: rockchip: add clocks property to cru node rk3036
  ARM: dts: rockchip: add clocks property to cru node rk3066a/rk3188
  ARM: dts: rockchip: add clocks property to cru node rk3288
  ARM: dts: rockchip: Remove "amba" bus nodes from rv1108
  ARM: dts: rockchip: add clocks property to cru node rv1108

Link: https://lore.kernel.org/r/4798587.jE0xQCEvom@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4a4e81dd 840fc447

arch/arm/boot/dts/rk3036.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ 
	cru: clock-controller@20000000 {

		compatible = "rockchip,rk3036-cru";

		reg = <0x20000000 0x1000>;

		clocks = <&xin24m>;

		clock-names = "xin24m";

		rockchip,grf = <&grf>;

		#clock-cells = <1>;

		#reset-cells = <1>;

arch/arm/boot/dts/rk3066a.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -202,8 +202,9 @@ 
	cru: clock-controller@20000000 {

		compatible = "rockchip,rk3066a-cru";

		reg = <0x20000000 0x1000>;

		clocks = <&xin24m>;

		clock-names = "xin24m";

		rockchip,grf = <&grf>;



		#clock-cells = <1>;

		#reset-cells = <1>;

		assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,

arch/arm/boot/dts/rk3188.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -195,8 +195,9 @@ 
	cru: clock-controller@20000000 {

		compatible = "rockchip,rk3188-cru";

		reg = <0x20000000 0x1000>;

		clocks = <&xin24m>;

		clock-names = "xin24m";

		rockchip,grf = <&grf>;



		#clock-cells = <1>;

		#reset-cells = <1>;

	};

arch/arm/boot/dts/rk322x.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ 
	cru: clock-controller@110e0000 {

		compatible = "rockchip,rk3228-cru";

		reg = <0x110e0000 0x1000>;

		clocks = <&xin24m>;

		clock-names = "xin24m";

		rockchip,grf = <&grf>;

		#clock-cells = <1>;

		#reset-cells = <1>;

arch/arm/boot/dts/rk3288.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -862,6 +862,8 @@ 
	cru: clock-controller@ff760000 {

		compatible = "rockchip,rk3288-cru";

		reg = <0x0 0xff760000 0x0 0x1000>;

		clocks = <&xin24m>;

		clock-names = "xin24m";

		rockchip,grf = <&grf>;

		#clock-cells = <1>;

		#reset-cells = <1>;