summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-03-25 17:04:47 +0100
committerArnd Bergmann <arnd@arndb.de>2019-03-25 17:04:47 +0100
commit274a8ddcbcc412c5b2651d54b1c189dbf38fd9be (patch)
tree4cf0f7e1f65c6986ac3b9c192f4aed5e055c268e /arch/arm
parentfa9463564e77067df81b0b8dec91adbbbc47bfb4 (diff)
parent9c05d4c33d15fa6a2fca6505fc13bc0b58b497cd (diff)
downloadlinux-274a8ddcbcc412c5b2651d54b1c189dbf38fd9be.tar.bz2
Merge tag 'arm-soc/for-5.1/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.1, please pull the following: - Helen fixes the HDMI hot-pug detect GPIO polarity for the Rasperry Pi model B revision 2 * tag 'arm-soc/for-5.1/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm283x: Fix hdmi hpd gpio pull
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index 5641d162dfdb..28e7513ce617 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -93,7 +93,7 @@
};
&hdmi {
- hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
+ hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};
&pwm {