lkml.org 
[lkml]   [2021]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/5] arm64: dts: marvell: armada-37xx: add device node for UART clock and use it
    Date
    This change defines DT node for UART clock "marvell,armada-3700-uart-clock"
    and use this UART clock as a base clock for all UART devices.

    Signed-off-by: Pali Rohár <pali@kernel.org>
    ---
    arch/arm64/boot/dts/marvell/armada-3720-db.dts | 4 ++++
    .../boot/dts/marvell/armada-3720-espressobin.dtsi | 4 ++++
    .../boot/dts/marvell/armada-3720-turris-mox.dts | 4 ++++
    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 4 ++++
    arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 15 +++++++++++++--
    5 files changed, 29 insertions(+), 2 deletions(-)

    diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
    index 3e5789f37206..accf014a6a1e 100644
    --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
    +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
    @@ -191,6 +191,10 @@
    };
    };

    +&uartclk {
    + status = "okay";
    +};
    +
    /*
    * Exported on the micro USB connector CON30(V2.0)/CON32(V1.4) through
    * an FTDI (also on CON24(V2.0)/CON26(V1.4)).
    diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
    index 5fc613d24151..d03c7cdfbfb3 100644
    --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
    @@ -117,6 +117,10 @@
    };
    };

    +&uartclk {
    + status = "okay";
    +};
    +
    /* Exported on the micro USB connector J5 through an FTDI */
    &uart0 {
    pinctrl-names = "default";
    diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
    index ce2bcddf396f..724b41cca3b6 100644
    --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
    +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
    @@ -137,6 +137,10 @@
    status = "disabled";
    };

    +&uartclk {
    + status = "okay";
    +};
    +
    &uart0 {
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
    index 95d46e8d081c..c8217440b8dd 100644
    --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
    +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
    @@ -183,6 +183,10 @@
    phy-names = "usb2-utmi-otg-phy";
    };

    +&uartclk {
    + status = "okay";
    +};
    +
    &uart0 {
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    index 5db81a416cd6..d62bf4a798d9 100644
    --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    @@ -132,10 +132,21 @@
    reg = <0x11500 0x40>;
    };

    + uartclk: uartclk@12000 {
    + compatible = "marvell,armada-3700-uart-clock";
    + reg = <0x12010 0x4>, <0x12210 0x4>;
    + clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
    + <&tbg 3>, <&xtalclk>;
    + clock-names = "TBG-A-P", "TBG-B-P", "TBG-A-S",
    + "TBG-B-S", "xtal";
    + #clock-cells = <1>;
    + status = "disabled";
    + };
    +
    uart0: serial@12000 {
    compatible = "marvell,armada-3700-uart";
    reg = <0x12000 0x18>;
    - clocks = <&xtalclk>;
    + clocks = <&uartclk 0>;
    interrupts =
    <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
    <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
    @@ -147,7 +158,7 @@
    uart1: serial@12200 {
    compatible = "marvell,armada-3700-uart-ext";
    reg = <0x12200 0x30>;
    - clocks = <&xtalclk>;
    + clocks = <&uartclk 1>;
    interrupts =
    <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>,
    <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;
    --
    2.20.1
    \
     
     \ /
      Last update: 2021-07-17 14:40    [W:3.892 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site