lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 031/108] ARM: dts: ux500: Rename gpio-controller node
    Date
    From: Sebastian Reichel <sebastian.reichel@collabora.com>

    [ Upstream commit 4917b702818872fdf2a9973705af3aa7d3d1f19e ]

    Rename the AB8500 gpio controller node from ab8500-gpio to
    ab8500-gpiocontroller, since -gpio is a common suffix for
    gpio consumers.

    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/ste-ab8500.dtsi | 2 +-
    arch/arm/boot/dts/ste-ab8505.dtsi | 2 +-
    arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 +-
    arch/arm/boot/dts/ste-href.dtsi | 2 +-
    arch/arm/boot/dts/ste-snowball.dts | 2 +-
    5 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi
    index f78b41002490..d0fe3f9aa183 100644
    --- a/arch/arm/boot/dts/ste-ab8500.dtsi
    +++ b/arch/arm/boot/dts/ste-ab8500.dtsi
    @@ -34,7 +34,7 @@ ab8500_clock: clock-controller {
    #clock-cells = <1>;
    };

    - ab8500_gpio: ab8500-gpio {
    + ab8500_gpio: ab8500-gpiocontroller {
    compatible = "stericsson,ab8500-gpio";
    gpio-controller;
    #gpio-cells = <2>;
    diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi
    index 3380afa74c14..0defc15b9bbc 100644
    --- a/arch/arm/boot/dts/ste-ab8505.dtsi
    +++ b/arch/arm/boot/dts/ste-ab8505.dtsi
    @@ -31,7 +31,7 @@ ab8500_clock: clock-controller {
    #clock-cells = <1>;
    };

    - ab8505_gpio: ab8505-gpio {
    + ab8505_gpio: ab8505-gpiocontroller {
    compatible = "stericsson,ab8505-gpio";
    gpio-controller;
    #gpio-cells = <2>;
    diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi
    index 4946743de7b9..3ccb7b5c7162 100644
    --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi
    +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi
    @@ -9,7 +9,7 @@ / {
    soc {
    prcmu@80157000 {
    ab8500 {
    - ab8500-gpio {
    + ab8500-gpiocontroller {
    /* Hog a few default settings */
    pinctrl-names = "default";
    pinctrl-0 = <&gpio2_default_mode>,
    diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
    index 83b179692dff..7566b4963ef6 100644
    --- a/arch/arm/boot/dts/ste-href.dtsi
    +++ b/arch/arm/boot/dts/ste-href.dtsi
    @@ -202,7 +202,7 @@ msp3: msp@80125000 {

    prcmu@80157000 {
    ab8500 {
    - ab8500-gpio {
    + ab8500-gpiocontroller {
    };

    ab8500_usb {
    diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
    index b344b3748143..40f1d7c9c1d4 100644
    --- a/arch/arm/boot/dts/ste-snowball.dts
    +++ b/arch/arm/boot/dts/ste-snowball.dts
    @@ -376,7 +376,7 @@ spi@80002000 {

    prcmu@80157000 {
    ab8500 {
    - ab8500-gpio {
    + ab8500-gpiocontroller {
    /*
    * AB8500 GPIOs are numbered starting from 1, so the first
    * index 0 is what in the datasheet is called "GPIO1", and
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 21:39    [W:2.176 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site