tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: stm32: Update stm32mp157 pinctrl files

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>

Alexandre Torgue 48c7181f 92d3a35c

+278 -295
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+2 -1
arch/arm/boot/dts/stm32mp157a-avenger96.dts
··· 7 7 /dts-v1/; 8 8 9 9 #include "stm32mp157c.dtsi" 10 - #include "stm32mp157xac-pinctrl.dtsi" 10 + #include "stm32mp15-pinctrl.dtsi" 11 + #include "stm32mp15xxac-pinctrl.dtsi" 11 12 #include <dt-bindings/gpio/gpio.h> 12 13 #include <dt-bindings/mfd/st,stpmic1.h> 13 14
+2 -1
arch/arm/boot/dts/stm32mp157a-dk1.dts
··· 7 7 /dts-v1/; 8 8 9 9 #include "stm32mp157c.dtsi" 10 - #include "stm32mp157xac-pinctrl.dtsi" 10 + #include "stm32mp15-pinctrl.dtsi" 11 + #include "stm32mp15xxac-pinctrl.dtsi" 11 12 #include <dt-bindings/gpio/gpio.h> 12 13 #include <dt-bindings/mfd/st,stpmic1.h> 13 14
+2 -1
arch/arm/boot/dts/stm32mp157c-ed1.dts
··· 6 6 /dts-v1/; 7 7 8 8 #include "stm32mp157c.dtsi" 9 - #include "stm32mp157xaa-pinctrl.dtsi" 9 + #include "stm32mp15-pinctrl.dtsi" 10 + #include "stm32mp15xxaa-pinctrl.dtsi" 10 11 #include <dt-bindings/gpio/gpio.h> 11 12 #include <dt-bindings/mfd/st,stpmic1.h> 12 13
-90
arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi
··· 1 - // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 - /* 3 - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 - * Author: Alexandre Torgue <alexandre.torgue@st.com> 5 - */ 6 - 7 - #include "stm32mp157-pinctrl.dtsi" 8 - / { 9 - soc { 10 - pinctrl: pin-controller@50002000 { 11 - st,package = <STM32MP_PKG_AA>; 12 - 13 - gpioa: gpio@50002000 { 14 - status = "okay"; 15 - ngpios = <16>; 16 - gpio-ranges = <&pinctrl 0 0 16>; 17 - }; 18 - 19 - gpiob: gpio@50003000 { 20 - status = "okay"; 21 - ngpios = <16>; 22 - gpio-ranges = <&pinctrl 0 16 16>; 23 - }; 24 - 25 - gpioc: gpio@50004000 { 26 - status = "okay"; 27 - ngpios = <16>; 28 - gpio-ranges = <&pinctrl 0 32 16>; 29 - }; 30 - 31 - gpiod: gpio@50005000 { 32 - status = "okay"; 33 - ngpios = <16>; 34 - gpio-ranges = <&pinctrl 0 48 16>; 35 - }; 36 - 37 - gpioe: gpio@50006000 { 38 - status = "okay"; 39 - ngpios = <16>; 40 - gpio-ranges = <&pinctrl 0 64 16>; 41 - }; 42 - 43 - gpiof: gpio@50007000 { 44 - status = "okay"; 45 - ngpios = <16>; 46 - gpio-ranges = <&pinctrl 0 80 16>; 47 - }; 48 - 49 - gpiog: gpio@50008000 { 50 - status = "okay"; 51 - ngpios = <16>; 52 - gpio-ranges = <&pinctrl 0 96 16>; 53 - }; 54 - 55 - gpioh: gpio@50009000 { 56 - status = "okay"; 57 - ngpios = <16>; 58 - gpio-ranges = <&pinctrl 0 112 16>; 59 - }; 60 - 61 - gpioi: gpio@5000a000 { 62 - status = "okay"; 63 - ngpios = <16>; 64 - gpio-ranges = <&pinctrl 0 128 16>; 65 - }; 66 - 67 - gpioj: gpio@5000b000 { 68 - status = "okay"; 69 - ngpios = <16>; 70 - gpio-ranges = <&pinctrl 0 144 16>; 71 - }; 72 - 73 - gpiok: gpio@5000c000 { 74 - status = "okay"; 75 - ngpios = <8>; 76 - gpio-ranges = <&pinctrl 0 160 8>; 77 - }; 78 - }; 79 - 80 - pinctrl_z: pin-controller-z@54004000 { 81 - st,package = <STM32MP_PKG_AA>; 82 - 83 - gpioz: gpio@54004000 { 84 - status = "okay"; 85 - ngpios = <8>; 86 - gpio-ranges = <&pinctrl_z 0 400 8>; 87 - }; 88 - }; 89 - }; 90 - };
-62
arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi
··· 1 - // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 - /* 3 - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 - * Author: Alexandre Torgue <alexandre.torgue@st.com> 5 - */ 6 - 7 - #include "stm32mp157-pinctrl.dtsi" 8 - / { 9 - soc { 10 - pinctrl: pin-controller@50002000 { 11 - st,package = <STM32MP_PKG_AB>; 12 - 13 - gpioa: gpio@50002000 { 14 - status = "okay"; 15 - ngpios = <16>; 16 - gpio-ranges = <&pinctrl 0 0 16>; 17 - }; 18 - 19 - gpiob: gpio@50003000 { 20 - status = "okay"; 21 - ngpios = <16>; 22 - gpio-ranges = <&pinctrl 0 16 16>; 23 - }; 24 - 25 - gpioc: gpio@50004000 { 26 - status = "okay"; 27 - ngpios = <16>; 28 - gpio-ranges = <&pinctrl 0 32 16>; 29 - }; 30 - 31 - gpiod: gpio@50005000 { 32 - status = "okay"; 33 - ngpios = <16>; 34 - gpio-ranges = <&pinctrl 0 48 16>; 35 - }; 36 - 37 - gpioe: gpio@50006000 { 38 - status = "okay"; 39 - ngpios = <16>; 40 - gpio-ranges = <&pinctrl 0 64 16>; 41 - }; 42 - 43 - gpiof: gpio@50007000 { 44 - status = "okay"; 45 - ngpios = <6>; 46 - gpio-ranges = <&pinctrl 6 86 6>; 47 - }; 48 - 49 - gpiog: gpio@50008000 { 50 - status = "okay"; 51 - ngpios = <10>; 52 - gpio-ranges = <&pinctrl 6 102 10>; 53 - }; 54 - 55 - gpioh: gpio@50009000 { 56 - status = "okay"; 57 - ngpios = <2>; 58 - gpio-ranges = <&pinctrl 0 112 2>; 59 - }; 60 - }; 61 - }; 62 - };
-78
arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi
··· 1 - // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 - /* 3 - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 - * Author: Alexandre Torgue <alexandre.torgue@st.com> 5 - */ 6 - 7 - #include "stm32mp157-pinctrl.dtsi" 8 - / { 9 - soc { 10 - pinctrl: pin-controller@50002000 { 11 - st,package = <STM32MP_PKG_AC>; 12 - 13 - gpioa: gpio@50002000 { 14 - status = "okay"; 15 - ngpios = <16>; 16 - gpio-ranges = <&pinctrl 0 0 16>; 17 - }; 18 - 19 - gpiob: gpio@50003000 { 20 - status = "okay"; 21 - ngpios = <16>; 22 - gpio-ranges = <&pinctrl 0 16 16>; 23 - }; 24 - 25 - gpioc: gpio@50004000 { 26 - status = "okay"; 27 - ngpios = <16>; 28 - gpio-ranges = <&pinctrl 0 32 16>; 29 - }; 30 - 31 - gpiod: gpio@50005000 { 32 - status = "okay"; 33 - ngpios = <16>; 34 - gpio-ranges = <&pinctrl 0 48 16>; 35 - }; 36 - 37 - gpioe: gpio@50006000 { 38 - status = "okay"; 39 - ngpios = <16>; 40 - gpio-ranges = <&pinctrl 0 64 16>; 41 - }; 42 - 43 - gpiof: gpio@50007000 { 44 - status = "okay"; 45 - ngpios = <16>; 46 - gpio-ranges = <&pinctrl 0 80 16>; 47 - }; 48 - 49 - gpiog: gpio@50008000 { 50 - status = "okay"; 51 - ngpios = <16>; 52 - gpio-ranges = <&pinctrl 0 96 16>; 53 - }; 54 - 55 - gpioh: gpio@50009000 { 56 - status = "okay"; 57 - ngpios = <16>; 58 - gpio-ranges = <&pinctrl 0 112 16>; 59 - }; 60 - 61 - gpioi: gpio@5000a000 { 62 - status = "okay"; 63 - ngpios = <12>; 64 - gpio-ranges = <&pinctrl 0 128 12>; 65 - }; 66 - }; 67 - 68 - pinctrl_z: pin-controller-z@54004000 { 69 - st,package = <STM32MP_PKG_AC>; 70 - 71 - gpioz: gpio@54004000 { 72 - status = "okay"; 73 - ngpios = <8>; 74 - gpio-ranges = <&pinctrl_z 0 400 8>; 75 - }; 76 - }; 77 - }; 78 - };
-62
arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi
··· 1 - // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 - /* 3 - * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 - * Author: Alexandre Torgue <alexandre.torgue@st.com> 5 - */ 6 - 7 - #include "stm32mp157-pinctrl.dtsi" 8 - / { 9 - soc { 10 - pinctrl: pin-controller@50002000 { 11 - st,package = <STM32MP_PKG_AD>; 12 - 13 - gpioa: gpio@50002000 { 14 - status = "okay"; 15 - ngpios = <16>; 16 - gpio-ranges = <&pinctrl 0 0 16>; 17 - }; 18 - 19 - gpiob: gpio@50003000 { 20 - status = "okay"; 21 - ngpios = <16>; 22 - gpio-ranges = <&pinctrl 0 16 16>; 23 - }; 24 - 25 - gpioc: gpio@50004000 { 26 - status = "okay"; 27 - ngpios = <16>; 28 - gpio-ranges = <&pinctrl 0 32 16>; 29 - }; 30 - 31 - gpiod: gpio@50005000 { 32 - status = "okay"; 33 - ngpios = <16>; 34 - gpio-ranges = <&pinctrl 0 48 16>; 35 - }; 36 - 37 - gpioe: gpio@50006000 { 38 - status = "okay"; 39 - ngpios = <16>; 40 - gpio-ranges = <&pinctrl 0 64 16>; 41 - }; 42 - 43 - gpiof: gpio@50007000 { 44 - status = "okay"; 45 - ngpios = <6>; 46 - gpio-ranges = <&pinctrl 6 86 6>; 47 - }; 48 - 49 - gpiog: gpio@50008000 { 50 - status = "okay"; 51 - ngpios = <10>; 52 - gpio-ranges = <&pinctrl 6 102 10>; 53 - }; 54 - 55 - gpioh: gpio@50009000 { 56 - status = "okay"; 57 - ngpios = <2>; 58 - gpio-ranges = <&pinctrl 0 112 2>; 59 - }; 60 - }; 61 - }; 62 - };
+85
arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 + /* 3 + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. 5 + */ 6 + 7 + &pinctrl { 8 + st,package = <STM32MP_PKG_AA>; 9 + 10 + gpioa: gpio@50002000 { 11 + status = "okay"; 12 + ngpios = <16>; 13 + gpio-ranges = <&pinctrl 0 0 16>; 14 + }; 15 + 16 + gpiob: gpio@50003000 { 17 + status = "okay"; 18 + ngpios = <16>; 19 + gpio-ranges = <&pinctrl 0 16 16>; 20 + }; 21 + 22 + gpioc: gpio@50004000 { 23 + status = "okay"; 24 + ngpios = <16>; 25 + gpio-ranges = <&pinctrl 0 32 16>; 26 + }; 27 + 28 + gpiod: gpio@50005000 { 29 + status = "okay"; 30 + ngpios = <16>; 31 + gpio-ranges = <&pinctrl 0 48 16>; 32 + }; 33 + 34 + gpioe: gpio@50006000 { 35 + status = "okay"; 36 + ngpios = <16>; 37 + gpio-ranges = <&pinctrl 0 64 16>; 38 + }; 39 + 40 + gpiof: gpio@50007000 { 41 + status = "okay"; 42 + ngpios = <16>; 43 + gpio-ranges = <&pinctrl 0 80 16>; 44 + }; 45 + 46 + gpiog: gpio@50008000 { 47 + status = "okay"; 48 + ngpios = <16>; 49 + gpio-ranges = <&pinctrl 0 96 16>; 50 + }; 51 + 52 + gpioh: gpio@50009000 { 53 + status = "okay"; 54 + ngpios = <16>; 55 + gpio-ranges = <&pinctrl 0 112 16>; 56 + }; 57 + 58 + gpioi: gpio@5000a000 { 59 + status = "okay"; 60 + ngpios = <16>; 61 + gpio-ranges = <&pinctrl 0 128 16>; 62 + }; 63 + 64 + gpioj: gpio@5000b000 { 65 + status = "okay"; 66 + ngpios = <16>; 67 + gpio-ranges = <&pinctrl 0 144 16>; 68 + }; 69 + 70 + gpiok: gpio@5000c000 { 71 + status = "okay"; 72 + ngpios = <8>; 73 + gpio-ranges = <&pinctrl 0 160 8>; 74 + }; 75 + }; 76 + 77 + &pinctrl_z { 78 + st,package = <STM32MP_PKG_AA>; 79 + 80 + gpioz: gpio@54004000 { 81 + status = "okay"; 82 + ngpios = <8>; 83 + gpio-ranges = <&pinctrl_z 0 400 8>; 84 + }; 85 + };
+57
arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 + /* 3 + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. 5 + */ 6 + 7 + &pinctrl { 8 + st,package = <STM32MP_PKG_AB>; 9 + 10 + gpioa: gpio@50002000 { 11 + status = "okay"; 12 + ngpios = <16>; 13 + gpio-ranges = <&pinctrl 0 0 16>; 14 + }; 15 + 16 + gpiob: gpio@50003000 { 17 + status = "okay"; 18 + ngpios = <16>; 19 + gpio-ranges = <&pinctrl 0 16 16>; 20 + }; 21 + 22 + gpioc: gpio@50004000 { 23 + status = "okay"; 24 + ngpios = <16>; 25 + gpio-ranges = <&pinctrl 0 32 16>; 26 + }; 27 + 28 + gpiod: gpio@50005000 { 29 + status = "okay"; 30 + ngpios = <16>; 31 + gpio-ranges = <&pinctrl 0 48 16>; 32 + }; 33 + 34 + gpioe: gpio@50006000 { 35 + status = "okay"; 36 + ngpios = <16>; 37 + gpio-ranges = <&pinctrl 0 64 16>; 38 + }; 39 + 40 + gpiof: gpio@50007000 { 41 + status = "okay"; 42 + ngpios = <6>; 43 + gpio-ranges = <&pinctrl 6 86 6>; 44 + }; 45 + 46 + gpiog: gpio@50008000 { 47 + status = "okay"; 48 + ngpios = <10>; 49 + gpio-ranges = <&pinctrl 6 102 10>; 50 + }; 51 + 52 + gpioh: gpio@50009000 { 53 + status = "okay"; 54 + ngpios = <2>; 55 + gpio-ranges = <&pinctrl 0 112 2>; 56 + }; 57 + };
+73
arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 + /* 3 + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. 5 + */ 6 + 7 + &pinctrl { 8 + st,package = <STM32MP_PKG_AC>; 9 + 10 + gpioa: gpio@50002000 { 11 + status = "okay"; 12 + ngpios = <16>; 13 + gpio-ranges = <&pinctrl 0 0 16>; 14 + }; 15 + 16 + gpiob: gpio@50003000 { 17 + status = "okay"; 18 + ngpios = <16>; 19 + gpio-ranges = <&pinctrl 0 16 16>; 20 + }; 21 + 22 + gpioc: gpio@50004000 { 23 + status = "okay"; 24 + ngpios = <16>; 25 + gpio-ranges = <&pinctrl 0 32 16>; 26 + }; 27 + 28 + gpiod: gpio@50005000 { 29 + status = "okay"; 30 + ngpios = <16>; 31 + gpio-ranges = <&pinctrl 0 48 16>; 32 + }; 33 + 34 + gpioe: gpio@50006000 { 35 + status = "okay"; 36 + ngpios = <16>; 37 + gpio-ranges = <&pinctrl 0 64 16>; 38 + }; 39 + 40 + gpiof: gpio@50007000 { 41 + status = "okay"; 42 + ngpios = <16>; 43 + gpio-ranges = <&pinctrl 0 80 16>; 44 + }; 45 + 46 + gpiog: gpio@50008000 { 47 + status = "okay"; 48 + ngpios = <16>; 49 + gpio-ranges = <&pinctrl 0 96 16>; 50 + }; 51 + 52 + gpioh: gpio@50009000 { 53 + status = "okay"; 54 + ngpios = <16>; 55 + gpio-ranges = <&pinctrl 0 112 16>; 56 + }; 57 + 58 + gpioi: gpio@5000a000 { 59 + status = "okay"; 60 + ngpios = <12>; 61 + gpio-ranges = <&pinctrl 0 128 12>; 62 + }; 63 + }; 64 + 65 + &pinctrl_z { 66 + st,package = <STM32MP_PKG_AC>; 67 + 68 + gpioz: gpio@54004000 { 69 + status = "okay"; 70 + ngpios = <8>; 71 + gpio-ranges = <&pinctrl_z 0 400 8>; 72 + }; 73 + };
+57
arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 + /* 3 + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved 4 + * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. 5 + */ 6 + 7 + &pinctrl { 8 + st,package = <STM32MP_PKG_AD>; 9 + 10 + gpioa: gpio@50002000 { 11 + status = "okay"; 12 + ngpios = <16>; 13 + gpio-ranges = <&pinctrl 0 0 16>; 14 + }; 15 + 16 + gpiob: gpio@50003000 { 17 + status = "okay"; 18 + ngpios = <16>; 19 + gpio-ranges = <&pinctrl 0 16 16>; 20 + }; 21 + 22 + gpioc: gpio@50004000 { 23 + status = "okay"; 24 + ngpios = <16>; 25 + gpio-ranges = <&pinctrl 0 32 16>; 26 + }; 27 + 28 + gpiod: gpio@50005000 { 29 + status = "okay"; 30 + ngpios = <16>; 31 + gpio-ranges = <&pinctrl 0 48 16>; 32 + }; 33 + 34 + gpioe: gpio@50006000 { 35 + status = "okay"; 36 + ngpios = <16>; 37 + gpio-ranges = <&pinctrl 0 64 16>; 38 + }; 39 + 40 + gpiof: gpio@50007000 { 41 + status = "okay"; 42 + ngpios = <6>; 43 + gpio-ranges = <&pinctrl 6 86 6>; 44 + }; 45 + 46 + gpiog: gpio@50008000 { 47 + status = "okay"; 48 + ngpios = <10>; 49 + gpio-ranges = <&pinctrl 6 102 10>; 50 + }; 51 + 52 + gpioh: gpio@50009000 { 53 + status = "okay"; 54 + ngpios = <2>; 55 + gpio-ranges = <&pinctrl 0 112 2>; 56 + }; 57 + };