summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2019-03-19 13:14:32 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2019-03-19 13:14:32 -0700
commit9c05d4c33d15fa6a2fca6505fc13bc0b58b497cd (patch)
tree7c1586381dacf883d20de267f94631b2f18d0c75 /arch/arm
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
parent544e784188f1dd7c797c70b213385e67d92005b6 (diff)
downloadlinux-9c05d4c33d15fa6a2fca6505fc13bc0b58b497cd.tar.gz
linux-9c05d4c33d15fa6a2fca6505fc13bc0b58b497cd.tar.bz2
linux-9c05d4c33d15fa6a2fca6505fc13bc0b58b497cd.zip
Merge tag 'tags/bcm2835-dt-next-2019-03-04' into devicetree/fixes
This pull request brings in a fix for detecting HDMI on the Pi B rev 2. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
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 {