lkml.org 
[lkml]   [2017]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] mvebu: xp: Add pwm properties to .dtsi files
    Date
    From: Andrew Lunn <andrew@lunn.ch>

    Add properties to the gpio nodes to allow them to be also used as pwm
    lines.

    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    URL: https://patchwork.ozlabs.org/patch/427294/
    Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
    ---
    arch/arm/boot/dts/armada-370.dtsi | 10 ++++++++--
    arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++--
    arch/arm/boot/dts/armada-xp-mv78260.dtsi | 8 ++++++--
    arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++--
    4 files changed, 30 insertions(+), 8 deletions(-)

    diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
    index cc011c8..aa9fe72 100644
    --- a/arch/arm/boot/dts/armada-370.dtsi
    +++ b/arch/arm/boot/dts/armada-370.dtsi
    @@ -138,24 +138,30 @@

    gpio0: gpio@18100 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18100 0x40>;
    + reg = <0x18100 0x40>, <0x181c0 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <82>, <83>, <84>, <85>;
    + clocks = <&coreclk 0>;
    };

    gpio1: gpio@18140 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18140 0x40>;
    + reg = <0x18140 0x40>, <0x181c8 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <87>, <88>, <89>, <90>;
    + clocks = <&coreclk 0>;
    };

    gpio2: gpio@18180 {
    diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
    index 07c5090..fc3934f 100644
    --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
    +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
    @@ -203,24 +203,30 @@
    internal-regs {
    gpio0: gpio@18100 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18100 0x40>;
    + reg = <0x18100 0x40>, <0x181c0 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <82>, <83>, <84>, <85>;
    + clocks = <&coreclk 0>;
    };

    gpio1: gpio@18140 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18140 0x40>;
    + reg = <0x18140 0x40>, <0x181c8 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <17>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <87>, <88>, <89>;
    + clocks = <&coreclk 0>;
    };
    };
    };
    diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
    index 64e936a..04dda6a 100644
    --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
    +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
    @@ -286,24 +286,28 @@
    internal-regs {
    gpio0: gpio@18100 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18100 0x40>;
    + reg = <0x18100 0x40>, <0x181c0 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <82>, <83>, <84>, <85>;
    + clocks = <&coreclk 0>;
    };

    gpio1: gpio@18140 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18140 0x40>;
    + reg = <0x18140 0x40>, <0x181c8 0x08>;
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <87>, <88>, <89>, <90>;
    + clocks = <&coreclk 0>;
    };

    gpio2: gpio@18180 {
    diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
    index d1383dd..fb6d28a 100644
    --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
    +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
    @@ -324,24 +324,30 @@
    internal-regs {
    gpio0: gpio@18100 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18100 0x40>;
    + reg = <0x18100 0x40>, <0x181c0 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <82>, <83>, <84>, <85>;
    + clocks = <&coreclk 0>;
    };

    gpio1: gpio@18140 {
    compatible = "marvell,orion-gpio";
    - reg = <0x18140 0x40>;
    + reg = <0x18140 0x40>, <0x181c8 0x08>;
    + reg-names = "gpio", "pwm";
    ngpios = <32>;
    gpio-controller;
    #gpio-cells = <2>;
    + #pwm-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;
    interrupts = <87>, <88>, <89>, <90>;
    + clocks = <&coreclk 0>;
    };

    gpio2: gpio@18180 {
    --
    2.10.2
    \
     
     \ /
      Last update: 2017-03-16 07:45    [W:4.072 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site