From: Helen Koike <helen.koike@collabora.com>
To: devicetree@vger.kernel.org, linux-media@vger.kernel.org,
linux-rockchip@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
robh+dt@kernel.org, heiko@sntech.de, hverkuil-cisco@xs4all.nl,
kernel@collabora.com, dafna.hirschfeld@collabora.com,
ezequiel@collabora.com, mark.rutland@arm.com,
karthik.poduval@gmail.com, jbx6244@gmail.com, kishon@ti.com,
tfiga@chromium.org, eddie.cai.linux@gmail.com,
zhengsq@rock-chips.com
Subject: Re: [PATCH v3 5/9] media: staging: rkisp1: remove unecessary clocks
Date: Thu, 2 Jul 2020 14:01:50 -0300 [thread overview]
Message-ID: <c70b55a4-c33c-226b-2596-a7bbba199346@collabora.com> (raw)
In-Reply-To: <20200702165410.2583375-6-helen.koike@collabora.com>
On 7/2/20 1:54 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, with the goal to
> cleanup the dt-bindings and remove it from staging.
>
> For reference, this is the isp clock topology:
>
> 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 V3:
> - this is a new patch in the series
> ---
> .../bindings/media/rockchip-isp1.yaml | 33 ++++++++++---------
> drivers/staging/media/rkisp1/rkisp1-dev.c | 2 --
> 2 files changed, 17 insertions(+), 18 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..f806820eb8153 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,21 @@ 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
> + maxItems: 5
> + minItems: 3
Sorry, I forgot to mentioned that, as discussed previously on https://patchwork.kernel.org/patch/11475007/ ,
this is prepared to add rk3288 support, this is why maxItems is 5 (since rk3288 has 5 clocks).
> + description:
> + rk3399 isp0 clocks
> + ISP clock
> + ISP AXI wrapper clock
> + ISP AHB wrapper clock
>
> clock-names:
> - items:
> - - const: clk_isp
> - - const: aclk_isp
> - - const: aclk_isp_wrap
> - - const: hclk_isp
> - - const: hclk_isp_wrap
> + oneOf:
Same for this "oneOf", so we can add "rk3399 isp1 clocks" and "rk3288 clocks" later.
Regards,
Helen
> + # rk3399 isp0 clocks
> + - items:
> + - const: clk_isp
> + - const: aclk_isp_wrap
> + - const: hclk_isp_wrap
>
> iommus:
> maxItems: 1
> @@ -135,11 +136,11 @@ 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>;
> + <&cru ACLK_ISP0_WRAPPER>,
> + <&cru HCLK_ISP0_WRAPPER>;
> clock-names = "clk_isp",
> - "aclk_isp", "aclk_isp_wrap",
> - "hclk_isp", "hclk_isp_wrap";
> + "aclk_isp_wrap",
> + "hclk_isp_wrap";
> 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..36f5f3b97a9b9 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> @@ -407,8 +407,6 @@ 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",
> };
>
next prev parent reply other threads:[~2020-07-02 17:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 16:54 [PATCH v3 0/9] move Rockchip ISP bindings out of staging / add Helen Koike
2020-07-02 16:54 ` [PATCH v3 1/9] media: staging: dt-bindings: rkisp1: add missing required nodes Helen Koike
2020-07-02 16:54 ` [PATCH v3 2/9] media: staging: dt-bindings: rkisp1: add required items in i2c example Helen Koike
2020-07-02 16:54 ` [PATCH v3 3/9] media: staging: dt-bindings: rkisp1: re-order properties Helen Koike
2020-07-02 16:54 ` [PATCH v3 4/9] media: staging: dt-bindings: rkisp1: fix "no reg" error in parent node Helen Koike
2020-07-02 16:54 ` [PATCH v3 5/9] media: staging: rkisp1: remove unecessary clocks Helen Koike
2020-07-02 17:01 ` Helen Koike [this message]
2020-07-02 16:54 ` [PATCH v3 6/9] dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging Helen Koike
2020-07-02 16:54 ` [PATCH v3 7/9] media: MAINTAINERS: rkisp1: add path to dt-bindings Helen Koike
2020-07-02 16:54 ` [PATCH v3 8/9] arm64: dts: rockchip: add isp0 node for rk3399 Helen Koike
2020-07-02 16:54 ` [PATCH v3 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=c70b55a4-c33c-226b-2596-a7bbba199346@collabora.com \
--to=helen.koike@collabora.com \
--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=hverkuil-cisco@xs4all.nl \
--cc=jbx6244@gmail.com \
--cc=karthik.poduval@gmail.com \
--cc=kernel@collabora.com \
--cc=kishon@ti.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=robh+dt@kernel.org \
--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
all inboxes | Powered by JetHome®