diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile index b6f494e52876..82e74e57815a 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile @@ -71,7 +71,6 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ rk3588-disable-led.dtbo \ rk3588-opi5plus-disable-leds.dtbo \ rk356x-edp.dtbo \ - rk356x-opi3b-edp.dtbo \ rk356x-i2c2-m1.dtbo \ rk356x-i2c3-m0.dtbo \ rk356x-i2c4-m0.dtbo \ diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-edp.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-edp.dts index f75639d14aa3..d47df3263601 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-edp.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk356x-edp.dts @@ -7,111 +7,14 @@ / { fragment@0 { + target = <&edp>; - target-path = "/"; __overlay__ { - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 25000 0>; - 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>; - }; - - edp-panel { - status = "okay"; - compatible = "simple-panel"; - backlight = <&backlight>; - prepare-delay-ms = <120>; - enable-delay-ms = <120>; - unprepare-delay-ms = <120>; - disable-delay-ms = <120>; - - display-timings { - native-mode = <&edp_timing>; - - edp_timing: timing0 { - clock-frequency = <125000000>; - hactive = <1920>; - vactive = <1080>; - hback-porch = <180>; - hfront-porch = <120>; - vback-porch = <10>; - vfront-porch = <10>; - hsync-len = <20>; - vsync-len = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <0>; - pixelclk-active = <0>; - }; - }; - - port { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; + status = "okay"; }; }; fragment@1 { - target = <&edp>; - - __overlay__ { - - status = "okay"; - force-hpd; - hpd-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&edp_hpd &bl_en>; - - ports { - port@1 { - reg = <1>; - - edp_out_panel: endpoint { - remote-endpoint = <&panel_in_edp>; - }; - }; - }; - }; - }; - - fragment@2 { target = <&edp_phy>; __overlay__ { @@ -119,7 +22,7 @@ }; }; - fragment@3 { + fragment@2 { target = <&edp_in_vp0>; __overlay__ { @@ -127,7 +30,7 @@ }; }; - fragment@4 { + fragment@3 { target = <&edp_in_vp1>; __overlay__ { @@ -135,7 +38,7 @@ }; }; - fragment@5 { + fragment@4 { target = <&route_edp>; __overlay__ { @@ -143,7 +46,7 @@ }; }; - fragment@6 { + fragment@5 { target = <&pwm2>; __overlay__ { @@ -151,50 +54,10 @@ }; }; - fragment@7 { - target = <&pinctrl>; - __overlay__ { - edp { - edp_hpd: edp-hpd { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - bl_en: bl-en { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>; - }; - }; - }; - }; - - fragment@8 { + fragment@6 { target = <&hdmi>; __overlay__ { status = "disabled"; }; }; - -// fragment@7 { -// target = <&vp1>; -// __overlay__ { -// //rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << -// //ROCKCHIP_VOP2_SMART1)>; -// //rockchip,primary-plane = ; -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_SMART0)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; -// -// fragment@8 { -// target = <&vp0>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_SMART1)>; -// rockchip,primary-plane = ; -// //rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << -// //ROCKCHIP_VOP2_SMART0)>; -// //rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; - }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-opi3b-edp.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-opi3b-edp.dts deleted file mode 100644 index 1b3408de0769..000000000000 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-opi3b-edp.dts +++ /dev/null @@ -1,200 +0,0 @@ -/dts-v1/; -/plugin/; - -#include -#include -#include - -/ { - fragment@0 { - - target-path = "/"; - __overlay__ { - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 25000 0>; - 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>; - }; - - edp-panel { - status = "okay"; - compatible = "simple-panel"; - backlight = <&backlight>; - prepare-delay-ms = <120>; - enable-delay-ms = <120>; - unprepare-delay-ms = <120>; - disable-delay-ms = <120>; - - display-timings { - native-mode = <&edp_timing>; - - edp_timing: timing0 { - clock-frequency = <125000000>; - hactive = <1920>; - vactive = <1080>; - hback-porch = <180>; - hfront-porch = <120>; - vback-porch = <10>; - vfront-porch = <10>; - hsync-len = <20>; - vsync-len = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <0>; - pixelclk-active = <0>; - }; - }; - - port { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; - }; - }; - - fragment@1 { - target = <&edp>; - - __overlay__ { - - status = "okay"; - force-hpd; - hpd-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&edp_hpd &bl_en>; - - ports { - port@1 { - reg = <1>; - - edp_out_panel: endpoint { - remote-endpoint = <&panel_in_edp>; - }; - }; - }; - }; - }; - - fragment@2 { - target = <&edp_phy>; - - __overlay__ { - status = "okay"; - }; - }; - - fragment@3 { - target = <&edp_in_vp0>; - - __overlay__ { - status = "okay"; - }; - }; - - fragment@4 { - target = <&edp_in_vp1>; - - __overlay__ { - status = "disabled"; - }; - }; - - fragment@5 { - target = <&route_edp>; - - __overlay__ { - status = "disabled"; - }; - }; - - fragment@6 { - target = <&pwm2>; - - __overlay__ { - status = "okay"; - }; - }; - - fragment@7 { - target = <&pinctrl>; - __overlay__ { - edp { - edp_hpd: edp-hpd { - rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - bl_en: bl-en { - rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_output_high>; - }; - }; - }; - }; - - fragment@8 { - target = <&hdmi>; - __overlay__ { - status = "disabled"; - }; - }; - -// fragment@7 { -// target = <&vp1>; -// __overlay__ { -// //rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << -// //ROCKCHIP_VOP2_SMART1)>; -// //rockchip,primary-plane = ; -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_SMART0)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; -// -// fragment@8 { -// target = <&vp0>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_SMART1)>; -// rockchip,primary-plane = ; -// //rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << -// //ROCKCHIP_VOP2_SMART0)>; -// //rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; - -}; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c1.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c1.dts index 9246a16348bb..066260d413b3 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c1.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c1.dts @@ -10,29 +10,18 @@ __overlay__ { status = "okay"; - - ov5647: ov5647@36 { - status = "okay"; - compatible = "ovti,ov5647"; - reg = <0x36>; - clocks = <&ext_cam_ov5647_clk>; - clock-names = "ext_cam_ov5647_clk"; - pwdn-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; - rockchip,camera-module-index = <0>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "TongJu"; - rockchip,camera-module-lens-name = "CHT842-MD"; - port { - ov5647_out: endpoint { - remote-endpoint = <&dphy1_in>; - data-lanes = <1 2>; - }; - }; - }; }; }; fragment@1 { + target = <&ov5647>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@2 { target = <&csi2_dphy0>; __overlay__ { @@ -40,38 +29,11 @@ }; }; - fragment@2 { + fragment@3 { target = <&csi2_dphy1>; __overlay__ { status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - dphy1_in: endpoint@1 { - reg = <1>; - remote-endpoint = <&ov5647_out>; - data-lanes = <1 2>; - }; - }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - dphy1_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&isp0_in>; - }; - }; - }; }; }; @@ -102,15 +64,6 @@ target = <&rkisp_vir0>; __overlay__ { status = "okay"; - port { - #address-cells = <1>; - #size-cells = <0>; - - isp0_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&dphy1_out>; - }; - }; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c2.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c2.dts index 6bddc7e2c82d..7d749b44be8e 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c2.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk356x-ov5647-c2.dts @@ -9,28 +9,19 @@ target = <&i2c3>; __overlay__ { - ov5647_1: ov5647@36 { - status = "okay"; - compatible = "ovti,ov5647"; - reg = <0x36>; - clocks = <&ext_cam_ov5647_clk>; - clock-names = "ext_cam_ov5647_clk"; - pwdn-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; - rockchip,camera-module-index = <1>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "TongJu"; - rockchip,camera-module-lens-name = "CHT842-MD"; - port { - ov5647_out1: endpoint { - remote-endpoint = <&dphy2_in>; - data-lanes = <1 2>; - }; - }; - }; + status = "okay"; }; }; fragment@1 { + target = <&ov5647_1>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@2 { target = <&csi2_dphy0>; __overlay__ { @@ -38,38 +29,11 @@ }; }; - fragment@2 { + fragment@3 { target = <&csi2_dphy2>; __overlay__ { status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - dphy2_in: endpoint@1 { - reg = <1>; - remote-endpoint = <&ov5647_out1>; - data-lanes = <1 2>; - }; - }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - dphy2_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&mipi_csi2_input>; - }; - }; - }; }; }; @@ -86,34 +50,6 @@ __overlay__ { status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_csi2_input: endpoint@1 { - reg = <1>; - remote-endpoint = <&dphy2_out>; - data-lanes = <1 2>; - }; - }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_csi2_output: endpoint@0 { - reg = <0>; - remote-endpoint = <&cif_mipi_in>; - data-lanes = <1 2>; - }; - }; - }; }; }; @@ -122,12 +58,6 @@ __overlay__ { status = "okay"; - port { - cif_mipi_in: endpoint { - remote-endpoint = <&mipi_csi2_output>; - data-lanes = <1 2>; - }; - }; }; }; @@ -136,12 +66,6 @@ __overlay__ { status = "okay"; - port { - mipi_lvds_sditf: endpoint { - remote-endpoint = <&isp1_in>; - data-lanes = <1 2>; - }; - }; }; }; @@ -165,16 +89,6 @@ __overlay__ { status = "okay"; - port { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - isp1_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi_lvds_sditf>; - }; - }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen-dsi0.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen-dsi0.dts index ec62d0f41371..827e67fdc02e 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen-dsi0.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen-dsi0.dts @@ -9,16 +9,6 @@ __overlay__ { status = "okay"; - - ports { - port@1 { - reg = <1>; - - dsi0_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi0>; - }; - }; - }; }; }; @@ -28,27 +18,11 @@ __overlay__ { status = "okay"; - - raspits_panel_1: raspits-panel@45 { - compatible = "raspberrypi,7inch-touchscreen-panel"; - reg = <0x45>; - - port { - panel_in_dsi0: endpoint { - remote-endpoint = <&dsi0_out_panel>; - }; - }; - }; - - raspits_touch_ft5426_1: raspits-touch-ft5426@38 { - compatible = "raspits_ft5426"; - reg = <0x38>; - }; }; }; fragment@2 { - target = <&video_phy0>; + target = <&raspits_panel_1>; __overlay__ { status = "okay"; @@ -56,6 +30,23 @@ }; fragment@3 { + target = <&raspits_touch_ft5426_1>; + + __overlay__ { + status = "okay"; + + }; + }; + + fragment@4 { + target = <&video_phy0>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@5 { target = <&dsi0_in_vp0>; __overlay__ { @@ -63,7 +54,7 @@ }; }; - fragment@4 { + fragment@6 { target = <&dsi0_in_vp1>; __overlay__ { @@ -71,7 +62,7 @@ }; }; - fragment@5 { + fragment@7 { target = <&route_dsi0>; __overlay__ { @@ -79,30 +70,10 @@ }; }; - fragment@6 { + fragment@8 { target = <&hdmi>; __overlay__ { status = "disabled"; }; }; - -// fragment@6 { -// target = <&vp0>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << -// ROCKCHIP_VOP2_SMART1)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; -// -// fragment@7 { -// target = <&vp1>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << -// ROCKCHIP_VOP2_SMART0)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen.dts b/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen.dts index 91e493653468..9b5c7ca10f42 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk356x-raspi-7inch-touchscreen.dts @@ -9,16 +9,6 @@ __overlay__ { status = "okay"; - - ports { - port@1 { - reg = <1>; - - dsi1_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi1>; - }; - }; - }; }; }; @@ -26,29 +16,12 @@ target = <&i2c1>; __overlay__ { - status = "okay"; - - raspits_panel: raspits-panel@45 { - compatible = "raspberrypi,7inch-touchscreen-panel"; - reg = <0x45>; - - port { - panel_in_dsi1: endpoint { - remote-endpoint = <&dsi1_out_panel>; - }; - }; - }; - - raspits_touch_ft5426: raspits-touch-ft5426@38 { - compatible = "raspits_ft5426"; - reg = <0x38>; - }; }; }; fragment@2 { - target = <&video_phy1>; + target = <&raspits_panel>; __overlay__ { status = "okay"; @@ -56,7 +29,7 @@ }; fragment@3 { - target = <&dsi1_in_vp0>; + target = <&raspits_touch_ft5426>; __overlay__ { status = "okay"; @@ -64,6 +37,22 @@ }; fragment@4 { + target = <&video_phy1>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@5 { + target = <&dsi1_in_vp0>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@6 { target = <&dsi1_in_vp1>; __overlay__ { @@ -71,7 +60,7 @@ }; }; - fragment@5 { + fragment@7 { target = <&route_dsi1>; __overlay__ { @@ -79,30 +68,10 @@ }; }; - fragment@6 { + fragment@8 { target = <&hdmi>; __overlay__ { status = "disabled"; }; }; - -// fragment@6 { -// target = <&vp0>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << -// ROCKCHIP_VOP2_SMART1)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; -// -// fragment@7 { -// target = <&vp1>; -// __overlay__ { -// rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << -// ROCKCHIP_VOP2_SMART0)>; -// rockchip,primary-plane = ; -// cursor-win-id = ; -// }; -// }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b.dts b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b.dts index fe6bd0a098d8..8f5476f488a0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b.dts @@ -88,8 +88,9 @@ pinctrl-names = "default"; pinctrl-0 =<&leds_gpio>; - work_led: work { + led@1 { gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + label = "status_led"; linux,default-trigger = "heartbeat"; }; }; @@ -240,6 +241,81 @@ status = "okay"; }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 25000 0>; + 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>; + }; + + edp-panel { + compatible = "simple-panel"; + backlight = <&backlight>; + prepare-delay-ms = <120>; + enable-delay-ms = <120>; + unprepare-delay-ms = <120>; + disable-delay-ms = <120>; + + display-timings { + native-mode = <&edp_timing>; + + edp_timing: timing0 { + clock-frequency = <125000000>; + hactive = <1920>; + vactive = <1080>; + hback-porch = <180>; + hfront-porch = <120>; + vback-porch = <10>; + vfront-porch = <10>; + hsync-len = <20>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + }; + + port { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; + }; }; &bus_npu { @@ -582,6 +658,10 @@ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>; }; +&pwm7 { + status = "okay"; +}; + &i2s0_8ch { status = "okay"; }; @@ -711,7 +791,7 @@ edp_hpd: edp-hpd { rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; - + bl_en: bl-en { rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_output_high>; }; @@ -997,7 +1077,7 @@ status = "okay"; ov5647: ov5647@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5647"; reg = <0x36>; clocks = <&ext_cam_ov5647_clk>; @@ -1014,14 +1094,36 @@ }; }; }; + + raspits_panel: raspits-panel@45 { + status = "disabled"; + compatible = "raspberrypi,7inch-touchscreen-panel"; + reg = <0x45>; + + port { + panel_in_dsi1: endpoint { + remote-endpoint = <&dsi1_out_panel>; + }; + }; + }; + + raspits_touch_ft5426: raspits-touch-ft5426@38 { + status = "disabled"; + compatible = "raspits_ft5426"; + reg = <0x38>; + }; }; &csi2_dphy_hw { - status = "okay"; + status = "disabled"; }; &csi2_dphy0 { - status = "okay"; + status = "disabled"; +}; + +&csi2_dphy1 { + status = "disabled"; /* * dphy1 only used for split mode, * can be used concurrently with dphy2 @@ -1057,15 +1159,15 @@ }; &rkisp { - status = "okay"; + status = "disabled"; }; &rkisp_mmu { - status = "okay"; + status = "disabled"; }; &rkisp_vir0 { - status = "okay"; + status = "disabled"; port { #address-cells = <1>; #size-cells = <0>; @@ -1077,7 +1179,46 @@ }; }; -&pwm7 { - status = "okay"; +&edp { + status = "disabled"; + force-hpd; + hpd-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd &bl_en>; + + ports { + port@1 { + reg = <1>; + + edp_out_panel: endpoint { + remote-endpoint = <&panel_in_edp>; + }; + }; + }; }; +&edp_phy { + status = "disabled"; +}; + +&route_edp { + status = "disabled"; +}; + +&pwm2 { + status = "disabled"; +}; + +&dsi1 { + status = "disabled"; + + ports { + port@1 { + reg = <1>; + + dsi1_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi1>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-cm4.dts b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-cm4.dts index b0d563bf3b6a..3617fd1be8ea 100755 --- a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-cm4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-cm4.dts @@ -84,8 +84,9 @@ pinctrl-names = "default"; pinctrl-0 =<&leds_gpio>; - work_led: work { + led@1 { gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + label = "status_led"; linux,default-trigger = "heartbeat"; }; }; @@ -153,7 +154,7 @@ test-power { status = "okay"; }; - + unisoc_uwe_bsp: uwe-bsp { compatible = "unisoc,uwe_bsp"; wl-reg-on = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; @@ -216,6 +217,81 @@ status = "okay"; }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 25000 0>; + 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>; + }; + + edp-panel { + compatible = "simple-panel"; + backlight = <&backlight>; + prepare-delay-ms = <120>; + enable-delay-ms = <120>; + unprepare-delay-ms = <120>; + disable-delay-ms = <120>; + + display-timings { + native-mode = <&edp_timing>; + + edp_timing: timing0 { + clock-frequency = <125000000>; + hactive = <1920>; + vactive = <1080>; + hback-porch = <180>; + hfront-porch = <120>; + vback-porch = <10>; + vfront-porch = <10>; + hsync-len = <20>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + }; + + port { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; + }; }; &bus_npu { @@ -679,6 +755,16 @@ rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; }; }; + + edp { + edp_hpd: edp-hpd { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bl_en: bl-en { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>; + }; + }; }; /* @@ -960,7 +1046,7 @@ status = "okay"; ov5647: ov5647@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5647"; reg = <0x36>; clocks = <&ext_cam_ov5647_clk>; @@ -979,13 +1065,35 @@ }; }; }; + + raspits_panel: raspits-panel@45 { + status = "disabled"; + compatible = "raspberrypi,7inch-touchscreen-panel"; + reg = <0x45>; + + port { + panel_in_dsi1: endpoint { + remote-endpoint = <&dsi1_out_panel>; + }; + }; + }; + + raspits_touch_ft5426: raspits-touch-ft5426@38 { + status = "disabled"; + compatible = "raspits_ft5426"; + reg = <0x38>; + }; +}; + +&csi2_dphy_hw { + status = "disabled"; }; &i2c3 { status = "okay"; ov5647_1: ov5647@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5647"; reg = <0x36>; @@ -1006,6 +1114,24 @@ }; }; }; + + raspits_panel_1: raspits-panel@45 { + status = "disabled"; + compatible = "raspberrypi,7inch-touchscreen-panel"; + reg = <0x45>; + + port { + panel_in_dsi0: endpoint { + remote-endpoint = <&dsi0_out_panel>; + }; + }; + }; + + raspits_touch_ft5426_1: raspits-touch-ft5426@38 { + status = "disabled"; + compatible = "raspits_ft5426"; + reg = <0x38>; + }; }; &csi2_dphy0 { @@ -1013,7 +1139,7 @@ }; &csi2_dphy1 { - status = "okay"; + status = "disabled"; /* * dphy1 only used for split mode, * can be used concurrently with dphy2 @@ -1049,7 +1175,7 @@ }; &csi2_dphy2 { - status = "okay"; + status = "disabled"; /* * dphy2 only used for split mode, * can be used concurrently with dphy1 @@ -1084,12 +1210,8 @@ }; }; -&csi2_dphy_hw { - status = "okay"; -}; - &mipi_csi2 { - status = "okay"; + status = "disabled"; ports { #address-cells = <1>; @@ -1122,7 +1244,7 @@ }; &rkcif_mipi_lvds { - status = "okay"; + status = "disabled"; port { cif_mipi_in: endpoint { remote-endpoint = <&mipi_csi2_output>; @@ -1132,7 +1254,7 @@ }; &rkcif_mipi_lvds_sditf { - status = "okay"; + status = "disabled"; port { mipi_lvds_sditf: endpoint { remote-endpoint = <&isp0_in>; @@ -1142,15 +1264,15 @@ }; &rkisp { - status = "okay"; + status = "disabled"; }; &rkisp_mmu { - status = "okay"; + status = "disabled"; }; &rkisp_vir0 { - status = "okay"; + status = "disabled"; port { #address-cells = <1>; #size-cells = <0>; @@ -1163,7 +1285,7 @@ }; &rkisp_vir1 { - status = "okay"; + status = "disabled"; port { reg = <0>; @@ -1178,9 +1300,67 @@ }; &rkcif_mmu { - status = "okay"; + status = "disabled"; }; &rkcif { - status = "okay"; + status = "disabled"; +}; + +&edp { + status = "disabled"; + force-hpd; + hpd-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd &bl_en>; + + ports { + port@1 { + reg = <1>; + + edp_out_panel: endpoint { + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; + +&edp_phy { + status = "disabled"; +}; + +&route_edp { + status = "disabled"; +}; + +&pwm2 { + status = "disabled"; +}; + +&dsi0 { + status = "disabled"; + + ports { + port@1 { + reg = <1>; + + dsi0_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi0>; + }; + }; + }; +}; + +&dsi1 { + status = "disabled"; + + ports { + port@1 { + reg = <1>; + + dsi1_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi1>; + }; + }; + }; };