github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: rockchip: add vm149c for ov13850

Browse Source 
Conflicts:
	arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
	arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
	arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts

remove the old camera module information.

Change-Id: Ida81f26ebc718840d750919a6e591da6d5865765
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
This commit is contained in:
Hu Kejun 2019-02-21 08:41:30 +08:00 committed by Tao Huang
parent ee6254d280
commit 9bfa6a3d05
5 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
View File

@ -245,6 +245,14 @@ gc2145_out: endpoint {
};
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "okay";
@ -259,12 +267,14 @@ ov13850: ov13850@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";
lens-focus = <&vm149c>;
flash-leds = <&sgm3784_led0 &sgm3784_led1>;
port {
ucam_out0: endpoint {
remote-endpoint = <&mipi_in_ucam0>;

9
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
View File

@ -400,6 +400,14 @@ hdmiin_out0: endpoint {
};
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "okay";
@ -412,6 +420,7 @@ ov13850: ov13850@10 {
pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
lens-focus = <&vm149c>;
port {
ucam_out0: endpoint {

10
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
View File

@ -360,6 +360,14 @@ hdmiin_out0: endpoint {
};
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "okay";
@ -373,6 +381,8 @@ ov13850: ov13850@10 {
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
lens-focus = <&vm149c>;
port {
ucam_out0: endpoint {
remote-endpoint = <&mipi_in_ucam0>;

9
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
View File

@ -706,6 +706,14 @@ sensor@d {
layout = <3>;
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "disabled";
@ -718,6 +726,7 @@ ov13850: ov13850@10 {
pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
lens-focus = <&vm149c>;
port {
ucam_out0: endpoint {

10
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
View File

@ -716,6 +716,14 @@ sensor@d {
layout = <3>;
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "okay";
@ -729,6 +737,8 @@ ov13850: ov13850@10 {
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
lens-focus = <&vm149c>;
port {
ucam_out0: endpoint {
remote-endpoint = <&mipi_in_ucam0>;