lkml.org 
[lkml]   [2019]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] ARM: dts: stm32: Update stm32mp157 pinctrl files
    Date
    In order to cover the STM32MP15 SOCs family this commit updates pinctrl
    file names (group definition and packages files).
    This family includes: STM32MP151, STM32MP153 and STM32MP157.

    Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>

    diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
    similarity index 100%
    rename from arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
    rename to arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
    diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
    index 628c74a45a25..2f6dd51e8506 100644
    --- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
    +++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
    @@ -7,7 +7,8 @@
    /dts-v1/;

    #include "stm32mp157c.dtsi"
    -#include "stm32mp157xac-pinctrl.dtsi"
    +#include "stm32mp15-pinctrl.dtsi"
    +#include "stm32mp15xxac-pinctrl.dtsi"
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/mfd/st,stpmic1.h>

    diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
    index 2f9f8cf94b02..7ee7b4d13d39 100644
    --- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
    +++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
    @@ -7,7 +7,8 @@
    /dts-v1/;

    #include "stm32mp157c.dtsi"
    -#include "stm32mp157xac-pinctrl.dtsi"
    +#include "stm32mp15-pinctrl.dtsi"
    +#include "stm32mp15xxac-pinctrl.dtsi"
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/mfd/st,stpmic1.h>

    diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
    index 341fb6064447..e5d8da01aaef 100644
    --- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
    +++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
    @@ -6,7 +6,8 @@
    /dts-v1/;

    #include "stm32mp157c.dtsi"
    -#include "stm32mp157xaa-pinctrl.dtsi"
    +#include "stm32mp15-pinctrl.dtsi"
    +#include "stm32mp15xxaa-pinctrl.dtsi"
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/mfd/st,stpmic1.h>

    diff --git a/arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi
    deleted file mode 100644
    index 875adf5e1e30..000000000000
    --- a/arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi
    +++ /dev/null
    @@ -1,90 +0,0 @@
    -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    -/*
    - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    - * Author: Alexandre Torgue <alexandre.torgue@st.com>
    - */
    -
    -#include "stm32mp157-pinctrl.dtsi"
    -/ {
    - soc {
    - pinctrl: pin-controller@50002000 {
    - st,package = <STM32MP_PKG_AA>;
    -
    - gpioa: gpio@50002000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 0 16>;
    - };
    -
    - gpiob: gpio@50003000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 16 16>;
    - };
    -
    - gpioc: gpio@50004000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 32 16>;
    - };
    -
    - gpiod: gpio@50005000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 48 16>;
    - };
    -
    - gpioe: gpio@50006000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 64 16>;
    - };
    -
    - gpiof: gpio@50007000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 80 16>;
    - };
    -
    - gpiog: gpio@50008000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 96 16>;
    - };
    -
    - gpioh: gpio@50009000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 112 16>;
    - };
    -
    - gpioi: gpio@5000a000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 128 16>;
    - };
    -
    - gpioj: gpio@5000b000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 144 16>;
    - };
    -
    - gpiok: gpio@5000c000 {
    - status = "okay";
    - ngpios = <8>;
    - gpio-ranges = <&pinctrl 0 160 8>;
    - };
    - };
    -
    - pinctrl_z: pin-controller-z@54004000 {
    - st,package = <STM32MP_PKG_AA>;
    -
    - gpioz: gpio@54004000 {
    - status = "okay";
    - ngpios = <8>;
    - gpio-ranges = <&pinctrl_z 0 400 8>;
    - };
    - };
    - };
    -};
    diff --git a/arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi
    deleted file mode 100644
    index 961fa12a59c3..000000000000
    --- a/arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi
    +++ /dev/null
    @@ -1,62 +0,0 @@
    -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    -/*
    - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    - * Author: Alexandre Torgue <alexandre.torgue@st.com>
    - */
    -
    -#include "stm32mp157-pinctrl.dtsi"
    -/ {
    - soc {
    - pinctrl: pin-controller@50002000 {
    - st,package = <STM32MP_PKG_AB>;
    -
    - gpioa: gpio@50002000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 0 16>;
    - };
    -
    - gpiob: gpio@50003000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 16 16>;
    - };
    -
    - gpioc: gpio@50004000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 32 16>;
    - };
    -
    - gpiod: gpio@50005000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 48 16>;
    - };
    -
    - gpioe: gpio@50006000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 64 16>;
    - };
    -
    - gpiof: gpio@50007000 {
    - status = "okay";
    - ngpios = <6>;
    - gpio-ranges = <&pinctrl 6 86 6>;
    - };
    -
    - gpiog: gpio@50008000 {
    - status = "okay";
    - ngpios = <10>;
    - gpio-ranges = <&pinctrl 6 102 10>;
    - };
    -
    - gpioh: gpio@50009000 {
    - status = "okay";
    - ngpios = <2>;
    - gpio-ranges = <&pinctrl 0 112 2>;
    - };
    - };
    - };
    -};
    diff --git a/arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi
    deleted file mode 100644
    index 26600f188d25..000000000000
    --- a/arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi
    +++ /dev/null
    @@ -1,78 +0,0 @@
    -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    -/*
    - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    - * Author: Alexandre Torgue <alexandre.torgue@st.com>
    - */
    -
    -#include "stm32mp157-pinctrl.dtsi"
    -/ {
    - soc {
    - pinctrl: pin-controller@50002000 {
    - st,package = <STM32MP_PKG_AC>;
    -
    - gpioa: gpio@50002000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 0 16>;
    - };
    -
    - gpiob: gpio@50003000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 16 16>;
    - };
    -
    - gpioc: gpio@50004000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 32 16>;
    - };
    -
    - gpiod: gpio@50005000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 48 16>;
    - };
    -
    - gpioe: gpio@50006000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 64 16>;
    - };
    -
    - gpiof: gpio@50007000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 80 16>;
    - };
    -
    - gpiog: gpio@50008000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 96 16>;
    - };
    -
    - gpioh: gpio@50009000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 112 16>;
    - };
    -
    - gpioi: gpio@5000a000 {
    - status = "okay";
    - ngpios = <12>;
    - gpio-ranges = <&pinctrl 0 128 12>;
    - };
    - };
    -
    - pinctrl_z: pin-controller-z@54004000 {
    - st,package = <STM32MP_PKG_AC>;
    -
    - gpioz: gpio@54004000 {
    - status = "okay";
    - ngpios = <8>;
    - gpio-ranges = <&pinctrl_z 0 400 8>;
    - };
    - };
    - };
    -};
    diff --git a/arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi
    deleted file mode 100644
    index 910113f3e69a..000000000000
    --- a/arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi
    +++ /dev/null
    @@ -1,62 +0,0 @@
    -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    -/*
    - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    - * Author: Alexandre Torgue <alexandre.torgue@st.com>
    - */
    -
    -#include "stm32mp157-pinctrl.dtsi"
    -/ {
    - soc {
    - pinctrl: pin-controller@50002000 {
    - st,package = <STM32MP_PKG_AD>;
    -
    - gpioa: gpio@50002000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 0 16>;
    - };
    -
    - gpiob: gpio@50003000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 16 16>;
    - };
    -
    - gpioc: gpio@50004000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 32 16>;
    - };
    -
    - gpiod: gpio@50005000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 48 16>;
    - };
    -
    - gpioe: gpio@50006000 {
    - status = "okay";
    - ngpios = <16>;
    - gpio-ranges = <&pinctrl 0 64 16>;
    - };
    -
    - gpiof: gpio@50007000 {
    - status = "okay";
    - ngpios = <6>;
    - gpio-ranges = <&pinctrl 6 86 6>;
    - };
    -
    - gpiog: gpio@50008000 {
    - status = "okay";
    - ngpios = <10>;
    - gpio-ranges = <&pinctrl 6 102 10>;
    - };
    -
    - gpioh: gpio@50009000 {
    - status = "okay";
    - ngpios = <2>;
    - gpio-ranges = <&pinctrl 0 112 2>;
    - };
    - };
    - };
    -};
    diff --git a/arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi
    new file mode 100644
    index 000000000000..04f7a43ad66f
    --- /dev/null
    +++ b/arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi
    @@ -0,0 +1,85 @@
    +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    +/*
    + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
    + */
    +
    +&pinctrl {
    + st,package = <STM32MP_PKG_AA>;
    +
    + gpioa: gpio@50002000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 0 16>;
    + };
    +
    + gpiob: gpio@50003000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 16 16>;
    + };
    +
    + gpioc: gpio@50004000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 32 16>;
    + };
    +
    + gpiod: gpio@50005000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 48 16>;
    + };
    +
    + gpioe: gpio@50006000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 64 16>;
    + };
    +
    + gpiof: gpio@50007000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 80 16>;
    + };
    +
    + gpiog: gpio@50008000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 96 16>;
    + };
    +
    + gpioh: gpio@50009000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 112 16>;
    + };
    +
    + gpioi: gpio@5000a000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 128 16>;
    + };
    +
    + gpioj: gpio@5000b000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 144 16>;
    + };
    +
    + gpiok: gpio@5000c000 {
    + status = "okay";
    + ngpios = <8>;
    + gpio-ranges = <&pinctrl 0 160 8>;
    + };
    +};
    +
    +&pinctrl_z {
    + st,package = <STM32MP_PKG_AA>;
    +
    + gpioz: gpio@54004000 {
    + status = "okay";
    + ngpios = <8>;
    + gpio-ranges = <&pinctrl_z 0 400 8>;
    + };
    +};
    diff --git a/arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi
    new file mode 100644
    index 000000000000..328dad140e9b
    --- /dev/null
    +++ b/arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi
    @@ -0,0 +1,57 @@
    +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    +/*
    + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
    + */
    +
    +&pinctrl {
    + st,package = <STM32MP_PKG_AB>;
    +
    + gpioa: gpio@50002000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 0 16>;
    + };
    +
    + gpiob: gpio@50003000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 16 16>;
    + };
    +
    + gpioc: gpio@50004000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 32 16>;
    + };
    +
    + gpiod: gpio@50005000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 48 16>;
    + };
    +
    + gpioe: gpio@50006000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 64 16>;
    + };
    +
    + gpiof: gpio@50007000 {
    + status = "okay";
    + ngpios = <6>;
    + gpio-ranges = <&pinctrl 6 86 6>;
    + };
    +
    + gpiog: gpio@50008000 {
    + status = "okay";
    + ngpios = <10>;
    + gpio-ranges = <&pinctrl 6 102 10>;
    + };
    +
    + gpioh: gpio@50009000 {
    + status = "okay";
    + ngpios = <2>;
    + gpio-ranges = <&pinctrl 0 112 2>;
    + };
    +};
    diff --git a/arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi
    new file mode 100644
    index 000000000000..7eaa245f44db
    --- /dev/null
    +++ b/arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi
    @@ -0,0 +1,73 @@
    +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    +/*
    + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
    + */
    +
    +&pinctrl {
    + st,package = <STM32MP_PKG_AC>;
    +
    + gpioa: gpio@50002000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 0 16>;
    + };
    +
    + gpiob: gpio@50003000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 16 16>;
    + };
    +
    + gpioc: gpio@50004000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 32 16>;
    + };
    +
    + gpiod: gpio@50005000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 48 16>;
    + };
    +
    + gpioe: gpio@50006000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 64 16>;
    + };
    +
    + gpiof: gpio@50007000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 80 16>;
    + };
    +
    + gpiog: gpio@50008000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 96 16>;
    + };
    +
    + gpioh: gpio@50009000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 112 16>;
    + };
    +
    + gpioi: gpio@5000a000 {
    + status = "okay";
    + ngpios = <12>;
    + gpio-ranges = <&pinctrl 0 128 12>;
    + };
    +};
    +
    +&pinctrl_z {
    + st,package = <STM32MP_PKG_AC>;
    +
    + gpioz: gpio@54004000 {
    + status = "okay";
    + ngpios = <8>;
    + gpio-ranges = <&pinctrl_z 0 400 8>;
    + };
    +};
    diff --git a/arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi
    new file mode 100644
    index 000000000000..b63e207de216
    --- /dev/null
    +++ b/arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi
    @@ -0,0 +1,57 @@
    +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
    +/*
    + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
    + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
    + */
    +
    +&pinctrl {
    + st,package = <STM32MP_PKG_AD>;
    +
    + gpioa: gpio@50002000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 0 16>;
    + };
    +
    + gpiob: gpio@50003000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 16 16>;
    + };
    +
    + gpioc: gpio@50004000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 32 16>;
    + };
    +
    + gpiod: gpio@50005000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 48 16>;
    + };
    +
    + gpioe: gpio@50006000 {
    + status = "okay";
    + ngpios = <16>;
    + gpio-ranges = <&pinctrl 0 64 16>;
    + };
    +
    + gpiof: gpio@50007000 {
    + status = "okay";
    + ngpios = <6>;
    + gpio-ranges = <&pinctrl 6 86 6>;
    + };
    +
    + gpiog: gpio@50008000 {
    + status = "okay";
    + ngpios = <10>;
    + gpio-ranges = <&pinctrl 6 102 10>;
    + };
    +
    + gpioh: gpio@50009000 {
    + status = "okay";
    + ngpios = <2>;
    + gpio-ranges = <&pinctrl 0 112 2>;
    + };
    +};
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-11-20 15:44    [W:4.296 / U:1.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site