diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-30 22:40:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-30 22:40:49 -0700 |
| commit | cdf26ad472e972541f0d6c7d546c25f4c2d460a9 (patch) | |
| tree | f1a74381757ef4dcc0736c6d643cdb7f1b58ec84 /arch/arm/boot | |
| parent | 68a05338ce3b1e4553524333b4c441f5fb7fb1ff (diff) | |
| parent | eb2b9d47dd907eba5d766d942723811393454346 (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rk3066a-bqcurie2.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3066a.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3188-radxarock.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 8 |
5 files changed, 24 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 8b479f76756..042f821d9e4 100644 --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts @@ -188,3 +188,7 @@ &uart3 { status = "okay"; }; + +&wdt { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 9c34da4d8aa..879a818fba5 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -425,3 +425,7 @@ pinctrl-names = "default"; pinctrl-0 = <&uart3_xfer>; }; + +&wdt { + compatible = "rockchip,rk3066-wdt", "snps,dw-wdt"; +}; diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index b7f34232e3d..171b610db70 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -215,11 +215,13 @@ }; &uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&uart2_xfer>; status = "okay"; }; &uart3 { status = "okay"; }; + +&wdt { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 27215e0b5c3..ee801a9c6b7 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -400,3 +400,7 @@ pinctrl-names = "default"; pinctrl-0 = <&uart3_xfer>; }; + +&wdt { + compatible = "rockchip,rk3188-wdt", "snps,dw-wdt"; +}; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index c6f05610ed2..8caf85d8390 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -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>; |