diff options
author | Dmitry Lifshitz <lifshitz@compulab.co.il> | 2014-11-23 04:42:02 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-11-24 10:54:48 -0500 |
commit | 01e9ef69422d87fa943a527341b326dcc94703b3 (patch) | |
tree | 38faaf41206600697eb698ee6c673273b5a912f5 | |
parent | b360e98a24d357ff4c737bdf369e30c8fedcf40c (diff) |
ARM: dts: sbc-t3x30: add audio support
Add audio related DT nodes
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/omap3-cm-t3x.dtsi | 16 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 14 | ||||
-rw-r--r-- | 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 63bea24f9917..6ea6d460db30 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi | |||
@@ -155,6 +155,15 @@ | |||
155 | OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ | 155 | OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ |
156 | >; | 156 | >; |
157 | }; | 157 | }; |
158 | |||
159 | mcbsp2_pins: pinmux_mcbsp2_pins { | ||
160 | pinctrl-single,pins = < | ||
161 | OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */ | ||
162 | OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */ | ||
163 | OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */ | ||
164 | OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */ | ||
165 | >; | ||
166 | }; | ||
158 | }; | 167 | }; |
159 | 168 | ||
160 | &uart3 { | 169 | &uart3 { |
@@ -243,3 +252,10 @@ | |||
243 | }; | 252 | }; |
244 | }; | 253 | }; |
245 | }; | 254 | }; |
255 | |||
256 | &mcbsp2 { | ||
257 | status = "ok"; | ||
258 | |||
259 | pinctrl-names = "default"; | ||
260 | pinctrl-0 = <&mcbsp2_pins>; | ||
261 | }; | ||
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 9cc718536c02..9a4a3ab9af78 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi | |||
@@ -10,6 +10,14 @@ | |||
10 | cpu0-supply = <&vcc>; | 10 | cpu0-supply = <&vcc>; |
11 | }; | 11 | }; |
12 | }; | 12 | }; |
13 | |||
14 | sound { | ||
15 | compatible = "ti,omap-twl4030"; | ||
16 | ti,model = "cm-t35"; | ||
17 | |||
18 | ti,mcbsp = <&mcbsp2>; | ||
19 | ti,codec = <&twl_audio>; | ||
20 | }; | ||
13 | }; | 21 | }; |
14 | 22 | ||
15 | &omap3_pmx_core { | 23 | &omap3_pmx_core { |
@@ -59,6 +67,12 @@ | |||
59 | reg = <0x48>; | 67 | reg = <0x48>; |
60 | interrupts = <7>; /* SYS_NIRQ cascaded to intc */ | 68 | interrupts = <7>; /* SYS_NIRQ cascaded to intc */ |
61 | interrupt-parent = <&intc>; | 69 | interrupt-parent = <&intc>; |
70 | |||
71 | twl_audio: audio { | ||
72 | compatible = "ti,twl4030-audio"; | ||
73 | codec { | ||
74 | }; | ||
75 | }; | ||
62 | }; | 76 | }; |
63 | }; | 77 | }; |
64 | 78 | ||
diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index aff733e4ad59..827f614261f6 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi | |||
@@ -43,6 +43,16 @@ | |||
43 | }; | 43 | }; |
44 | }; | 44 | }; |
45 | }; | 45 | }; |
46 | |||
47 | audio_amp: audio_amp { | ||
48 | compatible = "regulator-fixed"; | ||
49 | regulator-name = "audio_amp"; | ||
50 | pinctrl-names = "default"; | ||
51 | pinctrl-0 = <&sb_t35_audio_amp>; | ||
52 | gpio = <&gpio2 29 GPIO_ACTIVE_LOW>; /* gpio_61 */ | ||
53 | enable-active-low; | ||
54 | regulator-always-on; | ||
55 | }; | ||
46 | }; | 56 | }; |
47 | 57 | ||
48 | &omap3_pmx_core { | 58 | &omap3_pmx_core { |
@@ -65,6 +75,12 @@ | |||
65 | OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ | 75 | OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ |
66 | >; | 76 | >; |
67 | }; | 77 | }; |
78 | |||
79 | sb_t35_audio_amp: pinmux_sb_t35_audio_amp { | ||
80 | pinctrl-single,pins = < | ||
81 | OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4) /* gpmc_nbe1.gpio_61 */ | ||
82 | >; | ||
83 | }; | ||
68 | }; | 84 | }; |
69 | 85 | ||
70 | &i2c3 { | 86 | &i2c3 { |