Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 823927bd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.18-rockchip-dts64-1' of... 

Merge tag 'v4.18-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

All iommus got their clocks added and rk3399 got support for its
usb3-phy otg-port and better ajustment for the cpll child clocks.
On the board side, all rk3399 got their typec phys enabled - which
is needed for better usb support, the sapphire board got some more
properties moved to the excavator baseboard where they really belong,
kevin got a fix to use a real devicetree compatible and puma-haikou
got its hdmi port enabled.

* tag 'v4.18-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou
  arm64: dts: rockchip: use canonical compatible for touchpad/touchscreen on gru-kevin
  arm64: dts: rockchip: add clocks in iommu nodes
  arm64: dts: rockchip: add usb3-phy otg-port support for rk3399
  arm64: dts: rockchip: remove PCIe assigned-clocks in excavator baseboard
  arm64: dts: rockchip: move rk3399-sapphire PCIe to excavator baseboard
  arm64: dts: rockchip: assign clock rate for cpll child clocks on rk3399
  arm64: dts: rockchip: enable typec-phy0 for rk3399-puma-haikou
  arm64: dts: rockchip: enable typec-phy1 for rk3399-puma
  arm64: dts: rockchip: enable typec-phy for rk3399-firefly
  arm64: dts: rockchip: enable typec-phy for rk3399-sapphire

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 80dedbe0 17bd0737

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -595,6 +595,8 @@ 
		reg = <0x0 0xff330200 0 0x100>;

		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "h265e_mmu";

		clocks = <&cru ACLK_H265>, <&cru PCLK_H265>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -604,6 +606,8 @@ 
		reg = <0x0 0xff340800 0x0 0x40>;

		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu_mmu";

		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -613,6 +617,8 @@ 
		reg = <0x0 0xff350800 0x0 0x40>;

		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vpu_mmu";

		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -622,6 +628,8 @@ 
		reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>;

		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "rkvdec_mmu";

		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -631,6 +639,8 @@ 
		reg = <0x0 0xff373f00 0x0 0x100>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vop_mmu";

		clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};

arch/arm64/boot/dts/rockchip/rk3368.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -742,6 +742,8 @@ 
		reg = <0x0 0xff900800 0x0 0x100>;

		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "iep_mmu";

		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -752,6 +754,8 @@ 
		      <0x0 0xff915000 0x0 0x100>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "isp_mmu";

		clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;

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

		#iommu-cells = <0>;

		rockchip,disable-mmu-reset;

		status = "disabled";
@@ -762,6 +766,8 @@ 
		reg = <0x0 0xff930300 0x0 0x100>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vop_mmu";

		clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -772,6 +778,8 @@ 
		      <0x0 0xff9a0480 0x0 0x40>;

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "hevc_mmu";

		clocks = <&cru ACLK_VIDEO>, <&cru HCLK_VIDEO>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -782,6 +790,8 @@ 
		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu_mmu", "vdpu_mmu";

		clocks = <&cru ACLK_VIDEO>, <&cru HCLK_VIDEO>;

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

		#iommu-cells = <0>;

		status = "disabled";

	};

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+8 −0
Original line number Diff line number Diff line
@@ -662,6 +662,14 @@ 
	status = "okay";

};



&tcphy0 {

	status = "okay";

};



&tcphy1 {

	status = "okay";

};



&tsadc {

	/* tshut mode 0:CRU 1:GPIO */

	rockchip,hw-tshut-mode = <1>;

arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ ap_i2c_dig: &i2c2 { 


&ap_i2c_tp {

	trackpad@4a {

		compatible = "atmel,atmel_mxt_tp";

		compatible = "atmel,maxtouch";

		reg = <0x4a>;

		pinctrl-names = "default";

		pinctrl-0 = <&trackpad_int_l>;
@@ -271,7 +271,7 @@ ap_i2c_dig: &i2c2 { 


&ap_i2c_ts {

	touchscreen@4b {

		compatible = "atmel,atmel_mxt_ts";

		compatible = "atmel,maxtouch";

		reg = <0x4b>;

		pinctrl-names = "default";

		pinctrl-0 = <&touch_int_l>;

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -588,7 +588,9 @@ 
		<&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,

		<&cru PCLK_PERILP0>, <&cru ACLK_CCI>,

		<&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,

		<&cru ACLK_VIO>;

		<&cru ACLK_VIO>, <&cru ACLK_HDCP>,

		<&cru ACLK_GIC_PRE>,

		<&cru PCLK_DDR>;

	assigned-clock-rates =

		<600000000>, <800000000>,

		<1000000000>,
@@ -597,7 +599,9 @@ 
		<100000000>, <100000000>,

		<50000000>, <800000000>,

		<100000000>, <50000000>,

		<400000000>;

		<400000000>, <400000000>,

		<200000000>,

		<200000000>;

};



&emmc_phy {