* [PATCH 0/9] ARM: dts: sbc-t3x: add more features support
@ 2014-11-18 9:13 Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation Dmitry Lifshitz
` (9 more replies)
0 siblings, 10 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: 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
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(-)
--
1.7.5.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 2/9] ARM: dts: cm-t3x: add ADS7846 touchscreen support Dmitry Lifshitz
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Fix comment style
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index b074673..e4c0c56 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -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 */
>;
};
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/9] ARM: dts: cm-t3x: add ADS7846 touchscreen support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 3/9] ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk Dmitry Lifshitz
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add ADS7846 touchscreen support.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 57 +++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index e4c0c56..3636fed 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -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@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;
+ };
+};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/9] ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 2/9] ARM: dts: cm-t3x: add ADS7846 touchscreen support Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 4/9] ARM: dts: cm-t3x: add EEPROM support Dmitry Lifshitz
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Remove ADS7846 touchscreen pdata quirk for CM-T3x CoMs
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/mach-omap2/pdata-quirks.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index e72f0fc..02080c0 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -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)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/9] ARM: dts: cm-t3x: add EEPROM support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (2 preceding siblings ...)
2014-11-18 9:13 ` [PATCH 3/9] ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
[not found] ` <1416302004-22199-1-git-send-email-lifshitz-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add at24 EEPROM chip support.
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 3636fed..58205f0 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -155,12 +155,22 @@
};
&i2c1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
+
clock-frequency = <400000>;
+
+ at24@50 {
+ compatible = "at24,24c02";
+ pagesize = <16>;
+ reg = <0x50>;
+ };
};
&i2c3 {
clock-frequency = <400000>;
};
+
&usbhshost {
port1-mode = "ehci-phy";
port2-mode = "ehci-phy";
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/9] ARM: dts: sb-t35: add EEPROM support
[not found] ` <1416302004-22199-1-git-send-email-lifshitz-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
@ 2014-11-18 9:13 ` Dmitry Lifshitz
0 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: Dmitry Lifshitz
Add at24 EEPROM chip support.
Signed-off-by: Dmitry Lifshitz <lifshitz-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
---
arch/arm/boot/dts/omap3-sb-t35.dtsi | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index b1cb577..aff733e 100644
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -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@50 {
+ compatible = "at24,24c02";
+ pagesize = <16>;
+ reg = <0x50>;
+ };
};
&gpmc {
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/9] ARM: dts: cm-t3x: add TV out support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (4 preceding siblings ...)
[not found] ` <1416302004-22199-1-git-send-email-lifshitz-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 7/9] ARM: dts: sbc-t3x: add TV out display alias Dmitry Lifshitz
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 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 | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 58205f0..1a8262c 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 {
@@ -214,3 +225,16 @@
linux,wakeup;
};
};
+
+&venc {
+ status = "ok";
+
+ vdda-supply = <&vdac>;
+
+ port {
+ venc_out: endpoint {
+ remote-endpoint = <&tv_connector_in>;
+ ti,channels = <2>;
+ };
+ };
+};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 7/9] ARM: dts: sbc-t3x: add TV out display alias
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (5 preceding siblings ...)
2014-11-18 9:13 ` [PATCH 6/9] ARM: dts: cm-t3x: add TV out support Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 8/9] ARM: dts: sbc-t3x30: add audio support Dmitry Lifshitz
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 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] 12+ messages in thread
* [PATCH 8/9] ARM: dts: sbc-t3x30: add audio support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (6 preceding siblings ...)
2014-11-18 9:13 ` [PATCH 7/9] ARM: dts: sbc-t3x: add TV out display alias Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 9/9] ARM: dts: cm-t3x30: add keypad support Dmitry Lifshitz
2014-11-22 0:02 ` [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Tony Lindgren
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 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 1a8262c..7e510e0 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -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>;
+};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 25ba083..bcd896f 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] 12+ messages in thread
* [PATCH 9/9] ARM: dts: cm-t3x30: add keypad support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (7 preceding siblings ...)
2014-11-18 9:13 ` [PATCH 8/9] ARM: dts: sbc-t3x30: add audio support Dmitry Lifshitz
@ 2014-11-18 9:13 ` Dmitry Lifshitz
2014-11-22 0:02 ` [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Tony Lindgren
9 siblings, 0 replies; 12+ messages in thread
From: Dmitry Lifshitz @ 2014-11-18 9:13 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel
Cc: Dmitry Lifshitz
Add twl4030 matrtix keypad support.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index bcd896f..3a91204 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -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>;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 0/9] ARM: dts: sbc-t3x: add more features support
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
` (8 preceding siblings ...)
2014-11-18 9:13 ` [PATCH 9/9] ARM: dts: cm-t3x30: add keypad support Dmitry Lifshitz
@ 2014-11-22 0:02 ` Tony Lindgren
2014-11-22 0:16 ` Tony Lindgren
9 siblings, 1 reply; 12+ messages in thread
From: Tony Lindgren @ 2014-11-22 0:02 UTC (permalink / raw)
To: Dmitry Lifshitz
Cc: Benoît Cousson, linux-omap, devicetree, linux-arm-kernel
* Dmitry Lifshitz <lifshitz@compulab.co.il> [141118 01:15]:
> 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
> 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(-)
>
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/9] ARM: dts: sbc-t3x: add more features support
2014-11-22 0:02 ` [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Tony Lindgren
@ 2014-11-22 0:16 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2014-11-22 0:16 UTC (permalink / raw)
To: Dmitry Lifshitz
Cc: Benoît Cousson, linux-omap, devicetree, linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [141121 16:04]:
> * Dmitry Lifshitz <lifshitz@compulab.co.il> [141118 01:15]:
> > 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
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-11-22 0:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-18 9:13 [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 2/9] ARM: dts: cm-t3x: add ADS7846 touchscreen support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 3/9] ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 4/9] ARM: dts: cm-t3x: add EEPROM support Dmitry Lifshitz
[not found] ` <1416302004-22199-1-git-send-email-lifshitz-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
2014-11-18 9:13 ` [PATCH 5/9] ARM: dts: sb-t35: " Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 6/9] ARM: dts: cm-t3x: add TV out support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 7/9] ARM: dts: sbc-t3x: add TV out display alias Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 8/9] ARM: dts: sbc-t3x30: add audio support Dmitry Lifshitz
2014-11-18 9:13 ` [PATCH 9/9] ARM: dts: cm-t3x30: add keypad support Dmitry Lifshitz
2014-11-22 0:02 ` [PATCH 0/9] ARM: dts: sbc-t3x: add more features support Tony Lindgren
2014-11-22 0:16 ` Tony Lindgren
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).