.. | .. |
---|
141 | 141 | default-brightness-level = <200>; |
---|
142 | 142 | }; |
---|
143 | 143 | |
---|
| 144 | + bt_sco: bt-sco { |
---|
| 145 | + status = "disabled"; |
---|
| 146 | + compatible = "delta,dfbmcs320"; |
---|
| 147 | + #sound-dai-cells = <1>; |
---|
| 148 | + }; |
---|
| 149 | + |
---|
| 150 | + bt_sound: bt-sound { |
---|
| 151 | + status = "disabled"; |
---|
| 152 | + compatible = "simple-audio-card"; |
---|
| 153 | + simple-audio-card,format = "dsp_a"; |
---|
| 154 | + simple-audio-card,bitclock-inversion = <0>; |
---|
| 155 | + simple-audio-card,mclk-fs = <256>; |
---|
| 156 | + simple-audio-card,name = "rockchip,bt"; |
---|
| 157 | + simple-audio-card,cpu { |
---|
| 158 | + sound-dai = <&i2s3_2ch>; |
---|
| 159 | + }; |
---|
| 160 | + simple-audio-card,codec { |
---|
| 161 | + sound-dai = <&bt_sco 1>; |
---|
| 162 | + }; |
---|
| 163 | + }; |
---|
| 164 | + |
---|
144 | 165 | dc_12v: dc-12v { |
---|
145 | 166 | compatible = "regulator-fixed"; |
---|
146 | 167 | regulator-name = "dc_12v"; |
---|
.. | .. |
---|
161 | 182 | |
---|
162 | 183 | leds: leds { |
---|
163 | 184 | compatible = "gpio-leds"; |
---|
164 | | - sys_led: sys_led { |
---|
165 | | - gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; |
---|
| 185 | + work_led: work { |
---|
| 186 | + gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; |
---|
166 | 187 | linux,default-trigger = "heartbeat"; |
---|
167 | 188 | }; |
---|
168 | 189 | }; |
---|
.. | .. |
---|
187 | 208 | |
---|
188 | 209 | rk809_sound: rk809-sound { |
---|
189 | 210 | status = "okay"; |
---|
190 | | - compatible = "simple-audio-card"; |
---|
191 | | - simple-audio-card,format = "i2s"; |
---|
192 | | - simple-audio-card,name = "rockchip,rk809-codec"; |
---|
193 | | - simple-audio-card,mclk-fs = <256>; |
---|
194 | | - |
---|
195 | | - simple-audio-card,cpu { |
---|
196 | | - sound-dai = <&i2s1_8ch>; |
---|
197 | | - }; |
---|
198 | | - simple-audio-card,codec { |
---|
199 | | - sound-dai = <&rk809_codec>; |
---|
200 | | - }; |
---|
| 211 | + compatible = "rockchip,multicodecs-card"; |
---|
| 212 | + rockchip,card-name = "rockchip-rk809"; |
---|
| 213 | + hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>; |
---|
| 214 | + rockchip,format = "i2s"; |
---|
| 215 | + rockchip,mclk-fs = <256>; |
---|
| 216 | + rockchip,cpu = <&i2s1_8ch>; |
---|
| 217 | + rockchip,codec = <&rk809_codec>; |
---|
| 218 | + pinctrl-names = "default"; |
---|
| 219 | + pinctrl-0 = <&hp_det>; |
---|
201 | 220 | }; |
---|
202 | 221 | |
---|
203 | 222 | spdif-sound { |
---|
.. | .. |
---|
289 | 308 | regulator-min-microvolt = <3300000>; |
---|
290 | 309 | regulator-max-microvolt = <3300000>; |
---|
291 | 310 | enable-active-high; |
---|
292 | | - gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; |
---|
| 311 | + gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; |
---|
293 | 312 | vin-supply = <&vcc3v3_sys>; |
---|
294 | 313 | |
---|
295 | 314 | regulator-state-mem { |
---|
.. | .. |
---|
1103 | 1122 | regulator-min-microvolt = <712500>; |
---|
1104 | 1123 | regulator-max-microvolt = <1390000>; |
---|
1105 | 1124 | regulator-init-microvolt = <900000>; |
---|
1106 | | - regulator-initial-mode = <1>; |
---|
1107 | 1125 | regulator-ramp-delay = <2300>; |
---|
1108 | 1126 | fcs,suspend-voltage-selector = <1>; |
---|
1109 | 1127 | regulator-boot-on; |
---|
.. | .. |
---|
1265 | 1283 | vccio_acodec: LDO_REG4 { |
---|
1266 | 1284 | regulator-always-on; |
---|
1267 | 1285 | regulator-boot-on; |
---|
1268 | | - regulator-min-microvolt = <3300000>; |
---|
1269 | | - regulator-max-microvolt = <3300000>; |
---|
| 1286 | + regulator-min-microvolt = <3000000>; |
---|
| 1287 | + regulator-max-microvolt = <3000000>; |
---|
1270 | 1288 | regulator-name = "vccio_acodec"; |
---|
1271 | 1289 | regulator-state-mem { |
---|
1272 | 1290 | regulator-off-in-suspend; |
---|
.. | .. |
---|
1423 | 1441 | &i2s1m0_sdo0>; |
---|
1424 | 1442 | }; |
---|
1425 | 1443 | |
---|
| 1444 | +&i2s3_2ch { |
---|
| 1445 | + pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>; |
---|
| 1446 | + rockchip,bclk-fs = <32>; |
---|
| 1447 | + status = "disabled"; |
---|
| 1448 | +}; |
---|
| 1449 | + |
---|
1426 | 1450 | &iep { |
---|
1427 | 1451 | status = "okay"; |
---|
1428 | 1452 | }; |
---|
.. | .. |
---|
1458 | 1482 | }; |
---|
1459 | 1483 | |
---|
1460 | 1484 | &pinctrl { |
---|
| 1485 | + |
---|
| 1486 | + headphone { |
---|
| 1487 | + hp_det: hp-det { |
---|
| 1488 | + rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>; |
---|
| 1489 | + }; |
---|
| 1490 | + }; |
---|
1461 | 1491 | |
---|
1462 | 1492 | mxc6655xa { |
---|
1463 | 1493 | mxc6655xa_irq_gpio: mxc6655xa_irq_gpio { |
---|
.. | .. |
---|
1820 | 1850 | |
---|
1821 | 1851 | &vop { |
---|
1822 | 1852 | status = "okay"; |
---|
1823 | | - assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; |
---|
1824 | | - assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; |
---|
| 1853 | + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>; |
---|
| 1854 | + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>; |
---|
1825 | 1855 | }; |
---|
1826 | 1856 | |
---|
1827 | 1857 | &vop_mmu { |
---|