Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1176033
| From | Peter Ujfalusi <peter.ujfalusi@ti.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 04/20] ARM: DTS: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux |
| Date | 2015-07-02 16:20 +0200 |
| Message-ID | <pHNvl-3Pj-41@gated-at.bofh.it> (permalink) |
| References | <pHNlE-3HS-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
GPIO2_1 is used as a mux switch between LCD and HDMI displays. This mux
affects audio routing as well since in LCD mode HDMI audio is not possible
and when HDMI is selected analog audio is not working.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/boot/dts/am43x-epos-evm.dts | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 795d68af6df9..77919c570fe1 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -35,17 +35,6 @@
compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
label = "lcd";
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_pins>;
-
- /*
- * SelLCDorHDMI, LOW to select HDMI. This is not really the
- * panel's enable GPIO, but we don't have HDMI driver support nor
- * support to switch between two displays, so using this gpio as
- * panel's enable should be safe.
- */
- enable-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
-
panel-timing {
clock-frequency = <33000000>;
hactive = <800>;
@@ -278,7 +267,7 @@
>;
};
- lcd_pins: lcd_pins {
+ display_mux_pins: display_mux_pins {
pinctrl-single,pins = <
/* GPMC CLK -> GPIO 2_1 to select LCD / HDMI */
0x08C (PIN_OUTPUT_PULLUP | MUX_MODE7)
@@ -458,7 +447,21 @@
};
&gpio2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&display_mux_pins>;
status = "okay";
+
+ p1 {
+ /*
+ * SelLCDorHDMI selects between display and audio paths:
+ * Low: HDMI display with audio via HDMI
+ * High: LCD display with analog audio via aic3111 codec
+ */
+ gpio-hog;
+ gpios = <1 GPIO_ACTIVE_HIGH>;
+ output-high;
+ line-name = "SelLCDorHDMI";
+ };
};
&gpio3 {
--
2.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200 [PATCH v2 15/20] ARM: DTS: am335x-evmsk: Add sleep pin settings for mcasp1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200 [PATCH v2 17/20] ARM: DTS: am335x-evm: Fix mcasp1 node's indentation Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200 [PATCH v2 18/20] ARM: DTS: am335x-evm: Rename pinctrl section for McASP1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:10 +0200 [PATCH v2 05/20] ARM: DTS: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 12/20] ARM: DTS: am437x-gp-evm: McASP1 node for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 11/20] ARM: DTS: am437x-gp-evm: Add node for tlv320aic3106 audio codec Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 03/20] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 01/20] ARM: omap2plus_defconfig: Enable audio related config options Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 14/20] ARM: DTS: am335x-evmsk: Fix mcasp1 node's indentation Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 10/20] ARM: DTS: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 04/20] ARM: DTS: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 02/20] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200 [PATCH v2 13/20] ARM: DTS: am437x-gp-evm: Enable analog audio via simple-card Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-07-02 16:20 +0200
csiph-web