Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b725e262 authored by Alexandre Torgue's avatar Alexandre Torgue
Browse files

ARM: dts: stm32: use dedicated files to manage stm32mp157 packages 



Four packages exist for stm32mp157 die. As ball-out is different between
them, this patch covers those differences by creating dedicated pinctrl
dtsi files. Each dtsi pinctrl package file describes the package ball-out
through gpio-ranges.

stm32mp157a-dk1 / dk2 boards embed a STM32MP_PKG_AC (TFBGA361 (12*12))
package.

stm32mp157c-ed1 / ev1 boards embed a STM32MP_PKG_AA (LFBGA448 (18*18))
package.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
parent a188339c

arch/arm/boot/dts/stm32mp157-pinctrl.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
				st,bank-name = "GPIOA";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 0 16>;

				status = "disabled";

			};



			gpiob: gpio@50003000 {
@@ -38,6 +39,7 @@ 
				st,bank-name = "GPIOB";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 16 16>;

				status = "disabled";

			};



			gpioc: gpio@50004000 {
@@ -50,6 +52,7 @@ 
				st,bank-name = "GPIOC";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 32 16>;

				status = "disabled";

			};



			gpiod: gpio@50005000 {
@@ -62,6 +65,7 @@ 
				st,bank-name = "GPIOD";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 48 16>;

				status = "disabled";

			};



			gpioe: gpio@50006000 {
@@ -74,6 +78,7 @@ 
				st,bank-name = "GPIOE";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 64 16>;

				status = "disabled";

			};



			gpiof: gpio@50007000 {
@@ -86,6 +91,7 @@ 
				st,bank-name = "GPIOF";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 80 16>;

				status = "disabled";

			};



			gpiog: gpio@50008000 {
@@ -98,6 +104,7 @@ 
				st,bank-name = "GPIOG";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 96 16>;

				status = "disabled";

			};



			gpioh: gpio@50009000 {
@@ -110,6 +117,7 @@ 
				st,bank-name = "GPIOH";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 112 16>;

				status = "disabled";

			};



			gpioi: gpio@5000a000 {
@@ -122,6 +130,7 @@ 
				st,bank-name = "GPIOI";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 128 16>;

				status = "disabled";

			};



			gpioj: gpio@5000b000 {
@@ -134,6 +143,7 @@ 
				st,bank-name = "GPIOJ";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 144 16>;

				status = "disabled";

			};



			gpiok: gpio@5000c000 {
@@ -146,6 +156,7 @@ 
				st,bank-name = "GPIOK";

				ngpios = <8>;

				gpio-ranges = <&pinctrl 0 160 8>;

				status = "disabled";

			};



			cec_pins_a: cec-0 {
@@ -621,6 +632,7 @@ 
				st,bank-ioport = <11>;

				ngpios = <8>;

				gpio-ranges = <&pinctrl_z 0 400 8>;

				status = "disabled";

			};



			i2c4_pins_a: i2c4-0 {

arch/arm/boot/dts/stm32mp157a-dk1.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
/dts-v1/;



#include "stm32mp157c.dtsi"

#include "stm32mp157-pinctrl.dtsi"

#include "stm32mp157xac-pinctrl.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/mfd/st,stpmic1.h>

arch/arm/boot/dts/stm32mp157c-ed1.dts

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
/dts-v1/;



#include "stm32mp157c.dtsi"

#include "stm32mp157-pinctrl.dtsi"

#include "stm32mp157xaa-pinctrl.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/mfd/st,stpmic1.h>

arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi

0 → 100644
+90 −0
Original line number Diff line number Diff line 
// 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>;

			};

		};

	};

};

arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi

0 → 100644
+62 −0
Original line number Diff line number Diff line 
// 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>;

			};

		};

	};

};