| Message ID | 20180118115251.5542-8-jeffy.chen@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 18, 2018 at 8:52 PM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote: > Add clocks in vop iommu nodes, since we are going to control clocks in > rockchip iommu driver. > > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> > --- > > Changes in v4: None > Changes in v3: None > Changes in v2: None > > arch/arm/boot/dts/rk3036.dtsi | 2 ++ > arch/arm/boot/dts/rk3288.dtsi | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi > index 3b704cfed69a..95b0ebc7a40f 100644 > --- a/arch/arm/boot/dts/rk3036.dtsi > +++ b/arch/arm/boot/dts/rk3036.dtsi > @@ -197,6 +197,8 @@ > reg = <0x10118300 0x100>; > interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "vop_mmu"; > + clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>; > + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; We should remove clock-names from IOMMU nodes. The Rockchip IOMMU bindings don't define clock names and only the clocks property should be given. Not even saying that the names currently listed are not good examples, they name SoC clock controller output, rather than device inputs. Best regards, Tomasz
Hi Tomasz, Thanks for your reply. On 01/19/2018 11:23 AM, Tomasz Figa wrote: > On Thu, Jan 18, 2018 at 8:52 PM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote: >> Add clocks in vop iommu nodes, since we are going to control clocks in >> rockchip iommu driver. >> >> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> >> --- >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> arch/arm/boot/dts/rk3036.dtsi | 2 ++ >> arch/arm/boot/dts/rk3288.dtsi | 4 ++++ >> 2 files changed, 6 insertions(+) >> >> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi >> index 3b704cfed69a..95b0ebc7a40f 100644 >> --- a/arch/arm/boot/dts/rk3036.dtsi >> +++ b/arch/arm/boot/dts/rk3036.dtsi >> @@ -197,6 +197,8 @@ >> reg = <0x10118300 0x100>; >> interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; >> interrupt-names = "vop_mmu"; >> + clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>; >> + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; > > We should remove clock-names from IOMMU nodes. The Rockchip IOMMU > bindings don't define clock names and only the clocks property should > be given. > hmmm, i'm trying to switch to clk_bulk APIs, the get and put are name based. or maybe i can use clk_get/put along with other clk_bulk APIs > Not even saying that the names currently listed are not good examples, > they name SoC clock controller output, rather than device inputs. > > Best regards, > Tomasz > > >
On Fri, Jan 19, 2018 at 1:55 PM, JeffyChen <jeffy.chen@rock-chips.com> wrote: > Hi Tomasz, > > Thanks for your reply. > > > On 01/19/2018 11:23 AM, Tomasz Figa wrote: >> >> On Thu, Jan 18, 2018 at 8:52 PM, Jeffy Chen <jeffy.chen@rock-chips.com> >> wrote: >>> >>> Add clocks in vop iommu nodes, since we are going to control clocks in >>> rockchip iommu driver. >>> >>> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> >>> --- >>> >>> Changes in v4: None >>> Changes in v3: None >>> Changes in v2: None >>> >>> arch/arm/boot/dts/rk3036.dtsi | 2 ++ >>> arch/arm/boot/dts/rk3288.dtsi | 4 ++++ >>> 2 files changed, 6 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/rk3036.dtsi >>> b/arch/arm/boot/dts/rk3036.dtsi >>> index 3b704cfed69a..95b0ebc7a40f 100644 >>> --- a/arch/arm/boot/dts/rk3036.dtsi >>> +++ b/arch/arm/boot/dts/rk3036.dtsi >>> @@ -197,6 +197,8 @@ >>> reg = <0x10118300 0x100>; >>> interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; >>> interrupt-names = "vop_mmu"; >>> + clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru >>> HCLK_LCDC>; >>> + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; >> >> >> We should remove clock-names from IOMMU nodes. The Rockchip IOMMU >> bindings don't define clock names and only the clocks property should >> be given. >> > hmmm, i'm trying to switch to clk_bulk APIs, the get and put are name based. > or maybe i can use clk_get/put along with other clk_bulk APIs I think it should be possible to just put the clock pointers to the clk_bulk_data struct manually. Otherwise, I'm not sure what names we could use for clock-names, since the clocks depend on master. (Something like "clock0, clock1, clock2, ..., clockN" could work, but it doesn't add any value IMHO...).
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 3b704cfed69a..95b0ebc7a40f 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -197,6 +197,8 @@ reg = <0x10118300 0x100>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "vop_mmu"; + clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>; + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; #iommu-cells = <0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 6102e4e7f35c..5132dd887297 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1026,6 +1026,8 @@ reg = <0x0 0xff930300 0x0 0x100>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "vopb_mmu"; + clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>; + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; power-domains = <&power RK3288_PD_VIO>; #iommu-cells = <0>; status = "disabled"; @@ -1074,6 +1076,8 @@ reg = <0x0 0xff940300 0x0 0x100>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "vopl_mmu"; + clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>; + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; power-domains = <&power RK3288_PD_VIO>; #iommu-cells = <0>; status = "disabled";
Add clocks in vop iommu nodes, since we are going to control clocks in rockchip iommu driver. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/boot/dts/rk3036.dtsi | 2 ++ arch/arm/boot/dts/rk3288.dtsi | 4 ++++ 2 files changed, 6 insertions(+)