[V2,3/3] Add dts node for smmu on hi6220 SoC

Commit Message

Chen Feng Oct. 20, 2015, 8:45 a.m. UTC

arm64: dts: Add dts node for hi6220 smmu driver

Signed-off-by: Chen Feng <[e-mail]>
Signed-off-by: Yu Dongbin <[e-mail]>
---
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Comments

Arnd Bergmann Oct. 20, 2015, 9 a.m. UTC | #1

On Tuesday 20 October 2015 16:45:24 Chen Feng wrote:
> +
> +               smmu@f4210000 {

I think the canonical name for an IOMMU device is 'iommu', not 'smmu'.

> +                       compatible = "hisilicon,hi6220-smmu";
> +                       reg = <0x0 0xf4210000 0x0 0x1000>;
> +                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
> +                       clocks = <&sys_ctrl HI6220_MMU_CLK>,
> +                                <&media_ctrl HI6220_MED_MMU>,
> +                                <&sys_ctrl HI6220_MEDIA_PLL_SRC>;
> +                       clock-names = "smmu_clk",
> +                                     "media_sc_clk",
> +                                     "smmu_peri_clk";


Better avoid underscores in strings, and drop the "_clk" postfix in
the clock names.

I did not receive patch 1/3 this time, but I see in version 1, that
you forgot to document the strings:

> +- clock-names: The name to enable clock with clock framework.

This needs to list the names of the clock inputs to the smmu.

	Arnd

Chen Feng Oct. 20, 2015, 10:17 a.m. UTC | #2

Thanks for review.
On 2015/10/20 17:00, Arnd Bergmann wrote:
> On Tuesday 20 October 2015 16:45:24 Chen Feng wrote:
>> +
>> +               smmu@f4210000 {
> 
> I think the canonical name for an IOMMU device is 'iommu', not 'smmu'.
Accept.
> 
>> +                       compatible = "hisilicon,hi6220-smmu";
>> +                       reg = <0x0 0xf4210000 0x0 0x1000>;
>> +                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
>> +                       clocks = <&sys_ctrl HI6220_MMU_CLK>,
>> +                                <&media_ctrl HI6220_MED_MMU>,
>> +                                <&sys_ctrl HI6220_MEDIA_PLL_SRC>;
>> +                       clock-names = "smmu_clk",
>> +                                     "media_sc_clk",
>> +                                     "smmu_peri_clk";
> 
> 
> Better avoid underscores in strings, and drop the "_clk" postfix in
> the clock names.
> 
> I did not receive patch 1/3 this time, but I see in version 1, that
> you forgot to document the strings:
> 
Accept, I will change this.
>> +- clock-names: The name to enable clock with clock framework.
> 
> This needs to list the names of the clock inputs to the smmu.
> 
> 	Arnd
> _______________________________________________
> linuxarm mailing list
> [e-mail]
> http://rnd-openeuler.huawei.com/mailman/listinfo/linuxarm
> 
> .
>

Patch

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 3f03380..3ef33b4 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -5,6 +5,7 @@ 
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/hi6220-clock.h>
 
 / {
 	compatible = "hisilicon,hi6220";
@@ -167,5 +168,19 @@ 
 			clocks = <&ao_ctrl 36>, <&ao_ctrl 36>;
 			clock-names = "uartclk", "apb_pclk";
 		};
+
+		smmu@f4210000 {
+			compatible = "hisilicon,hi6220-smmu";
+			reg = <0x0 0xf4210000 0x0 0x1000>;
+			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&sys_ctrl HI6220_MMU_CLK>,
+				 <&media_ctrl HI6220_MED_MMU>,
+				 <&sys_ctrl HI6220_MEDIA_PLL_SRC>;
+			clock-names = "smmu_clk",
+				      "media_sc_clk",
+				      "smmu_peri_clk";
+			#iommu-cells = <1>;
+		};
+
 	};
 };