From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 776A0C433E2 for ; Fri, 17 Jul 2020 17:49:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 568AA20717 for ; Fri, 17 Jul 2020 17:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595008165; bh=6czVMdZhaHo+tKToD45mSau37/5Ee2rAARvEgfpux50=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=QujXf8fdFgc53PQKVeuvG5tN4nWkThp8flX2HrnkHLrlYcZrkEuayXEth5JFAVhNm u048bDQrzw5hO6ABo/sFXzKwmLfEDfkmaEHq7woS6r9dayhcuc97XZLtDTH1wRZLJw sBfLfV7+/UYDvavLRDAshVTwvxehKA8jv6cXf5vg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728047AbgGQRtX (ORCPT ); Fri, 17 Jul 2020 13:49:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:60952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726463AbgGQRtW (ORCPT ); Fri, 17 Jul 2020 13:49:22 -0400 Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 77EAA2173E; Fri, 17 Jul 2020 17:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595008161; bh=6czVMdZhaHo+tKToD45mSau37/5Ee2rAARvEgfpux50=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=yhxZkgPa/TfqOP6176TD0H4j5knKc+Ru46LYNv7AfRnabvyYjEz++pYZlTh8evncI HWfQ7eXaGWOKv+9zVEA7vb31QRcs8qj/DMd4cxooUAV0kdus5Ax7PbV1+S78TKK2Go 5eqtwQidvEKHV0cjK2vJ/UhPeIXURf04myyR04Do= Received: by mail-oi1-f181.google.com with SMTP id 12so8679783oir.4; Fri, 17 Jul 2020 10:49:21 -0700 (PDT) X-Gm-Message-State: AOAM531EuWIWz+R9zRujiNd4fTMRg2sDpPlM2E4nfxzMlf+HUrdl8nnj roIVDczu89ufGzz7IDO6BlCMr1xRWUEJZNqvTA== X-Google-Smtp-Source: ABdhPJwNhRmnLbtxUv/aDJg/oVt29At2larGRwaEpFyhGA+N34UOSp3eR1o00QSQMJ1CApxxPymPcPTPy2uXJpX31Y0= X-Received: by 2002:aca:30d2:: with SMTP id w201mr8720870oiw.147.1595008160791; Fri, 17 Jul 2020 10:49:20 -0700 (PDT) MIME-Version: 1.0 References: <20200702191322.2639681-1-helen.koike@collabora.com> <20200702191322.2639681-6-helen.koike@collabora.com> In-Reply-To: <20200702191322.2639681-6-helen.koike@collabora.com> From: Rob Herring Date: Fri, 17 Jul 2020 11:49:05 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v4 5/9] media: staging: rkisp1: remove unecessary clocks To: Helen Koike Cc: devicetree@vger.kernel.org, Linux Media Mailing List , "open list:ARM/Rockchip SoC..." , "linux-kernel@vger.kernel.org" , "open list:STAGING SUBSYSTEM" , "heiko@sntech.de" , Hans Verkuil , Collabora Kernel ML , Dafna Hirschfeld , Ezequiel Garcia , Mark Rutland , karthik.poduval@gmail.com, Johan Jonker , Tomasz Figa , Eddie Cai , Shunqian Zheng , Robin Murphy Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 2, 2020 at 1:13 PM Helen Koike wrote: > > 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. But it looks like it is the wrap clocks you are removing. > > 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. > > 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 > > --- > > Changes in V4: > - update binding according to suggestion by Robin Murphy > on https://patchwork.kernel.org/patch/11475007/ > > Changes in V3: > - this is a new patch in the series > --- > .../bindings/media/rockchip-isp1.yaml | 30 +++++++++---------- > drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++--- > 2 files changed, 17 insertions(+), 21 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 4d111ef2e89c7..f10c53d008748 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,20 @@ properties: > maxItems: 1 > > clocks: > - items: > - - description: ISP clock > - - description: ISP AXI clock clock > - - description: ISP AXI clock wrapper clock > - - description: ISP AHB clock clock > - - description: ISP AHB wrapper clock This is the correct way to describe multiple clocks. > + maxItems: 5 Now the 4th and 5th clock are undefined. > + minItems: 3 > + description: > + ISP clock > + ISP AXI clock > + ISP AHB clock > > clock-names: > + maxItems: 5 This should not be more than the number of entries in 'items'. > + minItems: 3 > items: > - - const: clk_isp > - - const: aclk_isp > - - const: aclk_isp_wrap > - - const: hclk_isp > - - const: hclk_isp_wrap > + - const: isp > + - const: aclk > + - const: hclk > > iommus: > maxItems: 1 > @@ -135,11 +135,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 f38801fea10d9..175ac25fe99fa 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-dev.c > +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c > @@ -406,11 +406,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 = { > -- > 2.26.0 >