| Message ID | 20200702165410.2583375-6-helen.koike@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | move Rockchip ISP bindings out of staging / add | expand |
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", > }; >
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 + 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: + # 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", };
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(-)