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

Commit cdf26ad4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of... 

Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "two more dts changes for Rockchip Cortex-A9 SoCs" from Heiko Stübner:

Watchdog nodes and a duplicate pinctrl property.

* tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: add watchdog node
  ARM: dts: rockchip: remove pinctrl setting from radxarock uart2

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 68a05338 eb2b9d47

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

+4 −0
Original line number Diff line number Diff line
@@ -188,3 +188,7 @@ 
&uart3 {

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm/boot/dts/rk3066a.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -425,3 +425,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&uart3_xfer>;

};



&wdt {

	compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";

};

arch/arm/boot/dts/rk3188-radxarock.dts

+4 −2
Original line number Diff line number Diff line
@@ -215,11 +215,13 @@ 
};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_xfer>;

	status = "okay";

};



&uart3 {

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm/boot/dts/rk3188.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -400,3 +400,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&uart3_xfer>;

};



&wdt {

	compatible = "rockchip,rk3188-wdt", "snps,dw-wdt";

};

arch/arm/boot/dts/rk3xxx.dtsi

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

	};



	wdt: watchdog@2004c000 {

		compatible = "snps,dw-wdt";

		reg = <0x2004c000 0x100>;

		clocks = <&cru PCLK_WDT>;

		interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	pwm2: pwm@20050020 {

		compatible = "rockchip,rk2928-pwm";

		reg = <0x20050020 0x10>;