diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi index dec3a24159c1..673ff5a9fcbb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96712"; - rockchip,camera-module-lens-name = "max96712"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96712_dcphy0_out: endpoint { @@ -509,8 +509,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -580,8 +580,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -651,8 +651,8 @@ rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -722,8 +722,8 @@ rockchip,camera-module-index = <3>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi index 7d306ead7288..1f3f2ee29ad4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96712"; - rockchip,camera-module-lens-name = "max96712"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96712_dcphy1_out: endpoint { @@ -389,8 +389,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2311"; - rockchip,camera-module-lens-name = "ov2311"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -454,8 +454,8 @@ rockchip,camera-module-index = <1>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2312"; - rockchip,camera-module-lens-name = "ov2312"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi index 4f4dde4e443f..2472a3247ad9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96712"; - rockchip,camera-module-lens-name = "max96712"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96712_dphy0_out: endpoint { @@ -521,8 +521,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -592,8 +592,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -663,8 +663,8 @@ rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -734,8 +734,8 @@ rockchip,camera-module-index = <3>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi index 6510c3c57ca1..7bd80caaba2d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96712"; - rockchip,camera-module-lens-name = "max96712"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96712_dphy3_out: endpoint { @@ -464,8 +464,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "sc320at"; - rockchip,camera-module-lens-name = "sc320at"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -518,8 +518,8 @@ rockchip,camera-module-index = <1>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "sc320at"; - rockchip,camera-module-lens-name = "sc320at"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -571,8 +571,8 @@ rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "sc320at"; - rockchip,camera-module-lens-name = "sc320at"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -624,8 +624,8 @@ rockchip,camera-module-index = <3>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "sc320at"; - rockchip,camera-module-lens-name = "sc320at"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi index 55030865daec..908aac609958 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96722"; - rockchip,camera-module-lens-name = "max96722"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96722_dphy0_out: endpoint { @@ -521,8 +521,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -592,8 +592,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -663,8 +663,8 @@ rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -734,8 +734,8 @@ rockchip,camera-module-index = <3>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi index 1d65ff988091..e4a2da22bb24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi @@ -114,8 +114,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96722"; - rockchip,camera-module-lens-name = "max96722"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96722_dphy3_out: endpoint { @@ -401,8 +401,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2311"; - rockchip,camera-module-lens-name = "ov2311"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -466,8 +466,8 @@ rockchip,camera-module-index = <1>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2312"; - rockchip,camera-module-lens-name = "ov2312"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi index dd37e7ad78e9..3a45d3339ae4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi @@ -293,8 +293,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96712"; - rockchip,camera-module-lens-name = "max96712"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96712_dphy0_out: endpoint { @@ -700,8 +700,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -771,8 +771,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -842,8 +842,8 @@ rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -913,8 +913,8 @@ rockchip,camera-module-index = <3>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ox01f10"; - rockchip,camera-module-lens-name = "ox01f10"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -949,8 +949,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "max96722"; - rockchip,camera-module-lens-name = "max96722"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; port { max96722_dphy3_out: endpoint { @@ -1236,8 +1236,8 @@ rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2311"; - rockchip,camera-module-lens-name = "ov2311"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { @@ -1301,8 +1301,8 @@ rockchip,camera-module-index = <1>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "ov2312"; - rockchip,camera-module-lens-name = "ov2312"; + rockchip,camera-module-name = "default"; + rockchip,camera-module-lens-name = "default"; /* port config start */ port { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi index d6ba4de2002c..c70463756cd0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi @@ -762,25 +762,25 @@ i2c2_bu18tl82_bridge: i2c2-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c2_bu18tl82_in_dsi0: endpoint { - remote-endpoint = <&dsi0_out_i2c2_bu18tl82>; + i2c2_bu18tl82_in_dsi0: endpoint { + remote-endpoint = <&dsi0_out_i2c2_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c2_bu18tl82_out_i2c2_bu18rl82: endpoint { - remote-endpoint = <&i2c2_bu18rl82_in_i2c2_bu18tl82>; + i2c2_bu18tl82_out_i2c2_bu18rl82: endpoint { + remote-endpoint = <&i2c2_bu18rl82_in_i2c2_bu18tl82>; + }; }; }; }; @@ -926,25 +926,25 @@ i2c2_bu18rl82_bridge: i2c2-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c2_bu18rl82_in_i2c2_bu18tl82: endpoint { - remote-endpoint = <&i2c2_bu18tl82_out_i2c2_bu18rl82>; + i2c2_bu18rl82_in_i2c2_bu18tl82: endpoint { + remote-endpoint = <&i2c2_bu18tl82_out_i2c2_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c2_bu18rl82_out_panel0: endpoint { - remote-endpoint = <&panel0_in_i2c2_bu18rl82>; + i2c2_bu18rl82_out_panel0: endpoint { + remote-endpoint = <&panel0_in_i2c2_bu18rl82>; + }; }; }; }; @@ -1065,25 +1065,25 @@ i2c4_bu18tl82_bridge: i2c4-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c4_bu18tl82_in_dp0: endpoint { - remote-endpoint = <&dp0_out_i2c4_bu18tl82>; + i2c4_bu18tl82_in_dp0: endpoint { + remote-endpoint = <&dp0_out_i2c4_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c4_bu18tl82_out_i2c4_bu18rl82: endpoint { - remote-endpoint = <&i2c4_bu18rl82_in_i2c4_bu18tl82>; + i2c4_bu18tl82_out_i2c4_bu18rl82: endpoint { + remote-endpoint = <&i2c4_bu18rl82_in_i2c4_bu18tl82>; + }; }; }; }; @@ -1224,25 +1224,25 @@ i2c4_bu18rl82_bridge: i2c4-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c4_bu18rl82_in_i2c4_bu18tl82: endpoint { - remote-endpoint = <&i2c4_bu18tl82_out_i2c4_bu18rl82>; + i2c4_bu18rl82_in_i2c4_bu18tl82: endpoint { + remote-endpoint = <&i2c4_bu18tl82_out_i2c4_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c4_bu18rl82_out_panel0: endpoint { - remote-endpoint = <&panel0_in_i2c4_bu18rl82>; + i2c4_bu18rl82_out_panel0: endpoint { + remote-endpoint = <&panel0_in_i2c4_bu18rl82>; + }; }; }; }; @@ -1371,25 +1371,25 @@ i2c5_bu18tl82_bridge: i2c5-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c5_bu18tl82_in_edp0: endpoint { - remote-endpoint = <&edp0_out_i2c5_bu18tl82>; + i2c5_bu18tl82_in_edp0: endpoint { + remote-endpoint = <&edp0_out_i2c5_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c5_bu18tl82_out_i2c5_bu18rl82: endpoint { - remote-endpoint = <&i2c5_bu18rl82_in_i2c5_bu18tl82>; + i2c5_bu18tl82_out_i2c5_bu18rl82: endpoint { + remote-endpoint = <&i2c5_bu18rl82_in_i2c5_bu18tl82>; + }; }; }; }; @@ -1533,25 +1533,25 @@ i2c5_bu18rl82_bridge: i2c5-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c5_bu18rl82_in_i2c5_bu18tl82: endpoint { - remote-endpoint = <&i2c5_bu18tl82_out_i2c5_bu18rl82>; + i2c5_bu18rl82_in_i2c5_bu18tl82: endpoint { + remote-endpoint = <&i2c5_bu18tl82_out_i2c5_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c5_bu18rl82_out_panel0: endpoint { - remote-endpoint = <&panel0_in_i2c5_bu18rl82>; + i2c5_bu18rl82_out_panel0: endpoint { + remote-endpoint = <&panel0_in_i2c5_bu18rl82>; + }; }; }; }; @@ -1706,25 +1706,25 @@ i2c6_bu18tl82_bridge: i2c6-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c6_bu18tl82_in_dsi1: endpoint { - remote-endpoint = <&dsi1_out_i2c6_bu18tl82>; + i2c6_bu18tl82_in_dsi1: endpoint { + remote-endpoint = <&dsi1_out_i2c6_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c6_bu18tl82_out_i2c6_bu18rl82: endpoint { - remote-endpoint = <&i2c6_bu18rl82_in_i2c6_bu18tl82>; + i2c6_bu18tl82_out_i2c6_bu18rl82: endpoint { + remote-endpoint = <&i2c6_bu18rl82_in_i2c6_bu18tl82>; + }; }; }; }; @@ -1872,25 +1872,25 @@ i2c6_bu18rl82_bridge: i2c6-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c6_bu18rl82_in_i2c6_bu18tl82: endpoint { - remote-endpoint = <&i2c6_bu18tl82_out_i2c6_bu18rl82>; + i2c6_bu18rl82_in_i2c6_bu18tl82: endpoint { + remote-endpoint = <&i2c6_bu18tl82_out_i2c6_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c6_bu18rl82_out_panel1: endpoint { - remote-endpoint = <&panel1_in_i2c6_bu18rl82>; + i2c6_bu18rl82_out_panel1: endpoint { + remote-endpoint = <&panel1_in_i2c6_bu18rl82>; + }; }; }; }; @@ -2010,24 +2010,25 @@ i2c7_bu18tl82_bridge: i2c7-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - i2c7_bu18tl82_in_edp1: endpoint { - remote-endpoint = <&edp1_out_i2c7_bu18tl82>; + port@0 { + reg = <0>; + + i2c7_bu18tl82_in_edp1: endpoint { + remote-endpoint = <&edp1_out_i2c7_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c7_bu18tl82_out_i2c7_bu18rl82: endpoint { - remote-endpoint = <&i2c7_bu18rl82_in_i2c7_bu18tl82>; + i2c7_bu18tl82_out_i2c7_bu18rl82: endpoint { + remote-endpoint = <&i2c7_bu18rl82_in_i2c7_bu18tl82>; + }; }; }; }; @@ -2144,25 +2145,25 @@ i2c7_bu18rl82_bridge: i2c7-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c7_bu18rl82_in_i2c7_bu18tl82: endpoint { - remote-endpoint = <&i2c7_bu18tl82_out_i2c7_bu18rl82>; + i2c7_bu18rl82_in_i2c7_bu18tl82: endpoint { + remote-endpoint = <&i2c7_bu18tl82_out_i2c7_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c7_bu18rl82_out_panel1: endpoint { - remote-endpoint = <&panel1_in_i2c7_bu18rl82>; + i2c7_bu18rl82_out_panel1: endpoint { + remote-endpoint = <&panel1_in_i2c7_bu18rl82>; + }; }; }; }; @@ -2289,25 +2290,25 @@ i2c8_bu18tl82_bridge: i2c8-bu18tl82-bridge { compatible = "rohm,bu18tl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c8_bu18tl82_in_dp1: endpoint { - remote-endpoint = <&dp1_out_i2c8_bu18tl82>; + i2c8_bu18tl82_in_dp1: endpoint { + remote-endpoint = <&dp1_out_i2c8_bu18tl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c8_bu18tl82_out_i2c8_bu18rl82: endpoint { - remote-endpoint = <&i2c8_bu18rl82_in_i2c8_bu18tl82>; + i2c8_bu18tl82_out_i2c8_bu18rl82: endpoint { + remote-endpoint = <&i2c8_bu18rl82_in_i2c8_bu18tl82>; + }; }; }; }; @@ -2424,25 +2425,25 @@ i2c8_bu18rl82_bridge: i2c8-bu18rl82-bridge { compatible = "rohm,bu18rl82-bridge"; status = "okay"; - }; - ports { - #address-cells = <1>; - #size-cells = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@0 { - reg = <0>; + port@0 { + reg = <0>; - i2c8_bu18rl82_in_i2c8_bu18tl82: endpoint { - remote-endpoint = <&i2c8_bu18tl82_out_i2c8_bu18rl82>; + i2c8_bu18rl82_in_i2c8_bu18tl82: endpoint { + remote-endpoint = <&i2c8_bu18tl82_out_i2c8_bu18rl82>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - i2c8_bu18rl82_out_panel1: endpoint { - remote-endpoint = <&panel1_in_i2c8_bu18rl82>; + i2c8_bu18rl82_out_panel1: endpoint { + remote-endpoint = <&panel1_in_i2c8_bu18rl82>; + }; }; }; }; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c index 8e186333b815..24fc1f4a2f87 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -630,8 +630,7 @@ static int rockchip_drm_fill_connector_modes(struct drm_connector *connector, goto prune; } - if (!force_output) - count = (*connector_funcs->get_modes)(connector); + count = (*connector_funcs->get_modes)(connector); if (count == 0 && connector->status == connector_status_connected) count = drm_add_modes_noedid(connector, 4096, 4096);