From 982b78438c4d93434a5845e2f60fed1de8c1c74c Mon Sep 17 00:00:00 2001 From: leeboby Date: Tue, 23 Jul 2024 09:09:26 +0800 Subject: [PATCH] arch: arm64: dts: Update for opicm5-tablet v1.1 --- .../overlay/rk3588-opicm5-tablet-cam2.dts | 6 ++- .../overlay/rk3588-opicm5-tablet-cam3.dts | 6 ++- .../rk3588s-orangepi-cm5-tablet-camera2.dtsi | 39 +++++++++++++++---- .../rk3588s-orangepi-cm5-tablet-camera3.dtsi | 39 +++++++++++++++---- .../rockchip/rk3588s-orangepi-cm5-tablet.dts | 39 ++++++++++++++++++- 5 files changed, 111 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam2.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam2.dts index d50375cbaf3f..34bd3deac9e2 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam2.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam2.dts @@ -48,7 +48,11 @@ __overlay__ { status = "okay"; - ov5647@36 { + ov5647-cam2@36 { + status = "okay"; + }; + + imx219-cam2@10 { status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam3.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam3.dts index ab72570758d5..025c5972dd45 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam3.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-cam3.dts @@ -48,7 +48,11 @@ __overlay__ { status = "okay"; - ov5647-1@36 { + ov5647-cam3@36 { + status = "okay"; + }; + + imx219-cam3@10 { status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera2.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera2.dtsi index 8129ce74d342..772a58ccddee 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera2.dtsi @@ -15,9 +15,15 @@ #address-cells = <1>; #size-cells = <0>; - mipi_in_dcphy0: endpoint@0 { + mipi_in_dcphy_0: endpoint@0 { reg = <0>; - remote-endpoint = <&ov5647_out>; + remote-endpoint = <&ov5647_out_1>; + data-lanes = <1 2>; + }; + + mipi_in_dcphy_1: endpoint@1 { + reg = <0>; + remote-endpoint = <&imx219_out_1>; data-lanes = <1 2>; }; }; @@ -38,7 +44,7 @@ &i2c6 { status = "okay"; - ov5647: ov5647@36 { + ov5647_cam2: ov5647-cam2@36 { status = "disabled"; compatible = "ovti,ov5647"; reg = <0x36>; @@ -47,15 +53,34 @@ pwdn-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; rockchip,camera-module-index = <1>; rockchip,camera-module-facing = "front"; - rockchip,camera-module-name = "LMM248"; - rockchip,camera-module-lens-name = "YXC-M804A2"; + rockchip,camera-module-name = "rpi-camera-v1"; + rockchip,camera-module-lens-name = "default"; port { - ov5647_out: endpoint { - remote-endpoint = <&mipi_in_dcphy0>; + ov5647_out_1: endpoint { + remote-endpoint = <&mipi_in_dcphy_0>; data-lanes = <1 2>; }; }; }; + + imx219_cam2: imx219-cam2@10 { + status = "disabled"; + compatible = "sony,imx219"; + reg = <0x10>; + clocks = <&ext_cam_ov5647_clk>; + clock-names = "ext_cam_ov5647_clk"; + pwdn-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + port { + imx219_out_1: endpoint { + remote-endpoint = <&mipi_in_dcphy_1>; + data-lanes = <1 2>; + }; + }; + }; }; &mipi0_csi2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera3.dtsi index 52db5e1d92b4..cd641e9b62f5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet-camera3.dtsi @@ -16,9 +16,15 @@ #address-cells = <1>; #size-cells = <0>; - mipi_in_dcphy1: endpoint@0 { + mipi_in_dcphy0_cam3: endpoint@0 { reg = <0>; - remote-endpoint = <&ov5647_out1>; + remote-endpoint = <&ov5647_out_cam3>; + data-lanes = <1 2>; + }; + + mipi_in_dcphy1_cam3: endpoint@1 { + reg = <0>; + remote-endpoint = <&imx219_out_cam3>; data-lanes = <1 2>; }; }; @@ -39,7 +45,7 @@ &i2c7 { status = "okay"; - ov5647_1: ov5647-1@36 { + ov5647_cam3: ov5647-cam3@36 { status = "disabled"; compatible = "ovti,ov5647"; reg = <0x36>; @@ -48,15 +54,34 @@ pwdn-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; rockchip,camera-module-index = <2>; rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "LMM248"; - rockchip,camera-module-lens-name = "YXC-M804A2"; + rockchip,camera-module-name = "rpi-camera-v1"; + rockchip,camera-module-lens-name = "default"; port { - ov5647_out1: endpoint { - remote-endpoint = <&mipi_in_dcphy1>; + ov5647_out_cam3: endpoint { + remote-endpoint = <&mipi_in_dcphy0_cam3>; data-lanes = <1 2>; }; }; }; + + imx219_cam3: imx219-cam3@10 { + status = "disabled"; + compatible = "sony,imx219"; + reg = <0x10>; + clocks = <&ext_cam_ov5647_clk>; + clock-names = "ext_cam_ov5647_clk"; + pwdn-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + port { + imx219_out_cam3: endpoint { + remote-endpoint = <&mipi_in_dcphy0_cam3>; + data-lanes = <1 2>; + }; + }; + }; }; &mipi1_csi2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet.dts index 0e9f8be7864b..11e7cfb5b2e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-tablet.dts @@ -274,7 +274,7 @@ status = "okay"; led@1 { - gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; label = "status_led"; linux,default-trigger = "heartbeat"; linux,default-trigger-delay-ms = <0>; @@ -664,6 +664,34 @@ pinctrl-names = "default"; pinctrl-0 = <&i2c6m3_xfer>; + sy6970: sy6970_charge@6a { + compatible = "ti,bq25895", "ti,bq25890"; + reg = <0x6a>; + pinctrl-names = "default"; + pinctrl-0 = <&charger_ok>; + interrupt-parent = <&gpio1>; + interrupts = ; + otg-mode-en-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + //ti,usb-charger-detection = <&usbc0>; + + ti,battery-regulation-voltage = <4400000>; /* 4.4V */ + ti,charge-current = <1600000>; /* 1.6A */ + ti,termination-current = <66000>; /* 66mA */ + ti,precharge-current = <130000>; /* 130mA */ + ti,minimum-sys-voltage = <3000000>; /* 3V */ + ti,boost-voltage = <5000000>; /* 5V */ + ti,boost-max-current = <1600000>; /* 1600mA */ + //regulators { + // vbus5v0_typec: vbus5v0-typec { + // regulator-compatible = "otg-vbus"; + // regulator-name = "vbus5v0_typec"; + // }; + //}; + + //status = "okay"; + status = "disabled"; + }; + usbc0: fusb302@22 { compatible = "fcs,fusb302"; reg = <0x22>; @@ -861,7 +889,7 @@ leds { led_gpio: led-gpio { - rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -870,6 +898,13 @@ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; }; }; + + charger { + charger_ok: charger_ok { + rockchip,pins = <1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up>, + <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; }; &u2phy0 {