[U-Boot,v2,10/15] pinctrl: stm32: update pincontrol for stmp32mp157

Message ID 1520847978-24321-11-git-send-email-patrick.delaunay@st.com
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • arm: stm32mp1: add initial support for STM32MP157
Related show

Commit Message

Patrick DELAUNAY March 12, 2018, 9:46 a.m.
- add the 2 new compatible used by STM32MP157
	"st,stm32mp157-pinctrl"
	"st,stm32mp157-z-pinctrl"
- update the mask for the port

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

Changes in v2: None

 drivers/pinctrl/pinctrl_stm32.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Tom Rini March 19, 2018, 10:36 p.m. | #1
On Mon, Mar 12, 2018 at 10:46:13AM +0100, Patrick Delaunay wrote:

> - add the 2 new compatible used by STM32MP157
> 	"st,stm32mp157-pinctrl"
> 	"st,stm32mp157-z-pinctrl"
> - update the mask for the port
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

Applied to u-boot/master, thanks!

Patch

diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 2066e11..31285cd 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -41,9 +41,10 @@  static int stm32_gpio_config(struct gpio_desc *desc,
 
 	return 0;
 }
+
 static int prep_gpio_dsc(struct stm32_gpio_dsc *gpio_dsc, u32 port_pin)
 {
-	gpio_dsc->port = (port_pin & 0xF000) >> 12;
+	gpio_dsc->port = (port_pin & 0x1F000) >> 12;
 	gpio_dsc->pin = (port_pin & 0x0F00) >> 8;
 	debug("%s: GPIO:port= %d, pin= %d\n", __func__, gpio_dsc->port,
 	      gpio_dsc->pin);
@@ -115,11 +116,13 @@  static int stm32_pinctrl_config(int offset)
 			return -EINVAL;
 		for (i = 0; i < len; i++) {
 			struct gpio_desc desc;
+
 			debug("%s: pinmux = %x\n", __func__, *(pin_mux + i));
 			prep_gpio_dsc(&gpio_dsc, *(pin_mux + i));
 			prep_gpio_ctl(&gpio_ctl, *(pin_mux + i), offset);
 			rv = uclass_get_device_by_seq(UCLASS_GPIO,
-						      gpio_dsc.port, &desc.dev);
+						      gpio_dsc.port,
+						      &desc.dev);
 			if (rv)
 				return rv;
 			desc.offset = gpio_dsc.pin;
@@ -186,6 +189,8 @@  static const struct udevice_id stm32_pinctrl_ids[] = {
 	{ .compatible = "st,stm32f469-pinctrl" },
 	{ .compatible = "st,stm32f746-pinctrl" },
 	{ .compatible = "st,stm32h743-pinctrl" },
+	{ .compatible = "st,stm32mp157-pinctrl" },
+	{ .compatible = "st,stm32mp157-z-pinctrl" },
 	{ }
 };