aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-02 23:23:22 +0100
committerArnd Bergmann <arnd@arndb.de>2016-03-02 23:23:22 +0100
commitd36694b6590f59a83dc002f945e941a4f13635d1 (patch)
treeb63f7dfc01b3632d5aeaf28202593c868a03d7ac /arch/arm/boot
parentMerge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt (diff)
parentARM: dts: porter: remove enable prop from HS-USB device node (diff)
downloadlinux-dev-d36694b6590f59a83dc002f945e941a4f13635d1.tar.xz
linux-dev-d36694b6590f59a83dc002f945e941a4f13635d1.zip
Merge tag 'renesas-dt-fixes2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
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
Diffstat (limited to 'arch/arm/boot')
-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 bf3a0d13cd35..6c08314427d6 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -407,7 +407,6 @@
pinctrl-names = "default";
status = "okay";
- renesas,enable-gpio = <&gpio5 31 GPIO_ACTIVE_HIGH>;
};
&usbphy {