diff options
17 files changed, 105 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts index 14a5e7859a1e..2d35d6c60b7a 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -656,6 +656,10 @@ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts index ae4d4b27a5d4..c047b7ffabef 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -385,6 +385,10 @@ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts index 2e3819e2ae87..c4f26fa2d031 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -385,6 +385,10 @@ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi index f018ce464390..329783a72074 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -655,6 +655,10 @@ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts index d96d169e011f..61b9f4b53442 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -716,6 +716,10 @@ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts index 8784ffc5dcb5..0a41884c8e17 100644 --- a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -152,6 +152,10 @@ pwdn-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cif_clkout_m0>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts index 174d05e37ccb..0566865e232a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -33,7 +33,7 @@ &i2c2 { status = "okay"; - gc0312@21 { + gc0312: gc0312@21 { status = "okay"; compatible = "galaxycore,gc0312"; reg = <0x21>; @@ -48,6 +48,10 @@ dvdd-supply = <&vcc1v8_dvp>; pwdn-gpios = <&gpio2 14 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 { gc0312_out: endpoint { @@ -56,7 +60,7 @@ }; }; - gc2145@3c { + gc2145: gc2145@3c { status = "okay"; compatible = "galaxycore,gc2145"; reg = <0x3c>; @@ -71,6 +75,10 @@ dvdd-supply = <&vcc1v8_dvp>; pwdn-gpios = <&gpio2 13 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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts index 80a1982c675c..7944ad3fbfd7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -713,6 +713,10 @@ /* hw changed the pwdn to gpio2_b5 */ pwdn-gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CMK-CW2392"; + rockchip,camera-module-lens-name = "CMK-CW2392"; port { gc2155_out: endpoint { @@ -735,6 +739,11 @@ /*reset-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>;*/ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; + port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts index 9a8de7bf01c0..bfde40959439 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -439,6 +439,11 @@ /* hw changed the pwdn to gpio2_b5 */ pwdn-gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CMK-CW2392"; + rockchip,camera-module-lens-name = "CMK-CW2392"; + port { gc2155_out: endpoint { remote-endpoint = <&cif_in>; @@ -460,6 +465,11 @@ /*reset-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>;*/ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; + port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts index 3fd222649be0..a98c639aae02 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -434,6 +434,11 @@ /* hw changed the pwdn to gpio2_b5 */ pwdn-gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CMK-CW2392"; + rockchip,camera-module-lens-name = "CMK-CW2392"; + port { gc2155_out: endpoint { remote-endpoint = <&cif_in>; @@ -455,6 +460,11 @@ /*reset-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>;*/ pwdn-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "TongJu"; + rockchip,camera-module-lens-name = "CHT842-MD"; + port { ucam_out: endpoint { remote-endpoint = <&mipi_in_ucam>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts index 3bb82294c46b..c113bdacb79a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -41,7 +41,7 @@ &i2c3 { status = "okay"; - gc2145@3c { + gc2145: gc2145@3c { compatible = "galaxycore,gc2145"; reg = <0x3c>; clocks = <&cru SCLK_VIP_OUT>; @@ -51,6 +51,10 @@ pinctrl-0 = <&isp_dvp_d2d9 &isp_dvp_d10d11 &cif_clkout>; power-gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio1 RK_PB4 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>; @@ -58,7 +62,7 @@ }; }; - ov8858@36 { + ov8858: ov8858@36 { compatible = "ovti,ov8858"; reg = <0x36>; clocks = <&cru SCLK_VIP_OUT>; @@ -67,8 +71,10 @@ pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; - 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_PD4 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; port { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi index 9a68b0cad631..1450c0492615 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -205,6 +205,10 @@ pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { remote-endpoint = <&mipi_in_ucam0>; @@ -227,6 +231,10 @@ pwdn-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; // conflict with backlight pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "JSD3425-C1"; + rockchip,camera-module-lens-name = "JSD3425-C1"; port { ucam_out1: endpoint { //remote-endpoint = <&mipi_in_ucam0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts index 7508ba001227..607b9ae8d4cf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -400,6 +400,10 @@ pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts index 895ed9888462..f79ea60a8c47 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -384,6 +384,10 @@ pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts index 6fd008542ba4..160eabe5be58 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -50,6 +50,10 @@ pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { remote-endpoint = <&mipi_in_ucam0>; @@ -72,6 +76,10 @@ pwdn-gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CMK-CW2392"; + rockchip,camera-module-lens-name = "M206A-201"; port { ucam_out1: endpoint { //remote-endpoint = <&mipi_in_ucam0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts index 3f4fefe2cfdb..8d9c5897335a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -714,6 +714,10 @@ pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts index 4393b5561705..7c996816339c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -719,6 +719,10 @@ pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; port { ucam_out0: endpoint { |