From: Rob Herring <robh+dt@kernel.org>
To: Helen Koike <helen.koike@collabora.com>
Cc: devicetree@vger.kernel.org,
Linux Media Mailing List <linux-media@vger.kernel.org>,
"open list:ARM/Rockchip SoC..."
<linux-rockchip@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"open list:STAGING SUBSYSTEM" <devel@driverdev.osuosl.org>,
"heiko@sntech.de" <heiko@sntech.de>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Collabora Kernel ML <kernel@collabora.com>,
Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Ezequiel Garcia <ezequiel@collabora.com>,
Mark Rutland <mark.rutland@arm.com>,
karthik.poduval@gmail.com, Johan Jonker <jbx6244@gmail.com>,
Tomasz Figa <tfiga@chromium.org>,
Eddie Cai <eddie.cai.linux@gmail.com>,
Shunqian Zheng <zhengsq@rock-chips.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v4 5/9] media: staging: rkisp1: remove unecessary clocks
Date: Fri, 17 Jul 2020 11:49:05 -0600 [thread overview]
Message-ID: <CAL_JsqKHG4HgcpWvh_qnHPAkaGCd7Q8APk2ai_QxjUQhvd5APg@mail.gmail.com> (raw)
In-Reply-To: <20200702191322.2639681-6-helen.koike@collabora.com>
On Thu, Jul 2, 2020 at 1:13 PM Helen Koike <helen.koike@collabora.com> 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 <helen.koike@collabora.com>
>
> ---
>
> 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 = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
> 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
>
next prev parent reply other threads:[~2020-07-17 17:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 19:13 [PATCH v4 0/9] move Rockchip ISP bindings out of staging / add ISP DT nodes for RK3399 Helen Koike
2020-07-02 19:13 ` [PATCH v4 1/9] media: staging: dt-bindings: rkisp1: add missing required nodes Helen Koike
2020-07-17 17:42 ` Rob Herring
2020-07-02 19:13 ` [PATCH v4 2/9] media: staging: dt-bindings: rkisp1: add required items in i2c example Helen Koike
2020-07-17 17:41 ` Rob Herring
2020-07-02 19:13 ` [PATCH v4 3/9] media: staging: dt-bindings: rkisp1: re-order properties Helen Koike
2020-07-17 17:43 ` Rob Herring
2020-07-02 19:13 ` [PATCH v4 4/9] media: staging: dt-bindings: rkisp1: fix "no reg" error in parent node Helen Koike
2020-07-17 17:44 ` Rob Herring
2020-07-02 19:13 ` [PATCH v4 5/9] media: staging: rkisp1: remove unecessary clocks Helen Koike
2020-07-17 17:49 ` Rob Herring [this message]
2020-07-17 18:14 ` Helen Koike
2020-07-17 18:44 ` Rob Herring
2020-07-02 19:13 ` [PATCH v4 6/9] dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging Helen Koike
2020-07-02 19:13 ` [PATCH v4 7/9] media: MAINTAINERS: rkisp1: add path to dt-bindings Helen Koike
2020-07-02 19:13 ` [PATCH v4 8/9] arm64: dts: rockchip: add isp0 node for rk3399 Helen Koike
2020-07-02 19:13 ` [PATCH v4 9/9] arm64: dts: rockchip: add isp and sensors for Scarlet Helen Koike
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL_JsqKHG4HgcpWvh_qnHPAkaGCd7Q8APk2ai_QxjUQhvd5APg@mail.gmail.com \
--to=robh+dt@kernel.org \
--cc=dafna.hirschfeld@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=eddie.cai.linux@gmail.com \
--cc=ezequiel@collabora.com \
--cc=heiko@sntech.de \
--cc=helen.koike@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jbx6244@gmail.com \
--cc=karthik.poduval@gmail.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=robin.murphy@arm.com \
--cc=tfiga@chromium.org \
--cc=zhengsq@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).