summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-02 23:24:33 +0100
committerArnd Bergmann <arnd@arndb.de>2016-03-02 23:24:33 +0100
commitf3c87e99f401a0ff0ef941346ec6e790f0fd526e (patch)
tree8a68bf6a041ded79b098bd71999bf28c5140e36d
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff)
parent949024d6702d1da8a266f42226d8402f0df078dc (diff)
downloadlinux-sh-f3c87e99f401a0ff0ef941346ec6e790f0fd526e.tar.gz
Merge tag 'renesas-dt-fixes2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Second Round of Renesas ARM Based SoC DT Fixes for v4.5" from Simon Horman: * remove enable prop from HS-USB device node on porter board * tag 'renesas-dt-fixes2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: porter: remove enable prop from HS-USB device node
-rw-r--r--arch/arm/boot/dts/r8a7791-porter.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 6713b1ea732b..01d239c3eaaa 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -283,7 +283,6 @@
pinctrl-names = "default";
status = "okay";
- renesas,enable-gpio = <&gpio5 31 GPIO_ACTIVE_HIGH>;
};
&usbphy {