| Message ID | 20201020193850.1460644-1-helen.koike@collabora.com |
|---|---|
| Headers | show |
| Series | move Rockchip ISP bindings out of staging / add ISP DT nodes for RK3399 | expand |
Am Dienstag, 20. Oktober 2020, 21:38:50 CET schrieb Helen Koike: > From: Eddie Cai <eddie.cai.linux@gmail.com> > > Enable ISP and camera sensor ov2685 and ov5695 for Scarlet Chromebook > > Verified with: > make ARCH=arm64 dtbs_check > > Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com> > Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com> > Signed-off-by: Tomasz Figa <tfiga@chromium.org> > Signed-off-by: Helen Koike <helen.koike@collabora.com> > Reviewed-by: Tomasz Figa <tfiga@chromium.org> looks good, and I'd like to apply this one after the drivers/media-patches of this series got applied. Thanks Heiko > --- > .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 74 +++++++++++++++++++ > 1 file changed, 74 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi > index 60cd1c18cd4e0..beee5fbb34437 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi > @@ -296,6 +296,52 @@ camera: &i2c7 { > > /* 24M mclk is shared between world and user cameras */ > pinctrl-0 = <&i2c7_xfer &test_clkout1>; > + > + /* Rear-facing camera */ > + wcam: camera@36 { > + compatible = "ovti,ov5695"; > + reg = <0x36>; > + pinctrl-names = "default"; > + pinctrl-0 = <&wcam_rst>; > + > + clocks = <&cru SCLK_TESTCLKOUT1>; > + clock-names = "xvclk"; > + > + avdd-supply = <&pp2800_cam>; > + dvdd-supply = <&pp1250_cam>; > + dovdd-supply = <&pp1800_s0>; > + reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; > + > + port { > + wcam_out: endpoint { > + remote-endpoint = <&mipi_in_wcam>; > + data-lanes = <1 2>; > + }; > + }; > + }; > + > + /* Front-facing camera */ > + ucam: camera@3c { > + compatible = "ovti,ov2685"; > + reg = <0x3c>; > + pinctrl-names = "default"; > + pinctrl-0 = <&ucam_rst>; > + > + clocks = <&cru SCLK_TESTCLKOUT1>; > + clock-names = "xvclk"; > + > + avdd-supply = <&pp2800_cam>; > + dovdd-supply = <&pp1800_s0>; > + dvdd-supply = <&pp1800_s0>; > + reset-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; > + > + port { > + ucam_out: endpoint { > + remote-endpoint = <&mipi_in_ucam>; > + data-lanes = <1>; > + }; > + }; > + }; > }; > > &cdn_dp { > @@ -353,10 +399,38 @@ &io_domains { > gpio1830-supply = <&pp1800_s0>; /* APIO4_VDD; 4c 4d */ > }; > > +&isp0 { > + status = "okay"; > + > + ports { > + port@0 { > + mipi_in_wcam: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&wcam_out>; > + data-lanes = <1 2>; > + }; > + > + mipi_in_ucam: endpoint@1 { > + reg = <1>; > + remote-endpoint = <&ucam_out>; > + data-lanes = <1>; > + }; > + }; > + }; > +}; > + > +&isp0_mmu { > + status = "okay"; > +}; > + > &max98357a { > sdmode-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; > }; > > +&mipi_dphy_rx0 { > + status = "okay"; > +}; > + > &mipi_dsi { > status = "okay"; > clock-master; >
On Tue, 20 Oct 2020 16:38:41 -0300, Helen Koike wrote: > Move the bindings out of drivers/staging and place them in > Documentation/devicetree/bindings instead. > > Also, add DT nodes for RK3399 and verify with make ARCH=arm64 dtbs_check > and make ARCH=arm64 dt_binding_check. > > Tested by verifying images streamed from Scarlet Chromebook > > [...] Applied, thanks! [8/9] arm64: dts: rockchip: add isp0 node for rk3399 commit: 97a0115cd96a173369ef30eee2290184921b3f24 [9/9] arm64: dts: rockchip: add isp and sensors for Scarlet commit: ef098edc9c245dd1c150001e22c78e6a3ffd7ff8 Best regards, -- Heiko Stuebner <heiko@sntech.de>
Move the bindings out of drivers/staging and place them in Documentation/devicetree/bindings instead. Also, add DT nodes for RK3399 and verify with make ARCH=arm64 dtbs_check and make ARCH=arm64 dt_binding_check. Tested by verifying images streamed from Scarlet Chromebook Changes in v6: - [PATCH v6 5/9] media: staging: rkisp1: remove unecessary clocks Define clocks in the top level, and use if/else schema to define how many for each compatible as sugested by Rob Herring on https://patchwork.linuxtv.org/project/linux-media/patch/20200722155533.252844-6-helen.koike@collabora.com/#122626 - [PATCH v6 8/9] arm64: dts: rockchip: add isp0 node for rk3399 Add status = "disabled" in the isp0 node - Added Reviewed-by tags from Tomasz Figa - Added Acked-by tags from Rog Herring - No changes for other patches in the serie. Changes in v5: - Drop unit addresses in dt-bindings example for simplification and fix errors as suggested by Rob Herring in previous version - Fix typos - Re-write clock organization with if/then schema Changes in v4: - simplify clocks with "isp", "aclk" and "hclk" as suggested by Robin Murphy on https://patchwork.kernel.org/patch/11475007/ Changes in v3: - dropped accepted patches - cleanup clocks - fix "no reg" error in dt-bindings parent@0 example - add linux-rockchip list in MAINTAINERS and reorder items - add Scarlet sensors dt nodes to the series Changes in v2: Add patches modifying bindings, as sugested by Johan Jonker in v1, before moving them out of staging. Eddie Cai (1): arm64: dts: rockchip: add isp and sensors for Scarlet Helen Koike (7): media: staging: dt-bindings: rkisp1: add missing required nodes media: staging: dt-bindings: rkisp1: drop i2c unit address media: staging: dt-bindings: rkisp1: re-order properties media: staging: dt-bindings: rkisp1: drop parent unit address media: staging: rkisp1: remove unecessary clocks dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging media: MAINTAINERS: rkisp1: add path to dt-bindings Shunqian Zheng (1): arm64: dts: rockchip: add isp0 node for rk3399 .../bindings/media/rockchip-isp1.yaml | 81 ++++++++++++------- MAINTAINERS | 2 + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 74 +++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 26 ++++++ drivers/staging/media/rkisp1/rkisp1-dev.c | 8 +- 5 files changed, 157 insertions(+), 34 deletions(-) rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (81%)