linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <tony@atomide.com>
Cc: <linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>, <balbi@ti.com>
Subject: [PATCH v2 09/20] ARM: DTS: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux
Date: Thu, 2 Jul 2015 17:06:24 +0300	[thread overview]
Message-ID: <1435845995-19085-10-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1435845995-19085-1-git-send-email-peter.ujfalusi@ti.com>

GPIO5_8 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/am437x-gp-evm.dts | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 84aa30c3235a..e2fb2713333d 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -83,17 +83,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 = <&gpio5 8 GPIO_ACTIVE_HIGH>;
-
 		panel-timing {
 			clock-frequency = <33000000>;
 			hactive = <800>;
@@ -270,7 +259,7 @@
 		>;
 	};
 
-	lcd_pins: lcd_pins {
+	display_mux_pins: display_mux_pins {
 		pinctrl-single,pins = <
 			/* GPIO 5_8 to select LCD / HDMI */
 			0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
@@ -558,8 +547,22 @@
 };
 
 &gpio5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&display_mux_pins>;
 	status = "okay";
 	ti,no-reset-on-init;
+
+	p8 {
+		/*
+		 * 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 = <8 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "SelLCDorHDMI";
+	};
 };
 
 &mmc1 {
-- 
2.4.5


  parent reply	other threads:[~2015-07-02 14:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-02 14:06 [PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 01/20] ARM: omap2plus_defconfig: Enable audio related config options Peter Ujfalusi
2015-07-02 14:20   ` Felipe Balbi
2015-07-02 14:06 ` [PATCH v2 02/20] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 03/20] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 04/20] ARM: DTS: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 05/20] ARM: DTS: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 06/20] ARM: DTS: am43xx-epos-evm: McASP1 node for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 07/20] ARM: DTS: am43xx-epos-evm: Add node for tlv320aic3111 audio codec Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 08/20] ARM: DTS: am43xx-epos-evm: Enable analog audio via simple-card Peter Ujfalusi
2015-07-02 14:06 ` Peter Ujfalusi [this message]
2015-07-02 14:06 ` [PATCH v2 10/20] ARM: DTS: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 11/20] ARM: DTS: am437x-gp-evm: Add node for tlv320aic3106 audio codec Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 12/20] ARM: DTS: am437x-gp-evm: McASP1 node for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 13/20] ARM: DTS: am437x-gp-evm: Enable analog audio via simple-card Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 14/20] ARM: DTS: am335x-evmsk: Fix mcasp1 node's indentation Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 15/20] ARM: DTS: am335x-evmsk: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 16/20] ARM: DTS: am335x-evmsk: Switch using simple-audio-card for audio support Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 17/20] ARM: DTS: am335x-evm: Fix mcasp1 node's indentation Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 18/20] ARM: DTS: am335x-evm: Rename pinctrl section for McASP1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 19/20] ARM: DTS: am335x-evm: Add sleep pin settings for mcasp1 Peter Ujfalusi
2015-07-02 14:06 ` [PATCH v2 20/20] ARM: DTS: am335x-evm: Switch using simple-audio-card for audio support Peter Ujfalusi
2015-07-14 11:29 ` [PATCH v2 00/20] ARM: DTS: am335x/am43xx: Audio support and fixes for audio Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435845995-19085-10-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=balbi@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).