lkml.org 
[lkml]   [2014]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 078/122] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gregory CLEMENT <gregory.clement@free-electrons.com>

    commit 8dbdb8e704db34085f5978c335c10256b0fb9629 upstream.

    Wildcards in compatible strings should be avoid. "marvell,armada38x"
    was recently introduced but was not yet used.

    The armada 385 SoC is a superset of the armada 380 SoC (with more CPUs
    and more PCIe slots). So this patch replaces the use of
    "marvell,armada38x" by the "marvell,armada380" string.

    Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Link: https://lkml.kernel.org/r/1403533011-21339-1-git-send-email-gregory.clement@free-electrons.com
    Acked-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Jason Cooper <jason@lakedaemon.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Documentation/devicetree/bindings/arm/armada-38x.txt | 14 ++++++++++++--
    arch/arm/boot/dts/armada-380.dtsi | 2 +-
    arch/arm/boot/dts/armada-385-db.dts | 2 +-
    arch/arm/boot/dts/armada-385-rd.dts | 2 +-
    arch/arm/boot/dts/armada-385.dtsi | 2 +-
    arch/arm/boot/dts/armada-38x.dtsi | 2 +-
    6 files changed, 17 insertions(+), 7 deletions(-)

    --- a/Documentation/devicetree/bindings/arm/armada-38x.txt
    +++ b/Documentation/devicetree/bindings/arm/armada-38x.txt
    @@ -6,5 +6,15 @@ following property:

    Required root node property:

    - - compatible: must contain either "marvell,armada380" or
    - "marvell,armada385" depending on the variant of the SoC being used.
    + - compatible: must contain "marvell,armada380"
    +
    +In addition, boards using the Marvell Armada 385 SoC shall have the
    +following property before the previous one:
    +
    +Required root node property:
    +
    +compatible: must contain "marvell,armada385"
    +
    +Example:
    +
    +compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
    --- a/arch/arm/boot/dts/armada-380.dtsi
    +++ b/arch/arm/boot/dts/armada-380.dtsi
    @@ -16,7 +16,7 @@

    / {
    model = "Marvell Armada 380 family SoC";
    - compatible = "marvell,armada380", "marvell,armada38x";
    + compatible = "marvell,armada380";

    cpus {
    #address-cells = <1>;
    --- a/arch/arm/boot/dts/armada-385-db.dts
    +++ b/arch/arm/boot/dts/armada-385-db.dts
    @@ -16,7 +16,7 @@

    / {
    model = "Marvell Armada 385 Development Board";
    - compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
    + compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";

    chosen {
    bootargs = "console=ttyS0,115200 earlyprintk";
    --- a/arch/arm/boot/dts/armada-385-rd.dts
    +++ b/arch/arm/boot/dts/armada-385-rd.dts
    @@ -17,7 +17,7 @@

    / {
    model = "Marvell Armada 385 Reference Design";
    - compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
    + compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

    chosen {
    bootargs = "console=ttyS0,115200 earlyprintk";
    --- a/arch/arm/boot/dts/armada-385.dtsi
    +++ b/arch/arm/boot/dts/armada-385.dtsi
    @@ -16,7 +16,7 @@

    / {
    model = "Marvell Armada 385 family SoC";
    - compatible = "marvell,armada385", "marvell,armada38x";
    + compatible = "marvell,armada385", "marvell,armada380";

    cpus {
    #address-cells = <1>;
    --- a/arch/arm/boot/dts/armada-38x.dtsi
    +++ b/arch/arm/boot/dts/armada-38x.dtsi
    @@ -20,7 +20,7 @@

    / {
    model = "Marvell Armada 38x family SoC";
    - compatible = "marvell,armada38x";
    + compatible = "marvell,armada380";

    aliases {
    gpio0 = &gpio0;



    \
     
     \ /
      Last update: 2014-07-08 04:21    [W:2.993 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site