Skip to contentSkip to conversation

ARM: dts: sbc-t3x: add more features support

PATCH New Dmitry Lifshitz 2 participants 12 messages Nov 18, 2014 – Nov 22, 2014

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Dmitry Lifshitz

author
#0 lore raw

cover ARM: dts: sbc-t3x: add more features support

Add support for more SBC-T3x single board computers features:

* CM-T3x CoM and SB-T35 baseboard EEPROMs
* TV out
* Touchscreen
* CM-T3x30 audio
* CM-T3x30 keypad

Dmitry Lifshitz (9):
ARM: dts: cm-t3x: cleanup comments indentation
ARM: dts: cm-t3x: add ADS7846 touchscreen support
ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
ARM: dts: cm-t3x: add EEPROM support
ARM: dts: sb-t35: add EEPROM support
ARM: dts: cm-t3x: add TV out support
ARM: dts: sbc-t3x: add TV out display alias
ARM: dts: sbc-t3x30: add audio support
ARM: dts: cm-t3x30: add keypad support

 arch/arm/boot/dts/omap3-cm-t3x.dtsi   |  119 +++++++++++++++++++++++++++++++--
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi |   31 +++++++++
 arch/arm/boot/dts/omap3-sb-t35.dtsi   |   36 ++++++++++
 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 +
 arch/arm/mach-omap2/pdata-quirks.c    |    3 -
 7 files changed, 183 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/9 ARM: dts: cm-t3x: cleanup comments indentation

Fix comment style

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-cm-t3x.dtsi |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3-cm-t3x.dtsi +6 -6
index b074673..e4c0c56 100644
@@ -107,12 +107,12 @@
 
 	dss_dpi_pins_cm_t35x: pinmux_dss_dpi_pins_cm_t35x {
 		pinctrl-single,pins = <
-			OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0)		/* dss_data0.dss_data0 */
-			OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0)		/* dss_data1.dss_data1 */
-			OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0)		/* dss_data2.dss_data2 */
-			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0)		/* dss_data3.dss_data3 */
-			OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0)		/* dss_data4.dss_data4 */
-			OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0)		/* dss_data5.dss_data5 */
+			OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0)	/* dss_data0.dss_data0 */
+			OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0)	/* dss_data1.dss_data1 */
+			OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0)	/* dss_data2.dss_data2 */
+			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0)	/* dss_data3.dss_data3 */
+			OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0)	/* dss_data4.dss_data4 */
+			OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0)	/* dss_data5.dss_data5 */
 		>;
 	};
 };
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/9 ARM: dts: cm-t3x: add ADS7846 touchscreen support

In reply to Dmitry Lifshitz

Add ADS7846 touchscreen support.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-cm-t3x.dtsi |   57 +++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-cm-t3x.dtsi +57 -0
index e4c0c56..3636fed 100644
@@ -49,6 +49,13 @@
 		compatible = "usb-nop-xceiv";
 		vcc-supply = <&hsusb2_power>;
 	};
+
+	ads7846reg: ads7846-reg {
+		compatible = "regulator-fixed";
+		regulator-name = "ads7846-reg";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
 };
 
 &omap3_pmx_core {

@@ -115,6 +122,21 @@
 			OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0)	/* dss_data5.dss_data5 */
 		>;
 	};
+
+	ads7846_pins: pinmux_ads7846_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x20ba, PIN_INPUT_PULLUP | MUX_MODE4)	/* gpmc_ncs6.gpio_57 */
+		>;
+	};
+
+	mcspi1_pins: pinmux_mcspi1_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0)	/* mcspi1_clk */
+			OMAP3_CORE1_IOPAD(0x21ca, PIN_INPUT | MUX_MODE0)	/* mcspi1_simo */
+			OMAP3_CORE1_IOPAD(0x21cc, PIN_INPUT | MUX_MODE0)	/* mcspi1_somi */
+			OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */
+		>;
+	};
 };
 
 &uart3 {

@@ -147,3 +169,38 @@
 &usbhsehci {
 	phys = <&hsusb1_phy &hsusb2_phy>;
 };
+
+&mcspi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcspi1_pins>;
+
+	/* touch controller */
+	ads7846 at 0 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&ads7846_pins>;
+
+		compatible = "ti,ads7846";
+		vcc-supply = <&ads7846reg>;
+
+		reg = <0>;			/* CS0 */
+		spi-max-frequency = <1500000>;
+
+		interrupt-parent = <&gpio2>;
+		interrupts = <25 0>;		/* gpio_57 */
+		pendown-gpio = <&gpio2 25 0>;
+
+		ti,x-min = /bits/ 16 <0x0>;
+		ti,x-max = /bits/ 16 <0x0fff>;
+		ti,y-min = /bits/ 16 <0x0>;
+		ti,y-max = /bits/ 16 <0x0fff>;
+
+		ti,x-plate-ohms = /bits/ 16 <180>;
+		ti,pressure-max = /bits/ 16 <255>;
+
+		ti,debounce-max = /bits/ 16 <30>;
+		ti,debounce-tol = /bits/ 16 <10>;
+		ti,debounce-rep = /bits/ 16 <1>;
+
+		linux,wakeup;
+	};
+};
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/9 ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk

In reply to Dmitry Lifshitz

Remove ADS7846 touchscreen pdata quirk for CM-T3x CoMs

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/mach-omap2/pdata-quirks.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +0 -3
index e72f0fc..02080c0 100644
@@ -131,13 +131,11 @@ static void __init omap3_sbc_t3730_legacy_init(void)
 {
 	omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
 	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
-	omap_ads7846_init(1, 57, 0, NULL);
 }
 
 static void __init omap3_sbc_t3530_legacy_init(void)
 {
 	omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
-	omap_ads7846_init(1, 57, 0, NULL);
 }
 
 struct ti_st_plat_data wilink_pdata = {

@@ -249,7 +247,6 @@ static void __init omap3_sbc_t3517_legacy_init(void)
 	hsmmc2_internal_input_clk();
 	omap3_sbc_t3517_wifi_init();
 	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 145);
-	omap_ads7846_init(1, 57, 0, NULL);
 }
 
 static void __init am3517_evm_legacy_init(void)
Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/9 ARM: dts: cm-t3x: add EEPROM support

In reply to Dmitry Lifshitz

Add at24 EEPROM chip support.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-cm-t3x.dtsi |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-cm-t3x.dtsi +10 -0
index 3636fed..58205f0 100644
@@ -155,12 +155,22 @@
 };
 
 &i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins>;
+
 	clock-frequency = <400000>;
+
+	at24 at 50 {
+		compatible = "at24,24c02";
+		pagesize = <16>;
+		reg = <0x50>;
+	};
 };
 
 &i2c3 {
 	clock-frequency = <400000>;
 };
+
 &usbhshost {
 	port1-mode = "ehci-phy";
 	port2-mode = "ehci-phy";
Signature · 1 line
1.7.5.4
author
#5 lore raw

PATCH 5/9 ARM: dts: sb-t35: add EEPROM support

In reply to Dmitry Lifshitz

Add at24 EEPROM chip support.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-sb-t35.dtsi |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-sb-t35.dtsi +20 -0
index b1cb577..aff733e 100644
@@ -58,6 +58,26 @@
 			OMAP3_CORE1_IOPAD(0x20b4, PIN_OUTPUT | MUX_MODE4)	/* gpmc_ncs3.gpio_54 */
 		>;
 	};
+
+	i2c3_pins: pinmux_i2c3_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
+			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
+		>;
+	};
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c3_pins>;
+
+	clock-frequency = <400000>;
+
+	at24 at 50 {
+		compatible = "at24,24c02";
+		pagesize = <16>;
+		reg = <0x50>;
+	};
 };
 
 &gpmc {
Signature · 1 line
1.7.5.4
author
#6 lore raw

PATCH 6/9 ARM: dts: cm-t3x: add TV out support

In reply to Dmitry Lifshitz

Add TV out support.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-cm-t3x.dtsi |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-cm-t3x.dtsi +24 -0
index 58205f0..1a8262c 100644
@@ -56,6 +56,17 @@
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 	};
+
+	tv0: connector at 1 {
+		compatible = "svideo-connector";
+		label = "tv";
+
+		port {
+			tv_connector_in: endpoint {
+				remote-endpoint = <&venc_out>;
+			};
+		};
+	};
 };
 
 &omap3_pmx_core {

@@ -214,3 +225,16 @@
 		linux,wakeup;
 	};
 };
+
+&venc {
+	status = "ok";
+
+	vdda-supply = <&vdac>;
+
+	port {
+		venc_out: endpoint {
+			remote-endpoint = <&tv_connector_in>;
+			ti,channels = <2>;
+		};
+	};
+};
Signature · 1 line
1.7.5.4
author
#7 lore raw

PATCH 7/9 ARM: dts: sbc-t3x: add TV out display alias

In reply to Dmitry Lifshitz

Add display alias for TV out.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 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(-)
arch/arm/boot/dts/omap3-sbc-t3517.dts +1 -0
index 4ec5d86..1798653 100644
@@ -11,6 +11,7 @@
 
 	aliases {
 		display0 = &dvi0;
+		display1 = &tv0;
 	};
 
 	/* Only one GPMC smsc9220 on SBC-T3517, CM-T3517 uses am35x Ethernet */
arch/arm/boot/dts/omap3-sbc-t3530.dts +1 -0
index 8dfc1df..c994f0f 100644
@@ -11,6 +11,7 @@
 
 	aliases {
 		display0 = &dvi0;
+		display1 = &tv0;
 	};
 };
arch/arm/boot/dts/omap3-sbc-t3730.dts +1 -0
index 6b69864..5bdddf2 100644
@@ -11,6 +11,7 @@
 
 	aliases {
 		display0 = &dvi0;
+		display1 = &tv0;
 	};
 };
Signature · 1 line
1.7.5.4
author
#8 lore raw

PATCH 8/9 ARM: dts: sbc-t3x30: add audio support

In reply to Dmitry Lifshitz

Add audio related DT nodes

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 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(-)
arch/arm/boot/dts/omap3-cm-t3x.dtsi +16 -0
index 1a8262c..7e510e0 100644
@@ -148,6 +148,15 @@
 			OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */
 		>;
 	};
+
+	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 {

@@ -238,3 +247,10 @@
 		};
 	};
 };
+
+&mcbsp2 {
+	status = "ok";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp2_pins>;
+};
arch/arm/boot/dts/omap3-cm-t3x30.dtsi +14 -0
index 25ba083..bcd896f 100644
@@ -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 {
+			};
+		};
 	};
 };
arch/arm/boot/dts/omap3-sb-t35.dtsi +16 -0
index aff733e..827f614 100644
@@ -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 {
Signature · 1 line
1.7.5.4
author
#9 lore raw

PATCH 9/9 ARM: dts: cm-t3x30: add keypad support

In reply to Dmitry Lifshitz

Add twl4030 matrtix keypad support.

Signed-off-by Dmitry Lifshitz <[email protected]>
---
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-cm-t3x30.dtsi +17 -0
index bcd896f..3a91204 100644
@@ -78,6 +78,7 @@
 
 #include "twl4030.dtsi"
 #include "twl4030_omap3.dtsi"
+#include <dt-bindings/input/input.h>
 
 &mmc1 {
 	vmmc-supply = <&vmmc1>;

@@ -89,6 +90,22 @@
 	ti,pullups = <0x000001>;
 };
 
+&twl_keypad {
+	linux,keymap = <
+				MATRIX_KEY(0x00, 0x01, KEY_A)
+				MATRIX_KEY(0x00, 0x02, KEY_B)
+				MATRIX_KEY(0x00, 0x03, KEY_LEFT)
+
+				MATRIX_KEY(0x01, 0x01, KEY_UP)
+				MATRIX_KEY(0x01, 0x02, KEY_ENTER)
+				MATRIX_KEY(0x01, 0x03, KEY_DOWN)
+
+				MATRIX_KEY(0x02, 0x01, KEY_RIGHT)
+				MATRIX_KEY(0x02, 0x02, KEY_C)
+				MATRIX_KEY(0x02, 0x03, KEY_D)
+			>;
+};
+
 &hsusb1_phy {
 	reset-gpios = <&twl_gpio 6 GPIO_ACTIVE_LOW>;
 };
Signature · 1 line
1.7.5.4
maintainer
#10 lore raw

cover ARM: dts: sbc-t3x: add more features support

In reply to Dmitry Lifshitz
Quoted 7 lines · Dmitry Lifshitz

Add support for more SBC-T3x single board computers features:

* CM-T3x CoM and SB-T35 baseboard EEPROMs
* TV out
* Touchscreen
* CM-T3x30 audio
* CM-T3x30 keypad

Applying all into omap-for-v3.19/dt-v2 thanks.

Tony

Quoted 23 lines

Dmitry Lifshitz (9):
ARM: dts: cm-t3x: cleanup comments indentation
ARM: dts: cm-t3x: add ADS7846 touchscreen support
ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
ARM: dts: cm-t3x: add EEPROM support
ARM: dts: sb-t35: add EEPROM support
ARM: dts: cm-t3x: add TV out support
ARM: dts: sbc-t3x: add TV out display alias
ARM: dts: sbc-t3x30: add audio support
ARM: dts: cm-t3x30: add keypad support

 arch/arm/boot/dts/omap3-cm-t3x.dtsi   |  119 +++++++++++++++++++++++++++++++--
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi |   31 +++++++++
 arch/arm/boot/dts/omap3-sb-t35.dtsi   |   36 ++++++++++
 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 +
 arch/arm/mach-omap2/pdata-quirks.c    |    3 -
 7 files changed, 183 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.5.4
maintainer
#11 lore raw

cover ARM: dts: sbc-t3x: add more features support

Quoted 10 lines · Tony Lindgren
Quoted 7 lines · Dmitry Lifshitz

Add support for more SBC-T3x single board computers features:

* CM-T3x CoM and SB-T35 baseboard EEPROMs
* TV out
* Touchscreen
* CM-T3x30 audio
* CM-T3x30 keypad

Applying all into omap-for-v3.19/dt-v2 thanks.

Had to remove pinctr reference for missing &i2c1_pins in omap3-cm-t3x.dtsi for make dtbs to work. And had to drop the audio and tv patches because missing reference to vdac.

Please update the missing patches against current omap-for-v3.19/dt-v2 that I just pushed out.

Regards,

Tony