.. | .. |
---|
83 | 83 | }; |
---|
84 | 84 | |
---|
85 | 85 | rk817-sound { |
---|
86 | | - compatible = "simple-audio-card"; |
---|
87 | | - simple-audio-card,format = "i2s"; |
---|
88 | | - simple-audio-card,name = "rockchip-rk817-codec"; |
---|
89 | | - simple-audio-card,mclk-fs = <256>; |
---|
90 | | - simple-audio-card,widgets = |
---|
91 | | - "Microphone", "Mic Jack", |
---|
92 | | - "Headphone", "Headphone Jack"; |
---|
93 | | - simple-audio-card,routing = |
---|
94 | | - "Mic Jack", "MICBIAS1", |
---|
95 | | - "IN1P", "Mic Jack", |
---|
96 | | - "Headphone Jack", "HPOL", |
---|
97 | | - "Headphone Jack", "HPOR"; |
---|
98 | | - simple-audio-card,cpu { |
---|
99 | | - sound-dai = <&i2s1_2ch>; |
---|
100 | | - }; |
---|
101 | | - simple-audio-card,codec { |
---|
102 | | - sound-dai = <&rk817_codec>; |
---|
103 | | - }; |
---|
104 | | - }; |
---|
105 | | - |
---|
106 | | - rk_headset: rk-headset { |
---|
107 | | - compatible = "rockchip_headset"; |
---|
108 | | - headset_gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; |
---|
| 86 | + compatible = "rockchip,multicodecs-card"; |
---|
| 87 | + rockchip,card-name = "rockchip-rk817"; |
---|
| 88 | + hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; |
---|
| 89 | + rockchip,format = "i2s"; |
---|
| 90 | + rockchip,mclk-fs = <256>; |
---|
| 91 | + rockchip,cpu = <&i2s1_2ch>; |
---|
| 92 | + rockchip,codec = <&rk817_codec>; |
---|
109 | 93 | pinctrl-names = "default"; |
---|
110 | 94 | pinctrl-0 = <&hp_det>; |
---|
111 | 95 | }; |
---|
.. | .. |
---|
245 | 229 | status = "okay"; |
---|
246 | 230 | }; |
---|
247 | 231 | |
---|
248 | | -&dsi_in_vopl { |
---|
249 | | - status = "disabled"; |
---|
250 | | -}; |
---|
251 | | - |
---|
252 | 232 | &route_dsi { |
---|
253 | 233 | connect = <&vopb_out_dsi>; |
---|
254 | 234 | status = "okay"; |
---|
.. | .. |
---|
298 | 278 | bus-width = <8>; |
---|
299 | 279 | cap-mmc-highspeed; |
---|
300 | 280 | mmc-hs200-1_8v; |
---|
301 | | - supports-emmc; |
---|
| 281 | + no-sdio; |
---|
| 282 | + no-sd; |
---|
302 | 283 | disable-wp; |
---|
303 | 284 | non-removable; |
---|
304 | 285 | num-slots = <1>; |
---|
.. | .. |
---|
730 | 711 | bus-width = <4>; |
---|
731 | 712 | cap-mmc-highspeed; |
---|
732 | 713 | cap-sd-highspeed; |
---|
733 | | - supports-sd; |
---|
| 714 | + no-sdio; |
---|
| 715 | + no-mmc; |
---|
734 | 716 | card-detect-delay = <800>; |
---|
735 | 717 | ignore-pm-notify; |
---|
736 | 718 | sd-uhs-sdr12; |
---|
.. | .. |
---|
745 | 727 | &sdio { |
---|
746 | 728 | bus-width = <4>; |
---|
747 | 729 | cap-sd-highspeed; |
---|
748 | | - supports-sdio; |
---|
| 730 | + no-sd; |
---|
| 731 | + no-mmc; |
---|
749 | 732 | ignore-pm-notify; |
---|
750 | 733 | keep-power-in-suspend; |
---|
751 | 734 | non-removable; |
---|
.. | .. |
---|
794 | 777 | }; |
---|
795 | 778 | |
---|
796 | 779 | &vopb_mmu { |
---|
797 | | - status = "okay"; |
---|
798 | | -}; |
---|
799 | | - |
---|
800 | | -&vopl { |
---|
801 | | - status = "okay"; |
---|
802 | | -}; |
---|
803 | | - |
---|
804 | | -&vopl_mmu { |
---|
805 | 780 | status = "okay"; |
---|
806 | 781 | }; |
---|
807 | 782 | |
---|