diff --git a/arch/arm/boot/dts/px3se-evb.dts b/arch/arm/boot/dts/px3se-evb.dts index 20dedfb0ae7e..d4a690e8b847 100644 --- a/arch/arm/boot/dts/px3se-evb.dts +++ b/arch/arm/boot/dts/px3se-evb.dts @@ -569,6 +569,11 @@ status = "okay"; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "adv7181"; + rockchip,camera-module-lens-name = "adv7181"; + port { adv7181_out: endpoint { remote-endpoint = <&cif_in>; diff --git a/arch/arm/boot/dts/rk3126-bnd-d708.dtsi b/arch/arm/boot/dts/rk3126-bnd-d708.dtsi index fd21470f0ed6..23eebcb3cac6 100644 --- a/arch/arm/boot/dts/rk3126-bnd-d708.dtsi +++ b/arch/arm/boot/dts/rk3126-bnd-d708.dtsi @@ -279,6 +279,11 @@ pwdn-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CameraKing"; + rockchip,camera-module-lens-name = "Largan"; + port { gc0329_out: endpoint { remote-endpoint = <&cif_in_fcam>; @@ -301,6 +306,11 @@ pwdn-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CameraKing"; + rockchip,camera-module-lens-name = "Largan"; + port { gc2145_out: endpoint { remote-endpoint = <&cif_in_bcam>; diff --git a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts index 2c3099f4c66a..135355a71b0c 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts @@ -504,6 +504,10 @@ reset-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { cam_out: endpoint { diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts b/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts index 3cefff74d004..5a2b61268f88 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts @@ -298,7 +298,7 @@ status = "okay"; clock-frequency = <400000>; - camera: tc358749@0f { + tc358749: tc358749@0f { compatible = "toshiba,tc358749"; reg = <0x0f>; clocks = <&ext_cam_clk>; @@ -311,6 +311,10 @@ interrupt-parent = <&gpio8>; interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "tc358749"; + rockchip,camera-module-lens-name = "tc358749"; port { camera_out: endpoint { diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 2508eb6c1766..ac9fb53b1f53 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -447,12 +447,17 @@ status = "okay"; }; - camera1: imx219@10 { + imx219: imx219@10 { compatible = "sony,imx219"; reg = <0x10>; clocks = <&ext_cam_clk>; status = "okay"; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "LA6110PA"; + rockchip,camera-module-lens-name = "YM6011P"; + port { imx219_out: endpoint { remote-endpoint = <&imx219_in>; diff --git a/arch/arm/boot/dts/rk3288-th804-avb.dts b/arch/arm/boot/dts/rk3288-th804-avb.dts index b33e8f92f530..d539b5e46a51 100644 --- a/arch/arm/boot/dts/rk3288-th804-avb.dts +++ b/arch/arm/boot/dts/rk3288-th804-avb.dts @@ -49,7 +49,7 @@ &i2c3 { status = "okay"; - gc2145@3c { + gc2145: gc2145@3c { compatible = "galaxycore,gc2145"; reg = <0x3c>; clocks = <&cru SCLK_VIP_OUT>; @@ -59,6 +59,11 @@ pinctrl-0 = <&isp_dvp_d2d9 &isp_dvp_d0d1 &isp_mipi>; power-gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CameraKing"; + rockchip,camera-module-lens-name = "Largan"; port { gc2145_out: endpoint { remote-endpoint = <&isp_dvp_in>; @@ -66,7 +71,7 @@ }; }; - ov8858@36 { + ov8858: ov8858@36 { compatible = "ovti,ov8858"; reg = <0x36>; clocks = <&cru SCLK_VIP_OUT>; @@ -75,8 +80,10 @@ pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&isp_mipi>; - rockchip,camera-module-name = "NC"; - rockchip,camera-module-lens-name = "LG-9569A2"; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CameraKing"; + rockchip,camera-module-lens-name = "Largan-9569A2"; power-gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; port {