lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 058/477] arm64: dts: fvp/juno: Fix node address fields
    Date
    From: Andre Przywara <andre.przywara@arm.com>

    [ Upstream commit bb5cce12ac717c7462217cd493ed701d12d6dbce ]

    The Arm Ltd. boards were using an outdated address convention in the DT
    node names, by separating the high from the low 32-bits of an address by
    a comma.

    Remove the comma from the node name suffix to be DT spec compliant.

    Link: https://lore.kernel.org/r/20200513103016.130417-3-andre.przywara@arm.com
    Signed-off-by: Andre Przywara <andre.przywara@arm.com>
    Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 10 +++++-----
    arch/arm64/boot/dts/arm/foundation-v8.dtsi | 4 ++--
    arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 6 +++---
    arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 2 +-
    arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 6 +++---
    5 files changed, 14 insertions(+), 14 deletions(-)

    diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
    index 5c183483ec3b6..8010cdcdb37a0 100644
    --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
    +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
    @@ -31,7 +31,7 @@
    #interrupt-cells = <1>;
    ranges;

    - nor_flash: flash@0,00000000 {
    + nor_flash: flash@0 {
    compatible = "arm,vexpress-flash", "cfi-flash";
    reg = <0 0x00000000 0x04000000>,
    <4 0x00000000 0x04000000>;
    @@ -41,13 +41,13 @@
    };
    };

    - psram@1,00000000 {
    + psram@100000000 {
    compatible = "arm,vexpress-psram", "mtd-ram";
    reg = <1 0x00000000 0x02000000>;
    bank-width = <4>;
    };

    - ethernet@2,02000000 {
    + ethernet@202000000 {
    compatible = "smsc,lan9118", "smsc,lan9115";
    reg = <2 0x02000000 0x10000>;
    interrupts = <15>;
    @@ -59,14 +59,14 @@
    vddvario-supply = <&v2m_fixed_3v3>;
    };

    - usb@2,03000000 {
    + usb@203000000 {
    compatible = "nxp,usb-isp1761";
    reg = <2 0x03000000 0x20000>;
    interrupts = <16>;
    port1-otg;
    };

    - iofpga@3,00000000 {
    + iofpga@300000000 {
    compatible = "simple-bus";
    #address-cells = <1>;
    #size-cells = <1>;
    diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
    index 60ec37d6c9d3c..e2da63f782980 100644
    --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
    +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
    @@ -151,7 +151,7 @@
    <0 0 41 &gic 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
    <0 0 42 &gic 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

    - ethernet@2,02000000 {
    + ethernet@202000000 {
    compatible = "smsc,lan91c111";
    reg = <2 0x02000000 0x10000>;
    interrupts = <15>;
    @@ -178,7 +178,7 @@
    clock-output-names = "v2m:refclk32khz";
    };

    - iofpga@3,00000000 {
    + iofpga@300000000 {
    compatible = "simple-bus";
    #address-cells = <1>;
    #size-cells = <1>;
    diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
    index e3983ded3c3c5..d5cefddde08c2 100644
    --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
    +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
    @@ -103,7 +103,7 @@
    };
    };

    - flash@0,00000000 {
    + flash@0 {
    /* 2 * 32MiB NOR Flash memory mounted on CS0 */
    compatible = "arm,vexpress-flash", "cfi-flash";
    reg = <0 0x00000000 0x04000000>;
    @@ -120,7 +120,7 @@
    };
    };

    - ethernet@2,00000000 {
    + ethernet@200000000 {
    compatible = "smsc,lan9118", "smsc,lan9115";
    reg = <2 0x00000000 0x10000>;
    interrupts = <3>;
    @@ -133,7 +133,7 @@
    vddvario-supply = <&mb_fixed_3v3>;
    };

    - iofpga@3,00000000 {
    + iofpga@300000000 {
    compatible = "simple-bus";
    #address-cells = <1>;
    #size-cells = <1>;
    diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
    index 60703b5763c6a..350cbf17e8b41 100644
    --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
    +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
    @@ -9,7 +9,7 @@
    motherboard {
    arm,v2m-memory-map = "rs2";

    - iofpga@3,00000000 {
    + iofpga@300000000 {
    virtio-p9@140000 {
    compatible = "virtio,mmio";
    reg = <0x140000 0x200>;
    diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
    index e333c8d2d0e4c..d1bfa62ca073e 100644
    --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
    +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
    @@ -17,14 +17,14 @@
    #interrupt-cells = <1>;
    ranges;

    - flash@0,00000000 {
    + flash@0 {
    compatible = "arm,vexpress-flash", "cfi-flash";
    reg = <0 0x00000000 0x04000000>,
    <4 0x00000000 0x04000000>;
    bank-width = <4>;
    };

    - ethernet@2,02000000 {
    + ethernet@202000000 {
    compatible = "smsc,lan91c111";
    reg = <2 0x02000000 0x10000>;
    interrupts = <15>;
    @@ -51,7 +51,7 @@
    clock-output-names = "v2m:refclk32khz";
    };

    - iofpga@3,00000000 {
    + iofpga@300000000 {
    compatible = "simple-bus";
    #address-cells = <1>;
    #size-cells = <1>;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:04    [W:3.057 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site