* [PATCH 1/4] ARM: dts: cm-t3x: add I2C1 pinmux
2014-11-23 9:41 [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Dmitry Lifshitz
@ 2014-11-23 9:41 ` Dmitry Lifshitz
2014-11-23 9:42 ` [PATCH 2/4] ARM: dts: cm-t3x: add TV out support Dmitry Lifshitz
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Lifshitz @ 2014-11-23 9:41 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add missing I2C1 pinmux setup.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 3a98ce1..620a3f4 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -137,6 +137,13 @@
OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */
>;
};
+
+ i2c1_pins: pinmux_i2c1_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
+ OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
+ >;
+ };
};
&uart3 {
@@ -155,6 +162,9 @@
};
&i2c1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
+
clock-frequency = <400000>;
at24@50 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: dts: cm-t3x: add TV out support
2014-11-23 9:41 [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Dmitry Lifshitz
2014-11-23 9:41 ` [PATCH 1/4] ARM: dts: cm-t3x: add I2C1 pinmux Dmitry Lifshitz
@ 2014-11-23 9:42 ` Dmitry Lifshitz
2014-11-23 9:42 ` [PATCH 3/4] ARM: dts: sbc-t3x: add TV out display alias Dmitry Lifshitz
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Lifshitz @ 2014-11-23 9:42 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add TV out support.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 22 ++++++++++++++++++++++
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 4 ++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 620a3f4..63bea24 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -56,6 +56,17 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
+
+ tv0: connector@1 {
+ compatible = "svideo-connector";
+ label = "tv";
+
+ port {
+ tv_connector_in: endpoint {
+ remote-endpoint = <&venc_out>;
+ };
+ };
+ };
};
&omap3_pmx_core {
@@ -221,3 +232,14 @@
linux,wakeup;
};
};
+
+&venc {
+ status = "ok";
+
+ port {
+ venc_out: endpoint {
+ remote-endpoint = <&tv_connector_in>;
+ ti,channels = <2>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 3cbaf98..9cc7185 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -66,6 +66,10 @@
#include "twl4030_omap3.dtsi"
#include <dt-bindings/input/input.h>
+&venc {
+ vdda-supply = <&vdac>;
+};
+
&mmc1 {
vmmc-supply = <&vmmc1>;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: dts: sbc-t3x: add TV out display alias
2014-11-23 9:41 [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Dmitry Lifshitz
2014-11-23 9:41 ` [PATCH 1/4] ARM: dts: cm-t3x: add I2C1 pinmux Dmitry Lifshitz
2014-11-23 9:42 ` [PATCH 2/4] ARM: dts: cm-t3x: add TV out support Dmitry Lifshitz
@ 2014-11-23 9:42 ` Dmitry Lifshitz
2014-11-23 9:42 ` [PATCH 4/4] ARM: dts: sbc-t3x30: add audio support Dmitry Lifshitz
2014-11-24 15:58 ` [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Lifshitz @ 2014-11-23 9:42 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add display alias for TV out.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-sbc-t3517.dts | 1 +
arch/arm/boot/dts/omap3-sbc-t3530.dts | 1 +
arch/arm/boot/dts/omap3-sbc-t3730.dts | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-sbc-t3517.dts b/arch/arm/boot/dts/omap3-sbc-t3517.dts
index 4ec5d86..1798653 100644
--- a/arch/arm/boot/dts/omap3-sbc-t3517.dts
+++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts
@@ -11,6 +11,7 @@
aliases {
display0 = &dvi0;
+ display1 = &tv0;
};
/* Only one GPMC smsc9220 on SBC-T3517, CM-T3517 uses am35x Ethernet */
diff --git a/arch/arm/boot/dts/omap3-sbc-t3530.dts b/arch/arm/boot/dts/omap3-sbc-t3530.dts
index 8dfc1df..c994f0f 100644
--- a/arch/arm/boot/dts/omap3-sbc-t3530.dts
+++ b/arch/arm/boot/dts/omap3-sbc-t3530.dts
@@ -11,6 +11,7 @@
aliases {
display0 = &dvi0;
+ display1 = &tv0;
};
};
diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts
index 6b69864..5bdddf2 100644
--- a/arch/arm/boot/dts/omap3-sbc-t3730.dts
+++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts
@@ -11,6 +11,7 @@
aliases {
display0 = &dvi0;
+ display1 = &tv0;
};
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: dts: sbc-t3x30: add audio support
2014-11-23 9:41 [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Dmitry Lifshitz
` (2 preceding siblings ...)
2014-11-23 9:42 ` [PATCH 3/4] ARM: dts: sbc-t3x: add TV out display alias Dmitry Lifshitz
@ 2014-11-23 9:42 ` Dmitry Lifshitz
2014-11-24 15:58 ` [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Lifshitz @ 2014-11-23 9:42 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add audio related DT nodes
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 16 ++++++++++++++++
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 14 ++++++++++++++
arch/arm/boot/dts/omap3-sb-t35.dtsi | 16 ++++++++++++++++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 63bea24..6ea6d46 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -155,6 +155,15 @@
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
>;
};
+
+ mcbsp2_pins: pinmux_mcbsp2_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */
+ OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */
+ OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */
+ OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */
+ >;
+ };
};
&uart3 {
@@ -243,3 +252,10 @@
};
};
};
+
+&mcbsp2 {
+ status = "ok";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcbsp2_pins>;
+};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 9cc7185..9a4a3ab 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -10,6 +10,14 @@
cpu0-supply = <&vcc>;
};
};
+
+ sound {
+ compatible = "ti,omap-twl4030";
+ ti,model = "cm-t35";
+
+ ti,mcbsp = <&mcbsp2>;
+ ti,codec = <&twl_audio>;
+ };
};
&omap3_pmx_core {
@@ -59,6 +67,12 @@
reg = <0x48>;
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;
+
+ twl_audio: audio {
+ compatible = "ti,twl4030-audio";
+ codec {
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index aff733e..827f614 100644
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -43,6 +43,16 @@
};
};
};
+
+ audio_amp: audio_amp {
+ compatible = "regulator-fixed";
+ regulator-name = "audio_amp";
+ pinctrl-names = "default";
+ pinctrl-0 = <&sb_t35_audio_amp>;
+ gpio = <&gpio2 29 GPIO_ACTIVE_LOW>; /* gpio_61 */
+ enable-active-low;
+ regulator-always-on;
+ };
};
&omap3_pmx_core {
@@ -65,6 +75,12 @@
OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
>;
};
+
+ sb_t35_audio_amp: pinmux_sb_t35_audio_amp {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4) /* gpmc_nbe1.gpio_61 */
+ >;
+ };
};
&i2c3 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support
2014-11-23 9:41 [PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support Dmitry Lifshitz
` (3 preceding siblings ...)
2014-11-23 9:42 ` [PATCH 4/4] ARM: dts: sbc-t3x30: add audio support Dmitry Lifshitz
@ 2014-11-24 15:58 ` Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2014-11-24 15:58 UTC (permalink / raw)
To: Dmitry Lifshitz
Cc: Benoît Cousson, linux-omap, devicetree, linux-arm-kernel
* Dmitry Lifshitz <lifshitz@compulab.co.il> [141123 01:44]:
> Add support for more SBC-T3x single board computers features:
>
> * Audio on CM-T3x30
> * TV out on CM-T3x
>
> This patch set adds missing I2C1 pinmux required for CM-T3x EEPROM and
> CM-T3x30 audio support.
Thanks applying into omap-for-v3.19/dt-v2. Let's also do fixes
only for v3.19 from now on as -rc6 is tagged.
Regards,
Tony
> Dmitry Lifshitz (4):
> ARM: dts: cm-t3x: add I2C1 pinmux
> ARM: dts: cm-t3x: add TV out support
> ARM: dts: sbc-t3x: add TV out display alias
> ARM: dts: sbc-t3x30: add audio support
>
> arch/arm/boot/dts/omap3-cm-t3x.dtsi | 48 +++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 18 ++++++++++++
> arch/arm/boot/dts/omap3-sb-t35.dtsi | 16 +++++++++++
> arch/arm/boot/dts/omap3-sbc-t3517.dts | 1 +
> arch/arm/boot/dts/omap3-sbc-t3530.dts | 1 +
> arch/arm/boot/dts/omap3-sbc-t3730.dts | 1 +
> 6 files changed, 85 insertions(+), 0 deletions(-)
>
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread