From bc073ff3a56d23b0a01fcd3d48162a0c37fff34a Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Tue, 8 Aug 2023 16:08:33 +0300 Subject: [PATCH] opi5: edge: update some nodes on devicetree --- .../dt/rk3588s-orangepi-5.dts | 326 +++++++++++++----- 1 file changed, 237 insertions(+), 89 deletions(-) diff --git a/patch/kernel/rockchip-rk3588-edge/dt/rk3588s-orangepi-5.dts b/patch/kernel/rockchip-rk3588-edge/dt/rk3588s-orangepi-5.dts index ba0e438381..9734fe024a 100644 --- a/patch/kernel/rockchip-rk3588-edge/dt/rk3588s-orangepi-5.dts +++ b/patch/kernel/rockchip-rk3588-edge/dt/rk3588s-orangepi-5.dts @@ -4,6 +4,8 @@ #include #include +#include +#include #include "rk3588s.dtsi" / { @@ -34,20 +36,162 @@ }; }; - sound { - compatible = "audio-graph-card"; - label = "Analog"; - - widgets = "Microphone", "Mic Jack", - "Headphone", "Headphones"; - - routing = "MIC2", "Mic Jack", - "Headphones", "HPOL", - "Headphones", "HPOR"; - - hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + analog-sound { + compatible = "simple-audio-card"; pinctrl-names = "default"; pinctrl-0 = <&hp_detect>; + simple-audio-card,name = "ES8388 Audio"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,bitclock-master = <&masterdai>; + simple-audio-card,frame-master = <&masterdai>; + + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Microphone", "Onboard Mic", + "Headphone", "Headphones", + "Speaker", "Speaker"; + simple-audio-card,routing = + "Speaker Amplifier INL", "LOUT2", + "Speaker Amplifier INR", "ROUT2", + "Speaker", "Speaker Amplifier OUTL", + "Speaker", "Speaker Amplifier OUTR", + "Headphone Amplifier INL", "LOUT1", + "Headphone Amplifier INR", "ROUT1", + "Headphones", "Headphone Amplifier OUTL", + "Headphones", "Headphone Amplifier OUTR", + "LINPUT1", "Onboard Mic", + "LINPUT2", "Onboard Mic", + "RINPUT1", "Mic Jack", + "RINPUT2", "Mic Jack"; + + simple-audio-card,hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + io-channels = <&saradc 3>; + io-channel-names = "adc-detect"; + + simple-audio-card,cpu { + sound-dai = <&i2s1_8ch>; + }; + + masterdai: simple-audio-card,codec { + sound-dai = <&es8388>; + }; + + play-pause-key { + label = "playpause"; + linux,code = ; + press-threshold-microvolt = <2000>; + }; + }; + + adc_keys: adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1800000>; + poll-interval = <100>; + + vol-up-key { + label = "volume up"; + linux,code = ; + press-threshold-microvolt = <17000>; + }; + + vol-down-key { + label = "volume down"; + linux,code = ; + press-threshold-microvolt = <417000>; + }; + + menu-key { + label = "menu"; + linux,code = ; + press-threshold-microvolt = <890000>; + }; + + back-key { + label = "back"; + linux,code = ; + press-threshold-microvolt = <1235000>; + }; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + brightness-levels = < + 0 20 20 21 21 22 22 23 + 23 24 24 25 25 26 26 27 + 27 28 28 29 29 30 30 31 + 31 32 32 33 33 34 34 35 + 35 36 36 37 37 38 38 39 + 40 41 42 43 44 45 46 47 + 48 49 50 51 52 53 54 55 + 56 57 58 59 60 61 62 63 + 64 65 66 67 68 69 70 71 + 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 + 88 89 90 91 92 93 94 95 + 96 97 98 99 100 101 102 103 + 104 105 106 107 108 109 110 111 + 112 113 114 115 116 117 118 119 + 120 121 122 123 124 125 126 127 + 128 129 130 131 132 133 134 135 + 136 137 138 139 140 141 142 143 + 144 145 146 147 148 149 150 151 + 152 153 154 155 156 157 158 159 + 160 161 162 163 164 165 166 167 + 168 169 170 171 172 173 174 175 + 176 177 178 179 180 181 182 183 + 184 185 186 187 188 189 190 191 + 192 193 194 195 196 197 198 199 + 200 201 202 203 204 205 206 207 + 208 209 210 211 212 213 214 215 + 216 217 218 219 220 221 222 223 + 224 225 226 227 228 229 230 231 + 232 233 234 235 236 237 238 239 + 240 241 242 243 244 245 246 247 + 248 249 250 251 252 253 254 255 + >; + default-brightness-level = <200>; + }; + + backlight_1: backlight_1 { + compatible = "pwm-backlight"; + brightness-levels = < + 0 20 20 21 21 22 22 23 + 23 24 24 25 25 26 26 27 + 27 28 28 29 29 30 30 31 + 31 32 32 33 33 34 34 35 + 35 36 36 37 37 38 38 39 + 40 41 42 43 44 45 46 47 + 48 49 50 51 52 53 54 55 + 56 57 58 59 60 61 62 63 + 64 65 66 67 68 69 70 71 + 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 + 88 89 90 91 92 93 94 95 + 96 97 98 99 100 101 102 103 + 104 105 106 107 108 109 110 111 + 112 113 114 115 116 117 118 119 + 120 121 122 123 124 125 126 127 + 128 129 130 131 132 133 134 135 + 136 137 138 139 140 141 142 143 + 144 145 146 147 148 149 150 151 + 152 153 154 155 156 157 158 159 + 160 161 162 163 164 165 166 167 + 168 169 170 171 172 173 174 175 + 176 177 178 179 180 181 182 183 + 184 185 186 187 188 189 190 191 + 192 193 194 195 196 197 198 199 + 200 201 202 203 204 205 206 207 + 208 209 210 211 212 213 214 215 + 216 217 218 219 220 221 222 223 + 224 225 226 227 228 229 230 231 + 232 233 234 235 236 237 238 239 + 240 241 242 243 244 245 246 247 + 248 249 250 251 252 253 254 255 + >; + default-brightness-level = <200>; }; wireless_bluetooth: wireless-bluetooth { @@ -82,7 +226,6 @@ regulator-max-microvolt = <12000000>; }; - vcc5v0_sys: vcc5v0-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; @@ -331,6 +474,11 @@ }; }; +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c3m0_xfer>; + status = "disabled"; +}; /* pin3: GPIO1_B7 @@ -372,7 +520,7 @@ }; - usbc0: fusb302@22 { + usbc0: usb-typec@22 { compatible = "fcs,fusb302"; reg = <0x22>; interrupt-parent = <&gpio0>; @@ -382,18 +530,6 @@ vbus-supply = <&vbus5v0_typec>; status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usbc0_role_sw: endpoint@0 { - remote-endpoint = <&dwc3_0_role_switch>; - }; - }; - }; - usb_con: connector { compatible = "usb-c-connector"; label = "USB-C"; @@ -401,19 +537,10 @@ power-role = "dual"; try-power-role = "sink"; op-sink-microwatt = <1000000>; - //sink-pdos = ; - //source-pdos = ; - - altmodes { - #address-cells = <1>; - #size-cells = <0>; - - altmode@0 { - reg = <0>; - svid = <0xff01>; - vdo = <0xffffffff>; - }; - }; + sink-pdos = + ; + source-pdos = + ; ports { #address-cells = <1>; @@ -421,15 +548,22 @@ port@0 { reg = <0>; - usbc0_orien_sw: endpoint { - remote-endpoint = <&usbdp_phy0_orientation_switch>; + usbc0_hs: endpoint { + remote-endpoint = <&usb_host0_xhci_drd_sw>; }; }; port@1 { reg = <1>; - dp_altmode_mux: endpoint { - remote-endpoint = <&usbdp_phy0_dp_altmode_mux>; + usbc0_ss: endpoint { + remote-endpoint = <&usbdp_phy0_typec_ss>; + }; + }; + + port@2 { + reg = <2>; + usbc0_sbu: endpoint { + remote-endpoint = <&usbdp_phy0_typec_sbu>; }; }; }; @@ -437,15 +571,6 @@ }; }; -&i2s0_8ch { - pinctrl-0 = <&i2s0_lrck - &i2s0_sclk - &i2s0_sdi0 - &i2s0_sdo0>; - status = "okay"; -}; - - &i2s1_8ch { rockchip,i2s-tx-route = <3 2 1 0>; rockchip,i2s-rx-route = <1 3 2 0>; @@ -534,12 +659,24 @@ status = "disabled"; }; +&pwm2 { + pinctrl-names = "active"; + pinctrl-0 = <&pwm2m0_pins>; + status = "okay"; +}; + &pwm3 { pinctrl-names = "active"; pinctrl-0 = <&pwm3m2_pins>; status = "disabled"; }; +&pwm6 { + pinctrl-names = "active"; + pinctrl-0 = <&pwm6m0_pins>; + status = "okay"; +}; + &pwm13 { pinctrl-names = "active"; pinctrl-0 = <&pwm13m2_pins>; @@ -565,6 +702,16 @@ status = "disabled"; }; +&backlight_1 { + pwms = <&pwm6 0 25000 0>; + status = "okay"; +}; + +&backlight { + pwms = <&pwm2 0 25000 0>; + status = "okay"; +}; + &saradc { vref-supply = <&avcc_1v8_s0>; status = "okay"; @@ -950,6 +1097,12 @@ status = "disabled"; }; +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1m1_xfer>; + status = "disabled"; +}; + &uart2 { pinctrl-0 = <&uart2m0_xfer>; status = "okay"; @@ -1030,45 +1183,30 @@ status = "okay"; }; -&u2phy2 { - status = "okay"; -}; - -&u2phy3 { - status = "okay"; -}; - &u2phy0_otg { rockchip,typec-vbus-det; status = "okay"; }; +&u2phy2 { + status = "okay"; +}; + &u2phy2_host { status = "okay"; }; +&u2phy3 { + status = "okay"; +}; + &u2phy3_host { status = "okay"; }; -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - &usbdp_phy0 { orientation-switch; + mode-switch; svid = <0xff01>; sbu1-dc-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; @@ -1076,14 +1214,15 @@ port { #address-cells = <1>; #size-cells = <0>; - usbdp_phy0_orientation_switch: endpoint@0 { + + usbdp_phy0_typec_ss: endpoint@0 { reg = <0>; - remote-endpoint = <&usbc0_orien_sw>; + remote-endpoint = <&usbc0_ss>; }; - usbdp_phy0_dp_altmode_mux: endpoint@1 { + usbdp_phy0_typec_sbu: endpoint@1 { reg = <1>; - remote-endpoint = <&dp_altmode_mux>; + remote-endpoint = <&usbc0_sbu>; }; }; }; @@ -1096,30 +1235,39 @@ status = "okay"; }; -&usbdrd3_0 { +&usb_host0_ehci { status = "okay"; }; -&usbdrd_dwc3_0 { +&usb_host0_ohci { status = "okay"; - dr_mode = "otg"; +}; + +&usb_host0_xhci { usb-role-switch; + dr_mode = "otg"; + status = "okay"; + port { #address-cells = <1>; #size-cells = <0>; - dwc3_0_role_switch: endpoint@0 { - reg = <0>; - remote-endpoint = <&usbc0_role_sw>; + + usb_host0_xhci_drd_sw: endpoint { + remote-endpoint = <&usbc0_hs>; }; }; }; -&usbhost3_0 { - dr_mode = "host"; +&usb_host1_ehci { status = "okay"; }; -&usbhost_dwc3_0 { +&usb_host1_ohci { + status = "okay"; +}; + +&usb_host2_xhci { + dr_mode = "host"; status = "okay"; };