diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /arch/arm/boot/dts/omap4-panda-es.dts | |
parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
download | linux-next-4c7aba46c9e82aa236502760a677e666589afead.tar.gz |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'arch/arm/boot/dts/omap4-panda-es.dts')
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-es.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 119f8e657edc..940fe4f7c5f6 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -34,7 +34,7 @@ /* PandaboardES has external pullups on SCL & SDA */ &dss_hdmi_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x09a, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */ + OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0) /* hdmi_cec.hdmi_cec */ OMAP4_IOPAD(0x09c, PIN_INPUT | MUX_MODE0) /* hdmi_scl.hdmi_scl */ OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; |