diff options
author | Jyri Sarha <jsarha@ti.com> | 2016-08-09 15:00:06 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-07 08:10:11 -0400 |
commit | df0bd1e8f3c508bf4c3445f94b12e38289b65f13 (patch) | |
tree | 9770e1cf31accac324cefd3913bfcbf70c5f2a02 /arch/arm | |
parent | 7e567624dc5a44276d9df253f5ca829d911b4e93 (diff) |
ARM: dts: am335x-boneblack: Add HDMI audio support
Add HDMI audio support. Adds mcasp0_pins, clk_mcasp0_fixed,
clk_mcasp0, mcasp0, sound node, and updates the tda19988 node to
follow the new binding.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/am335x-boneblack.dts | 71 |
1 files changed, 67 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 55c0e954b146..6bbb1fee0868 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include "am33xx.dtsi" | 10 | #include "am33xx.dtsi" |
11 | #include "am335x-bone-common.dtsi" | 11 | #include "am335x-bone-common.dtsi" |
12 | #include <dt-bindings/display/tda998x.h> | ||
12 | 13 | ||
13 | / { | 14 | / { |
14 | model = "TI AM335x BeagleBone Black"; | 15 | model = "TI AM335x BeagleBone Black"; |
@@ -64,6 +65,16 @@ | |||
64 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ | 65 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ |
65 | >; | 66 | >; |
66 | }; | 67 | }; |
68 | |||
69 | mcasp0_pins: mcasp0_pins { | ||
70 | pinctrl-single,pins = < | ||
71 | AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ | ||
72 | AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ | ||
73 | AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ | ||
74 | AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ | ||
75 | AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */ | ||
76 | >; | ||
77 | }; | ||
67 | }; | 78 | }; |
68 | 79 | ||
69 | &lcdc { | 80 | &lcdc { |
@@ -76,16 +87,22 @@ | |||
76 | }; | 87 | }; |
77 | 88 | ||
78 | &i2c0 { | 89 | &i2c0 { |
79 | tda19988 { | 90 | tda19988: tda19988 { |
80 | compatible = "nxp,tda998x"; | 91 | compatible = "nxp,tda998x"; |
81 | reg = <0x70>; | 92 | reg = <0x70>; |
93 | |||
82 | pinctrl-names = "default", "off"; | 94 | pinctrl-names = "default", "off"; |
83 | pinctrl-0 = <&nxp_hdmi_bonelt_pins>; | 95 | pinctrl-0 = <&nxp_hdmi_bonelt_pins>; |
84 | pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; | 96 | pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; |
85 | 97 | ||
86 | port { | 98 | #sound-dai-cells = <0>; |
87 | hdmi_0: endpoint@0 { | 99 | audio-ports = < TDA998x_I2S 0x03>; |
88 | remote-endpoint = <&lcdc_0>; | 100 | |
101 | ports { | ||
102 | port@0 { | ||
103 | hdmi_0: endpoint@0 { | ||
104 | remote-endpoint = <&lcdc_0>; | ||
105 | }; | ||
89 | }; | 106 | }; |
90 | }; | 107 | }; |
91 | }; | 108 | }; |
@@ -94,3 +111,49 @@ | |||
94 | &rtc { | 111 | &rtc { |
95 | system-power-controller; | 112 | system-power-controller; |
96 | }; | 113 | }; |
114 | |||
115 | &mcasp0 { | ||
116 | #sound-dai-cells = <0>; | ||
117 | pinctrl-names = "default"; | ||
118 | pinctrl-0 = <&mcasp0_pins>; | ||
119 | status = "okay"; | ||
120 | op-mode = <0>; /* MCASP_IIS_MODE */ | ||
121 | tdm-slots = <2>; | ||
122 | serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ | ||
123 | 0 0 1 0 | ||
124 | >; | ||
125 | tx-num-evt = <32>; | ||
126 | rx-num-evt = <32>; | ||
127 | }; | ||
128 | |||
129 | / { | ||
130 | clk_mcasp0_fixed: clk_mcasp0_fixed { | ||
131 | #clock-cells = <0>; | ||
132 | compatible = "fixed-clock"; | ||
133 | clock-frequency = <24576000>; | ||
134 | }; | ||
135 | |||
136 | clk_mcasp0: clk_mcasp0 { | ||
137 | #clock-cells = <0>; | ||
138 | compatible = "gpio-gate-clock"; | ||
139 | clocks = <&clk_mcasp0_fixed>; | ||
140 | enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */ | ||
141 | }; | ||
142 | |||
143 | sound { | ||
144 | compatible = "simple-audio-card"; | ||
145 | simple-audio-card,name = "TI BeagleBone Black"; | ||
146 | simple-audio-card,format = "i2s"; | ||
147 | simple-audio-card,bitclock-master = <&dailink0_master>; | ||
148 | simple-audio-card,frame-master = <&dailink0_master>; | ||
149 | |||
150 | dailink0_master: simple-audio-card,cpu { | ||
151 | sound-dai = <&mcasp0>; | ||
152 | clocks = <&clk_mcasp0>; | ||
153 | }; | ||
154 | |||
155 | simple-audio-card,codec { | ||
156 | sound-dai = <&tda19988>; | ||
157 | }; | ||
158 | }; | ||
159 | }; | ||