On Tue, Mar 25, 2014 at 11:48:19PM +0100, Gregory CLEMENT wrote:
> The initial binding for PMSU were wrong. It didn't take into account
> all the registers from the PMSU and in the other hand refereed to
> registers which are not part of PMSU. This commit introduces a new
> compatible for the PMSU node and annotates the previous one as
> obsolete. However we still continue to support it during a few
> releases.
>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
> ---
> .../devicetree/bindings/arm/armada-370-xp-pmsu.txt | 14 ++++++--------
> arch/arm/boot/dts/armada-xp.dtsi | 11 ++++++++---
> 2 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt
> index 926b4d6aae7e..976188770079 100644
> --- a/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt
> +++ b/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt
> @@ -4,17 +4,15 @@ Available on Marvell SOCs: Armada 370 and Armada XP
>
> Required properties:
>
> -- compatible: "marvell,armada-370-xp-pmsu"
> +- compatible: should be "marvell,armada-370-pmsu", whereas
> + "marvell,armada-370-xp-pmsu" is deprecated and will be removed
:) ignore my comment on the previous patch.
> -- reg: Should contain PMSU registers location and length. First pair
> - for the per-CPU SW Reset Control registers, second pair for the
> - Power Management Service Unit.
> +- reg: Should contain PMSU registers location and length.
>
> Example:
>
> -armada-370-xp-pmsu@d0022000 {
> - compatible = "marvell,armada-370-xp-pmsu";
> - reg = <0xd0022100 0x430>,
> - <0xd0020800 0x20>;
> +armada-370-xp-pmsu@22000 {
> + compatible = "marvell,armada-370-pmsu";
> + reg = <0x22000 0x1000>;
> };
>
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index abb9f9dcc525..0c455f5458df 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -117,9 +117,14 @@
> clock-names = "nbclk", "fixed";
> };
>
> - armada-370-xp-pmsu@22000 {
> - compatible = "marvell,armada-370-xp-pmsu";
> - reg = <0x22100 0x400>, <0x20800 0x20>;
> + cpurst@20800 {
> + compatible = "marvell,armada-xp-cpu-reset";
> + reg = <0x20800 0x20>;
> + };
> +
> + armada-370-pmsu@22000 {
> + compatible = "marvell,armada-370-pmsu";
> + reg = <0x22000 0x400>;
> };
>
> eth2: ethernet@30000 {
> --
> 1.8.1.2
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
