From patchwork Tue Oct 20 19:38:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 286145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4249FC388F7 for ; Tue, 20 Oct 2020 19:39:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA34D2225F for ; Tue, 20 Oct 2020 19:39:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409039AbgJTTjS (ORCPT ); Tue, 20 Oct 2020 15:39:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409034AbgJTTjR (ORCPT ); Tue, 20 Oct 2020 15:39:17 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09D19C0613CE; Tue, 20 Oct 2020 12:39:17 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id EDA591F44D9D From: Helen Koike To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, robh+dt@kernel.org, heiko@sntech.de, kernel@collabora.com, hverkuil-cisco@xs4all.nl, dafna.hirschfeld@collabora.com, mark.rutland@arm.com, karthik.poduval@gmail.com, eddie.cai.linux@gmail.com, jbx6244@gmail.com, zhengsq@rock-chips.com, robin.murphy@arm.com Subject: [PATCH v6 3/9] media: staging: dt-bindings: rkisp1: re-order properties Date: Tue, 20 Oct 2020 16:38:44 -0300 Message-Id: <20201020193850.1460644-4-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Organize properties order in dt-bindings to move it out of staging. On top: compatible, reg and interrupts. Then alphabetical order, then properties starting with '#'. Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../bindings/media/rockchip-isp1.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index 4c31cfaee2709..79ebacab83cf3 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -23,19 +23,6 @@ properties: interrupts: maxItems: 1 - iommus: - maxItems: 1 - - power-domains: - maxItems: 1 - - phys: - maxItems: 1 - description: phandle for the PHY port - - phy-names: - const: dphy - clocks: items: - description: ISP clock @@ -52,6 +39,19 @@ properties: - const: hclk_isp - const: hclk_isp_wrap + iommus: + maxItems: 1 + + phys: + maxItems: 1 + description: phandle for the PHY port + + phy-names: + const: dphy + + power-domains: + maxItems: 1 + # See ./video-interfaces.txt for details ports: type: object @@ -110,10 +110,10 @@ required: - interrupts - clocks - clock-names - - power-domains - iommus - phys - phy-names + - power-domains - ports additionalProperties: false @@ -139,19 +139,19 @@ examples: clock-names = "clk_isp", "aclk_isp", "aclk_isp_wrap", "hclk_isp", "hclk_isp_wrap"; - power-domains = <&power RK3399_PD_ISP0>; iommus = <&isp0_mmu>; phys = <&dphy>; phy-names = "dphy"; + power-domains = <&power RK3399_PD_ISP0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; - reg = <0>; mipi_in_wcam: endpoint@0 { reg = <0>; From patchwork Tue Oct 20 19:38:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 286143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06904C388F2 for ; Tue, 20 Oct 2020 19:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A9687222C8 for ; Tue, 20 Oct 2020 19:39:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438173AbgJTTj1 (ORCPT ); Tue, 20 Oct 2020 15:39:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438114AbgJTTj0 (ORCPT ); Tue, 20 Oct 2020 15:39:26 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0999DC0613D1; Tue, 20 Oct 2020 12:39:26 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id E77F81F44D9D From: Helen Koike To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, robh+dt@kernel.org, heiko@sntech.de, kernel@collabora.com, hverkuil-cisco@xs4all.nl, dafna.hirschfeld@collabora.com, mark.rutland@arm.com, karthik.poduval@gmail.com, eddie.cai.linux@gmail.com, jbx6244@gmail.com, zhengsq@rock-chips.com, robin.murphy@arm.com Subject: [PATCH v6 5/9] media: staging: rkisp1: remove unecessary clocks Date: Tue, 20 Oct 2020 16:38:46 -0300 Message-Id: <20201020193850.1460644-6-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org aclk_isp_wrap is a child of aclk_isp, and hclk_isp_wrap is a child of hclk_isp, thus we can remove parents from the list. Also, for the isp0, we only need the ISP clock, ACLK and HCLK. In the future we'll need a pixel clock for RK3288 and RK3399, and a JPEG clock for RK3288. So with the goal to cleanup the dt-bindings and remove it from staging, simplify clock names to isp, aclk and hclk. Assigned clocks are meant to refer to the full path in the clock tree, i.e. the leaf in the tree. For instance, in RK3399, the clock responsible for ACLK (ISP AXI CLOCK) is aclk_isp0_wrapper. For reference, this is the isp clock topology on RK3399: xin24m pll_npll npll clk_isp1 clk_isp0 pll_cpll cpll aclk_isp1 aclk_isp1_noc hclk_isp1 aclk_isp1_wrapper hclk_isp1_noc aclk_isp0 hclk_isp1_wrapper aclk_isp0_wrapper aclk_isp0_noc hclk_isp0 hclk_isp0_wrapper hclk_isp0_noc pclkin_isp1_wrapper Signed-off-by: Helen Koike Reviewed-by: Tomasz Figa --- Changes in V6: - 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 --- .../bindings/media/rockchip-isp1.yaml | 44 +++++++++++++------ drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++-- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index 62a6b9c959498..2004c054ed1a0 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -24,20 +24,24 @@ properties: maxItems: 1 clocks: + minItems: 3 items: + # isp0 and isp1 - description: ISP clock - - description: ISP AXI clock clock - - description: ISP AXI clock wrapper clock - - description: ISP AHB clock clock - - description: ISP AHB wrapper clock + - description: ISP AXI clock + - description: ISP AHB clock + # only for isp1 + - description: ISP Pixel clock clock-names: + minItems: 3 items: - - const: clk_isp - - const: aclk_isp - - const: aclk_isp_wrap - - const: hclk_isp - - const: hclk_isp_wrap + # isp0 and isp1 + - const: isp + - const: aclk + - const: hclk + # only for isp1 + - const: pclk_isp iommus: maxItems: 1 @@ -116,6 +120,20 @@ required: - power-domains - ports +if: + properties: + compatible: + contains: + const: rockchip,rk3399-cif-isp +then: + properties: + clocks: + minItems: 3 + maxItems: 4 + clock-names: + minItems: 3 + maxItems: 4 + additionalProperties: false examples: @@ -134,11 +152,9 @@ examples: reg = <0x0 0xff910000 0x0 0x4000>; interrupts = ; clocks = <&cru SCLK_ISP0>, - <&cru ACLK_ISP0>, <&cru ACLK_ISP0_WRAPPER>, - <&cru HCLK_ISP0>, <&cru HCLK_ISP0_WRAPPER>; - clock-names = "clk_isp", - "aclk_isp", "aclk_isp_wrap", - "hclk_isp", "hclk_isp_wrap"; + <&cru ACLK_ISP0_WRAPPER>, + <&cru HCLK_ISP0_WRAPPER>; + clock-names = "isp", "aclk", "hclk"; iommus = <&isp0_mmu>; phys = <&dphy>; phy-names = "dphy"; diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index 91584695804bb..90d6543465562 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -405,11 +405,9 @@ static irqreturn_t rkisp1_isr(int irq, void *ctx) } static const char * const rk3399_isp_clks[] = { - "clk_isp", - "aclk_isp", - "hclk_isp", - "aclk_isp_wrap", - "hclk_isp_wrap", + "isp", + "aclk", + "hclk", }; static const struct rkisp1_match_data rk3399_isp_clk_data = { From patchwork Tue Oct 20 19:38:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 286142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CE8FC54FB2 for ; Tue, 20 Oct 2020 19:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D60AC2225D for ; Tue, 20 Oct 2020 19:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438273AbgJTTjb (ORCPT ); Tue, 20 Oct 2020 15:39:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438225AbgJTTja (ORCPT ); Tue, 20 Oct 2020 15:39:30 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 818B8C0613CE; Tue, 20 Oct 2020 12:39:30 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 6F4E11F44DB5 From: Helen Koike To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, robh+dt@kernel.org, heiko@sntech.de, kernel@collabora.com, hverkuil-cisco@xs4all.nl, dafna.hirschfeld@collabora.com, mark.rutland@arm.com, karthik.poduval@gmail.com, eddie.cai.linux@gmail.com, jbx6244@gmail.com, zhengsq@rock-chips.com, robin.murphy@arm.com Subject: [PATCH v6 6/9] dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging Date: Tue, 20 Oct 2020 16:38:47 -0300 Message-Id: <20201020193850.1460644-7-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Move rkisp1 bindings to Documentation/devicetree/bindings/media Verified with: make ARCH=arm64 dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-isp1.yaml Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../devicetree/bindings/media/rockchip-isp1.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/Documentation/devicetree/bindings/media/rockchip-isp1.yaml similarity index 100% rename from drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml rename to Documentation/devicetree/bindings/media/rockchip-isp1.yaml From patchwork Tue Oct 20 19:38:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 286144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67267C41604 for ; Tue, 20 Oct 2020 19:39:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DEA72237B for ; Tue, 20 Oct 2020 19:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409076AbgJTTjg (ORCPT ); Tue, 20 Oct 2020 15:39:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409022AbgJTTjf (ORCPT ); Tue, 20 Oct 2020 15:39:35 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0BDAC0613CE; Tue, 20 Oct 2020 12:39:34 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id E230A1F44DC3 From: Helen Koike To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, robh+dt@kernel.org, heiko@sntech.de, kernel@collabora.com, hverkuil-cisco@xs4all.nl, dafna.hirschfeld@collabora.com, mark.rutland@arm.com, karthik.poduval@gmail.com, eddie.cai.linux@gmail.com, jbx6244@gmail.com, zhengsq@rock-chips.com, robin.murphy@arm.com Subject: [PATCH v6 7/9] media: MAINTAINERS: rkisp1: add path to dt-bindings Date: Tue, 20 Oct 2020 16:38:48 -0300 Message-Id: <20201020193850.1460644-8-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The Rockchip ISP bindings was moved out of staging. Update MAINTAINERS file with the new path. Fields sorted according to output of ./scripts/parse-maintainers.pl --input=MAINTAINERS --output=MAINTAINERS --order Signed-off-by: Helen Koike Reviewed-by: Tomasz Figa --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7a12633747c80..df679b3626b9a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14889,8 +14889,10 @@ ROCKCHIP ISP V1 DRIVER M: Helen Koike M: Dafna Hirschfeld L: linux-media@vger.kernel.org +L: linux-rockchip@lists.infradead.org S: Maintained F: Documentation/admin-guide/media/rkisp1.rst +F: Documentation/devicetree/bindings/media/rockchip-isp1.yaml F: Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst F: drivers/staging/media/rkisp1/