Unverified Commit f82c6e6d authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

A lot of fixes related to the dt-binding yaml conversion,
power-domain additions for rk322x and rk3036 and the missing
mmc aliases move to board files on rk3066/rk3188.

* tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add power controller for RK322x
  ARM: dts: rockchip: add power controller for RK3036
  ARM: dts: rockchip: add labels to the timer nodes on rk3066a
  ARM: dts: rockchip: fix supply properties in io-domains nodes
  ARM: dts: rockchip: remove #phy-cells from usbphy node rk3066/rk3188
  ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
  ARM: dts: rockchip: move mmc aliases to board dts on rk3066/rk3188
  ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
  ARM: dts: rockchip: rename vcc_stdby node name for rk3066a-rayeager.dts
  ARM: dts: rockchip: Remove more clock-names from PWM nodes
  ARM: dts: rockchip: add #power-domain-cells to power domain nodes
  ARM: dts: rockchip: Fix power-controller node names for rk3288
  ARM: dts: rockchip: Fix power-controller node names for rk3188
  ARM: dts: rockchip: Fix power-controller node names for rk3066a
  ARM: dts: rockchip: Remove useless interrupt-names on IOMMU node on rk3036
  ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x
  ARM: dts: rockchip: Fix the timer clocks order
  ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
  ARM: dts: rockchip: Fix thermal sensor cells o rk322x

Link: https://lore.kernel.org/r/2084346.irdbgypaU6@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 43b32198 623ba75a

arch/arm/boot/dts/rk3036-kylin.dts

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ sdmmc_pwr: sdmmc-pwr { 
		};

	};



	sleep {

	suspend {

		global_pwroff: global-pwroff {

			rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;

		};

arch/arm/boot/dts/rk3036.dtsi

+50 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <dt-bindings/pinctrl/rockchip.h>

#include <dt-bindings/clock/rk3036-cru.h>

#include <dt-bindings/soc/rockchip,boot-mode.h>

#include <dt-bindings/power/rk3036-power.h>



/ {

	#address-cells = <1>;
@@ -111,6 +112,7 @@ gpu: gpu@10090000 { 
		assigned-clock-rates = <100000000>;

		clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;

		clock-names = "bus", "core";

		power-domains = <&power RK3036_PD_GPU>;

		resets = <&cru SRST_GPU>;

		status = "disabled";

	};
@@ -124,6 +126,7 @@ vop: vop@10118000 { 
		resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;

		reset-names = "axi", "ahb", "dclk";

		iommus = <&vop_mmu>;

		power-domains = <&power RK3036_PD_VIO>;

		status = "disabled";



		vop_out: port {
@@ -140,13 +143,28 @@ vop_mmu: iommu@10118300 { 
		compatible = "rockchip,iommu";

		reg = <0x10118300 0x100>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vop_mmu";

		clocks = <&cru ACLK_LCDC>, <&cru HCLK_LCDC>;

		clock-names = "aclk", "iface";

		power-domains = <&power RK3036_PD_VIO>;

		#iommu-cells = <0>;

		status = "disabled";

	};



	qos_gpu: qos@1012d000 {

		compatible = "rockchip,rk3036-qos", "syscon";

		reg = <0x1012d000 0x20>;

	};



	qos_vpu: qos@1012e000 {

		compatible = "rockchip,rk3036-qos", "syscon";

		reg = <0x1012e000 0x20>;

	};



	qos_vio: qos@1012f000 {

		compatible = "rockchip,rk3036-qos", "syscon";

		reg = <0x1012f000 0x20>;

	};



	gic: interrupt-controller@10139000 {

		compatible = "arm,gic-400";

		interrupt-controller;
@@ -302,6 +320,37 @@ grf: syscon@20008000 { 
		compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd";

		reg = <0x20008000 0x1000>;



		power: power-controller {

			compatible = "rockchip,rk3036-power-controller";

			#power-domain-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;



			power-domain@RK3036_PD_VIO {

				reg = <RK3036_PD_VIO>;

				clocks = <&cru ACLK_LCDC>,

					 <&cru HCLK_LCDC>,

					 <&cru SCLK_LCDC>;

				pm_qos = <&qos_vio>;

				#power-domain-cells = <0>;

			};



			power-domain@RK3036_PD_VPU {

				reg = <RK3036_PD_VPU>;

				clocks = <&cru ACLK_VCODEC>,

					 <&cru HCLK_VCODEC>;

				pm_qos = <&qos_vpu>;

				#power-domain-cells = <0>;

			};



			power-domain@RK3036_PD_GPU {

				reg = <RK3036_PD_GPU>;

				clocks = <&cru SCLK_GPU>;

				pm_qos = <&qos_gpu>;

				#power-domain-cells = <0>;

			};

		};



		reboot-mode {

			compatible = "syscon-reboot-mode";

			offset = <0x1d8>;

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

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ / { 
	model = "bq Curie 2";

	compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";



	aliases {

		mmc0 = &mmc0;

		mmc1 = &mmc1;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

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

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ / { 
	model = "MarsBoard RK3066";

	compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";



	aliases {

		mmc0 = &mmc0;

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

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

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ / { 
	model = "Rikomagic MK808";

	compatible = "rikomagic,mk808", "rockchip,rk3066a";



	aliases {

		mmc0 = &mmc0;

		mmc1 = &mmc1;

	};



	chosen {

		stdout-path = "serial2:115200n8";

	};