Merge tag 'samsung-dt-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...

Pull "Samsung DeviceTree update for v4.11, third round" from Krzysztof Kozlowski

1. Add descriptive user-friendly label names for power domains. This
   makes debugging easier.

* tag 'samsung-dt-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add labels to all existing power domains

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 8fb0e00dd1bef1d551d5ad29ef0190da31bc72fe..18def1c774d5deb14e859c4d0c0e75439f6a9147 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -102,18 +102,21 @@ pd_mfc: mfc-power-domain@10023C40 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023C40 0x20>;
                #power-domain-cells = <0>;
+               label = "MFC";
        };
 
        pd_g3d: g3d-power-domain@10023C60 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023C60 0x20>;
                #power-domain-cells = <0>;
+               label = "G3D";
        };
 
        pd_lcd0: lcd0-power-domain@10023C80 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023C80 0x20>;
                #power-domain-cells = <0>;
+               label = "LCD0";
        };
 
        pd_tv: tv-power-domain@10023C20 {
@@ -121,24 +124,28 @@ pd_tv: tv-power-domain@10023C20 {
                reg = <0x10023C20 0x20>;
                #power-domain-cells = <0>;
                power-domains = <&pd_lcd0>;
+               label = "TV";
        };
 
        pd_cam: cam-power-domain@10023C00 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023C00 0x20>;
                #power-domain-cells = <0>;
+               label = "CAM";
        };
 
        pd_gps: gps-power-domain@10023CE0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CE0 0x20>;
                #power-domain-cells = <0>;
+               label = "GPS";
        };
 
        pd_gps_alive: gps-alive-power-domain@10023D00 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023D00 0x20>;
                #power-domain-cells = <0>;
+               label = "GPS alive";
        };
 
        gic: interrupt-controller@10490000 {

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 7f3a18c8f60fbed10699f54705d6aef8e0306282..f9408188f97f21e621e61e00e7cf3e34d86637aa 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -86,6 +86,7 @@ pd_lcd1: lcd1-power-domain@10023CA0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CA0 0x20>;
                #power-domain-cells = <0>;
+               label = "LCD1";
        };
 
        l2c: l2-cache-controller@10502000 {

diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 4f7b5a1a848c37854747ec49253104ce79bd3050..235bbb69ad7c859a0449a757dca7bd2a7dd3af41 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -172,6 +172,7 @@ pd_isp: isp-power-domain@10023CA0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CA0 0x20>;
                #power-domain-cells = <0>;
+               label = "ISP";
        };
 
        l2c: l2-cache-controller@10502000 {

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 0e04460a815a028859474c15bc3ed294fc8bb3a4..79c9c885613afb4ddaa434a1b5d5c40565e537e9 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -115,18 +115,21 @@ pd_gsc: gsc-power-domain@10044000 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10044000 0x20>;
                        #power-domain-cells = <0>;
+                       label = "GSC";
                };
 
                pd_mfc: mfc-power-domain@10044040 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10044040 0x20>;
                        #power-domain-cells = <0>;
+                       label = "MFC";
                };
 
                pd_disp1: disp1-power-domain@100440A0 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x100440A0 0x20>;
                        #power-domain-cells = <0>;
+                       label = "DISP1";
                        clocks = <&clock CLK_FIN_PLL>,
                                 <&clock CLK_MOUT_ACLK200_DISP1_SUB>,
                                 <&clock CLK_MOUT_ACLK300_DISP1_SUB>;

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 0154c2e373f83018265a59e19bf0748c3feb3e1c..7dc9dc82afd87edb22cc3f0411a64a6c9a2d064a 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -277,6 +277,7 @@ gsc_pd: power-domain@10044000 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10044000 0x20>;
                        #power-domain-cells = <0>;
+                       label = "GSC";
                        clocks = <&clock CLK_FIN_PLL>,
                                 <&clock CLK_MOUT_USER_ACLK300_GSCL>,
                                 <&clock CLK_GSCL0>, <&clock CLK_GSCL1>;
@@ -287,6 +288,7 @@ isp_pd: power-domain@10044020 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10044020 0x20>;
                        #power-domain-cells = <0>;
+                       label = "ISP";
                };
 
                mfc_pd: power-domain@10044060 {
@@ -297,18 +299,21 @@ mfc_pd: power-domain@10044060 {
                                 <&clock CLK_ACLK333>;
                        clock-names = "oscclk", "clk0","asb0";
                        #power-domain-cells = <0>;
+                       label = "MFC";
                };
 
                msc_pd: power-domain@10044120 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10044120 0x20>;
                        #power-domain-cells = <0>;
+                       label = "MSC";
                };
 
                disp_pd: power-domain@100440C0 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x100440C0 0x20>;
                        #power-domain-cells = <0>;
+                       label = "DISP";
                        clocks = <&clock CLK_FIN_PLL>,
                                 <&clock CLK_MOUT_USER_ACLK200_DISP1>,
                                 <&clock CLK_MOUT_USER_ACLK300_DISP1>,