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

Commit 80dedbe0 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Fixed pin numbers for uart4 on rk3288, iommu clocks and small changes
over multiple boards like default serial setting for rk3288-tinker,
output selection for the dp83867 on the phycore-som and the newly
added pwm-backlight delay properties for veyron boards.

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

:
  ARM: dts: rockchip: default serial for rk3288 Tinker Board
  ARM: dts: rockchip: set PWM delay backlight settings for Minnie
  ARM: dts: rockchip: set PWM delay backlight settings for Veyron
  ARM: dts: rockchip: add clocks in iommu nodes
  ARM: dts: rockchip: Add dp83867 CLK_OUT muxing on rk3288-phycore-som
  ARM: dts: rockchip: fix uart4 pin-numbers for rk3288

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 171b1185 08624814

arch/arm/boot/dts/rk3036.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
		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";

		#iommu-cells = <0>;

		status = "disabled";

	};

arch/arm/boot/dts/rk322x.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -584,6 +584,8 @@ 
		reg = <0x20020800 0x100>;

		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vpu_mmu";

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

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

		iommu-cells = <0>;

		status = "disabled";

	};
@@ -593,6 +595,8 @@ 
		reg = <0x20030480 0x40>, <0x200304c0 0x40>;

		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vdec_mmu";

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

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

		iommu-cells = <0>;

		status = "disabled";

	};
@@ -602,6 +606,8 @@ 
		reg = <0x20053f00 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";

	};
@@ -611,6 +617,8 @@ 
		reg = <0x20070800 0x100>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "iep_mmu";

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

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

		iommu-cells = <0>;

		status = "disabled";

	};

arch/arm/boot/dts/rk3288-phycore-som.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
			ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;

			ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;

			enet-phy-lane-no-swap;

			ti,clk-output-sel = <DP83867_CLK_O_SEL_CHN_A_TCLK>;

		};

	};

};

arch/arm/boot/dts/rk3288-tinker.dts

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ 
	model = "Rockchip RK3288 Tinker Board";

	compatible = "asus,rk3288-tinker", "rockchip,rk3288";



	chosen {

		stdout-path = "serial2:115200n8";

	};



	memory {

		reg = <0x0 0x0 0x0 0x80000000>;

		device_type = "memory";

arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&bl_en>;

		pwms = <&pwm0 0 1000000 0>;

		pwm-delay-us = <10000>;

		post-pwm-on-delay-ms = <10>;

		pwm-off-delay-ms = <10>;

	};



	gpio-charger {