From 6779bd793d41be8d73ee771b149606e13e13e0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Tue, 2 Jun 2015 15:51:52 +0200 Subject: [PATCH] BCM270X_DT: Add bcm2835-pm-wdt and bcm2835-rng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it possible to use the mainline watchdog and random generator drivers: dtparam=watchdog=on dtparam=random=on bcm2708_wdog and bcm2708-rng can still be used. Signed-off-by: Noralf Trønnes --- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 2 ++ arch/arm/boot/dts/bcm2708-rpi-b.dts | 2 ++ arch/arm/boot/dts/bcm2708_common.dtsi | 12 ++++++++++++ arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 2 ++ 4 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts index 75df21c6810d4f..52b140467a3c86 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -124,5 +124,7 @@ pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; audio = <&audio>,"status"; + watchdog = <&watchdog>,"status"; + random = <&random>,"status"; }; }; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts index df12b7d00ad860..876dfcad0bc8eb 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -114,5 +114,7 @@ act_led_trigger = <&act_led>,"linux,default-trigger"; audio = <&audio>,"status"; + watchdog = <&watchdog>,"status"; + random = <&random>,"status"; }; }; diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi index fcb5828274be6b..a80b1a85499ff9 100644 --- a/arch/arm/boot/dts/bcm2708_common.dtsi +++ b/arch/arm/boot/dts/bcm2708_common.dtsi @@ -43,6 +43,18 @@ #interrupt-cells = <2>; }; + watchdog: watchdog@7e100000 { + compatible = "brcm,bcm2835-pm-wdt"; + reg = <0x7e100000 0x28>; + status = "disabled"; + }; + + random: rng@7e104000 { + compatible = "brcm,bcm2835-rng"; + reg = <0x7e104000 0x10>; + status = "disabled"; + }; + mailbox: mailbox@7e00b800 { compatible = "brcm,bcm2708-vcio"; reg = <0x7e00b880 0x40>; diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts index 78bc7567565d77..b226dfbc7485fe 100644 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -124,5 +124,7 @@ pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; audio = <&audio>,"status"; + watchdog = <&watchdog>,"status"; + random = <&random>,"status"; }; };