| Message ID | 1406551080-14821-2-git-send-email-vikas.sajjan@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Vikas, On Mon, Jul 28, 2014 at 6:07 PM, Vikas Sajjan <vikas.sajjan@samsung.com> wrote: > Adds PMU DT node for exynos5260 SoC. > > Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com> > --- > .../devicetree/bindings/arm/samsung/pmu.txt | 1 + > arch/arm/boot/dts/exynos5260.dtsi | 5 +++++ > 2 files changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt > index 2a4ab04..c038628 100644 > --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt > +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt > @@ -8,6 +8,7 @@ Properties: > - "samsung,exynos4412-pmu" - for Exynos4412 SoC, > - "samsung,exynos5250-pmu" - for Exynos5250 SoC, > - "samsung,exynos5420-pmu" - for Exynos5420 SoC. > + - "samsung,exynos5260-pmu" - for Exynos5260 SoC. nit: This line should come after 5250 entry to preserve the order. Otherwise, looks good.
Hi Vikas and Sachin, Am 28.07.2014 17:26, schrieb Sachin Kamat: > On Mon, Jul 28, 2014 at 6:07 PM, Vikas Sajjan <vikas.sajjan@samsung.com> wrote: >> Adds PMU DT node for exynos5260 SoC. >> >> Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com> >> --- >> .../devicetree/bindings/arm/samsung/pmu.txt | 1 + >> arch/arm/boot/dts/exynos5260.dtsi | 5 +++++ >> 2 files changed, 6 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt >> index 2a4ab04..c038628 100644 >> --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt >> +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt >> @@ -8,6 +8,7 @@ Properties: >> - "samsung,exynos4412-pmu" - for Exynos4412 SoC, >> - "samsung,exynos5250-pmu" - for Exynos5250 SoC, >> - "samsung,exynos5420-pmu" - for Exynos5420 SoC. >> + - "samsung,exynos5260-pmu" - for Exynos5260 SoC. > > nit: This line should come after 5250 entry to preserve the order. > > Otherwise, looks good. Earlier today, Kukjin indicated he would apply my corresponding 5410 series [*], but he hasn't pushed yet. It adds a 5410 entry before 5420, which will conflict with adding 5260 in the same place. Regards, Andreas [*] http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg34686.html
On 07/29/14 05:29, Andreas Färber wrote: > Hi Vikas and Sachin, > > Am 28.07.2014 17:26, schrieb Sachin Kamat: >> On Mon, Jul 28, 2014 at 6:07 PM, Vikas Sajjan<vikas.sajjan@samsung.com> wrote: >>> Adds PMU DT node for exynos5260 SoC. >>> >>> Signed-off-by: Vikas Sajjan<vikas.sajjan@samsung.com> >>> --- >>> .../devicetree/bindings/arm/samsung/pmu.txt | 1 + >>> arch/arm/boot/dts/exynos5260.dtsi | 5 +++++ >>> 2 files changed, 6 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt >>> index 2a4ab04..c038628 100644 >>> --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt >>> +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt >>> @@ -8,6 +8,7 @@ Properties: >>> - "samsung,exynos4412-pmu" - for Exynos4412 SoC, >>> - "samsung,exynos5250-pmu" - for Exynos5250 SoC, >>> - "samsung,exynos5420-pmu" - for Exynos5420 SoC. >>> + - "samsung,exynos5260-pmu" - for Exynos5260 SoC. >> >> nit: This line should come after 5250 entry to preserve the order. >> >> Otherwise, looks good. > > Earlier today, Kukjin indicated he would apply my corresponding 5410 > series [*], but he hasn't pushed yet. It adds a 5410 entry before 5420, > which will conflict with adding 5260 in the same place. > > Regards, > Andreas > > [*] > http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg34686.html > Thanks for you guys' comments, and I've applied this whole series with some handy modification ;) - Kukjin
diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt index 2a4ab04..c038628 100644 --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt @@ -8,6 +8,7 @@ Properties: - "samsung,exynos4412-pmu" - for Exynos4412 SoC, - "samsung,exynos5250-pmu" - for Exynos5250 SoC, - "samsung,exynos5420-pmu" - for Exynos5420 SoC. + - "samsung,exynos5260-pmu" - for Exynos5260 SoC. second value must be always "syscon". - reg : offset and length of the register set. diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi index 5398a60..4f2fabe 100644 --- a/arch/arm/boot/dts/exynos5260.dtsi +++ b/arch/arm/boot/dts/exynos5260.dtsi @@ -227,6 +227,11 @@ interrupts = <0 243 0>; }; + pmu_system_controller: system-controller@10D50000 { + compatible = "samsung,exynos5260-pmu", "syscon"; + reg = <0x10D50000 0x10000>; + }; + uart0: serial@12C00000 { compatible = "samsung,exynos4210-uart"; reg = <0x12C00000 0x100>;
Adds PMU DT node for exynos5260 SoC. Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com> --- .../devicetree/bindings/arm/samsung/pmu.txt | 1 + arch/arm/boot/dts/exynos5260.dtsi | 5 +++++ 2 files changed, 6 insertions(+)