From: b-cousson@ti•com (Benoit Cousson)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/6] ARM/dts: omap4-sdp: Add pinmux configuration for HDMI
Date: Wed, 7 Nov 2012 11:57:45 +0100 [thread overview]
Message-ID: <509A3EA9.2040407@ti.com> (raw)
In-Reply-To: <1352121259-5836-3-git-send-email-tomi.valkeinen@ti.com>
On 11/05/2012 02:14 PM, Tomi Valkeinen wrote:
> From: Ricardo Neri <ricardo.neri@ti•com>
>
> Add the pinmux configuration for HDMI and TPD12S015A. Configure the
> gpios for the TPD12S015A and SDA, SCL and CEC for HDMI.
>
> Signed-off-by: Ricardo Neri <ricardo.neri@ti•com>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti•com>
I've just changed the subject, and applied it in the for_3.8/dts_part2 branch.
Please find below the updated version.
Regards,
Benoit
---
>From 347bf48f2b5d2b45a4e42b89dd61b27ca8baced4 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri@ti•com>
Date: Mon, 5 Nov 2012 15:14:15 +0200
Subject: [PATCH 2/2] ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
Add the pinmux configuration for HDMI and TPD12S015A. Configure the
gpios for the TPD12S015A and SDA, SCL and CEC for HDMI.
Signed-off-by: Ricardo Neri <ricardo.neri@ti•com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti•com>
Signed-off-by: Benoit Cousson <b-cousson@ti•com>
---
arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 +++++++++++++++++
arch/arm/boot/dts/omap4-sdp.dts | 18 ++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/boot/dts/omap4-sdp-es23plus.dts
diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts
new file mode 100644
index 0000000..b4a40ff
--- /dev/null
+++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/include/ "omap4-sdp.dts"
+
+/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */
+&dss_hdmi_pins {
+ pinctrl-single,pins = <
+ 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+ 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
+ 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
+ >;
+};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 0f57bdf..43e5258 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -124,6 +124,8 @@
&dmic_pins
&mcbsp1_pins
&mcbsp2_pins
+ &dss_hdmi_pins
+ &tpd12s015_pins
>;
uart2_pins: pinmux_uart2_pins {
@@ -194,6 +196,22 @@
0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */
>;
};
+
+ dss_hdmi_pins: pinmux_dss_hdmi_pins {
+ pinctrl-single,pins = <
+ 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+ 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
+ 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
+ >;
+ };
+
+ tpd12s015_pins: pinmux_tpd12s015_pins {
+ pinctrl-single,pins = <
+ 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */
+ 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */
+ 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
+ >;
+ };
};
&i2c1 {
--
1.7.0.4
next prev parent reply other threads:[~2012-11-07 10:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 13:14 [PATCH 0/6] OMAPDSS: enable DSS for Panda & SDP with devtree Tomi Valkeinen
2012-11-05 13:14 ` [PATCH 1/6] ARM/dts: omap4-panda: Add pinmux configuration for HDMI Tomi Valkeinen
2012-11-05 13:17 ` Tomi Valkeinen
2012-11-06 5:24 ` Ricardo Neri
2012-11-05 17:43 ` Benoit Cousson
2012-11-07 10:56 ` Benoit Cousson
2012-11-13 19:10 ` Ricardo Neri
2012-11-14 7:39 ` Tomi Valkeinen
2012-11-05 13:14 ` [PATCH 2/6] ARM/dts: omap4-sdp: " Tomi Valkeinen
2012-11-07 10:57 ` Benoit Cousson [this message]
2012-11-05 13:14 ` [PATCH 3/6] OMAPDSS: HACK: look for regulators with omap4 names Tomi Valkeinen
2012-11-05 13:14 ` [PATCH 4/6] OMAP: panda: move display init from board file to dss-common.c Tomi Valkeinen
2012-11-05 13:14 ` [PATCH 5/6] OMAP: omap4sdp: " Tomi Valkeinen
2012-11-05 13:14 ` [PATCH 6/6] OMAP: board-generic: enable DSS for panda & sdp boards Tomi Valkeinen
2012-11-07 1:04 ` [PATCH 0/6] OMAPDSS: enable DSS for Panda & SDP with devtree Tony Lindgren
2012-11-07 10:58 ` Benoit Cousson
2012-11-07 21:34 ` 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=509A3EA9.2040407@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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