Message ID | 1517916352-13614-1-git-send-email-m.purski@samsung.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Tue, Feb 6, 2018 at 12:25 PM, Maciej Purski <m.purski@samsung.com> wrote: > In order to use soc node, we need to reference soc child nodes by label > in exynos4412. Define pmu label in exynos4.dtsi. Use it in exynos4412 > instead of redefining the node. > > Signed-off-by: Maciej Purski <m.purski@samsung.com> > --- > arch/arm/boot/dts/exynos4.dtsi | 2 +- > arch/arm/boot/dts/exynos4412.dtsi | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) Looks correct but I am really going to loose the track of your dependencies. You sent this as a separate patch but your v2 base on this. Unless you fix an error here (but then describe the error) this should be probably part of your series. It is okay if series grow with review. Best regards, Krzysztof > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index 6d4775a..da284f3 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -162,7 +162,7 @@ > reg = <0x10440000 0x1000>; > }; > > - pmu { > + pmu: pmu { > compatible = "arm,cortex-a9-pmu"; > interrupt-parent = <&combiner>; > interrupts = <2 2>, <3 2>; > diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi > index a6f3f59..e012cda 100644 > --- a/arch/arm/boot/dts/exynos4412.dtsi > +++ b/arch/arm/boot/dts/exynos4412.dtsi > @@ -546,10 +546,6 @@ > opp-hz = /bits/ 64 <100000000>; > }; > }; > - > - pmu { > - interrupts = <2 2>, <3 2>, <18 2>, <19 2>; > - }; > }; > > &combiner { > @@ -724,6 +720,9 @@ > <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>; > }; > > +&pmu { > + interrupts = <2 2>, <3 2>, <18 2>, <19 2>; > +}; > > &pmu_system_controller { > compatible = "samsung,exynos4412-pmu", "syscon"; > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 06, 2018 at 12:25:52PM +0100, Maciej Purski wrote: > In order to use soc node, we need to reference soc child nodes by label > in exynos4412. Define pmu label in exynos4.dtsi. Use it in exynos4412 > instead of redefining the node. > > Signed-off-by: Maciej Purski <m.purski@samsung.com> > --- > arch/arm/boot/dts/exynos4.dtsi | 2 +- > arch/arm/boot/dts/exynos4412.dtsi | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) > Thanks, applied. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 6d4775a..da284f3 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -162,7 +162,7 @@ reg = <0x10440000 0x1000>; }; - pmu { + pmu: pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&combiner>; interrupts = <2 2>, <3 2>; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index a6f3f59..e012cda 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -546,10 +546,6 @@ opp-hz = /bits/ 64 <100000000>; }; }; - - pmu { - interrupts = <2 2>, <3 2>, <18 2>, <19 2>; - }; }; &combiner { @@ -724,6 +720,9 @@ <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>; }; +&pmu { + interrupts = <2 2>, <3 2>, <18 2>, <19 2>; +}; &pmu_system_controller { compatible = "samsung,exynos4412-pmu", "syscon";
In order to use soc node, we need to reference soc child nodes by label in exynos4412. Define pmu label in exynos4.dtsi. Use it in exynos4412 instead of redefining the node. Signed-off-by: Maciej Purski <m.purski@samsung.com> --- arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4412.dtsi | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)