| From 35c6ac2e0dcfd136ec2cf5f5f5b49afbe6e5d0e7 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 26 Jul 2013 00:51:00 +0200 |
| Subject: ARM: shmobile: r8a7740: Add TPU node to the device tree |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 8b3e32c1fe5dce55e28e76b20361841dc863ec17) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/boot/dts/r8a7740.dtsi |
| --- |
| arch/arm/boot/dts/r8a7740.dtsi | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi |
| index 1d1aeb6d..44d3d520 100644 |
| --- a/arch/arm/boot/dts/r8a7740.dtsi |
| +++ b/arch/arm/boot/dts/r8a7740.dtsi |
| @@ -152,4 +152,11 @@ |
| gpio-controller; |
| #gpio-cells = <2>; |
| }; |
| + |
| + tpu: pwm@e6600000 { |
| + compatible = "renesas,tpu-r8a7740", "renesas,tpu"; |
| + reg = <0xe6600000 0x100>; |
| + status = "disabled"; |
| + #pwm-cells = <3>; |
| + }; |
| }; |
| -- |
| 1.8.4.3.gca3854a |
| |
