[U-Boot] [PATCH 0/4] STM32 gpio/pinctrl update
- Rename stm32f7_gpio to stm32_gpio - Update .bind callback for pinctrl_stm32 driver - Remove useless "st,stm32-gpio" compatible string in DT - Remove .ofmatch callback from stm32_gpio driver
Patrice Chotard (4): gpio: stm32: Rename stm32f7_gpio to stm32_gpio pinctrl: stm32: update .bind callback ARM: dts: stm32: Remove useless "st,stm32-gpio" compatible string gpio: stm32: Remove .ofmatch callback
arch/arm/dts/stm32429i-eval-u-boot.dtsi | 11 ------- arch/arm/dts/stm32f429-disco-u-boot.dtsi | 11 ------- arch/arm/dts/stm32f469-disco-u-boot.dtsi | 11 ------- arch/arm/dts/stm32f7-u-boot.dtsi | 17 ---------- arch/arm/dts/stm32mp157-u-boot.dtsi | 12 ------- drivers/gpio/Kconfig | 4 +-- drivers/gpio/Makefile | 2 +- drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} | 6 ---- drivers/pinctrl/pinctrl_stm32.c | 32 ++++++++++++++++++- 9 files changed, 34 insertions(+), 72 deletions(-) rename drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} (97%)
As this driver is used on stm32f4/f7/h7 and stm32mp1 SoCs, rename it with a more generic name.
Signed-off-by: Patrice Chotard patrice.chotard@st.com ---
drivers/gpio/Kconfig | 4 ++-- drivers/gpio/Makefile | 2 +- drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} (100%)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index e36a8abc42..be073335c2 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -255,13 +255,13 @@ config PIC32_GPIO help Say yes here to support Microchip PIC32 GPIOs.
-config STM32F7_GPIO +config STM32_GPIO bool "ST STM32 GPIO driver" depends on DM_GPIO && (STM32 || ARCH_STM32MP) default y help Device model driver support for STM32 GPIO controller. It should be - usable on many stm32 families like stm32f4 & stm32H7. + usable on many stm32 families like stm32f4/f7/h7 and stm32mp1. Tested on STM32F7.
config MVEBU_GPIO diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 7337153e0e..4a8aa0ff6f 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_ADI_GPIO2) += adi_gpio2.o obj-$(CONFIG_TCA642X) += tca642x.o obj-$(CONFIG_SUNXI_GPIO) += sunxi_gpio.o obj-$(CONFIG_LPC32XX_GPIO) += lpc32xx_gpio.o -obj-$(CONFIG_STM32F7_GPIO) += stm32f7_gpio.o +obj-$(CONFIG_STM32_GPIO) += stm32_gpio.o obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o obj-$(CONFIG_ZYNQ_GPIO) += zynq_gpio.o obj-$(CONFIG_VYBRID_GPIO) += vybrid_gpio.o diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32_gpio.c similarity index 100% rename from drivers/gpio/stm32f7_gpio.c rename to drivers/gpio/stm32_gpio.c
Hi Patrice,
From: Patrice CHOTARD patrice.chotard@st.com Sent: vendredi 21 juin 2019 15:39
As this driver is used on stm32f4/f7/h7 and stm32mp1 SoCs, rename it with a more generic name.
Signed-off-by: Patrice Chotard patrice.chotard@st.com
Reviewed-by: Patrick Delaunay patrick.delaunay@st.com
drivers/gpio/Kconfig | 4 ++-- drivers/gpio/Makefile | 2 +- drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename drivers/gpio/{stm32f7_gpio.c => stm32_gpio.c} (100%)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index e36a8abc42..be073335c2 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -255,13 +255,13 @@ config PIC32_GPIO help Say yes here to support Microchip PIC32 GPIOs.
-config STM32F7_GPIO +config STM32_GPIO bool "ST STM32 GPIO driver" depends on DM_GPIO && (STM32 || ARCH_STM32MP) default y help Device model driver support for STM32 GPIO controller. It should be
usable on many stm32 families like stm32f4 & stm32H7.
usable on many stm32 families like stm32f4/f7/h7 and stm32mp1.config MVEBU_GPIO diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 7337153e0e..4a8aa0ff6f 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_ADI_GPIO2) += adi_gpio2.o obj-$(CONFIG_TCA642X) += tca642x.o obj-$(CONFIG_SUNXI_GPIO) += sunxi_gpio.o obj-$(CONFIG_LPC32XX_GPIO) += lpc32xx_gpio.o -obj-$(CONFIG_STM32F7_GPIO) += stm32f7_gpio.o +obj-$(CONFIG_STM32_GPIO) += stm32_gpio.o obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o obj-$(CONFIG_ZYNQ_GPIO) += zynq_gpio.o obj-$(CONFIG_VYBRID_GPIO) += vybrid_gpio.o diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32_gpio.c similarity index 100% rename from drivers/gpio/stm32f7_gpio.c rename to drivers/gpio/stm32_gpio.c -- 2.17.1
Regards
Patrick
Update .bind callback in order to bind all pinctrl subnodes with "gpio-controller" property to gpio_stm32 driver.
Signed-off-by: Patrice Chotard patrice.chotard@st.com ---
drivers/pinctrl/pinctrl_stm32.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c index 43dbdd9d6a..e2e7be01ed 100644 --- a/drivers/pinctrl/pinctrl_stm32.c +++ b/drivers/pinctrl/pinctrl_stm32.c @@ -1,5 +1,6 @@ #include <common.h> #include <dm.h> +#include <dm/lists.h> #include <dm/pinctrl.h> #include <hwspinlock.h> #include <asm/arch/gpio.h> @@ -364,6 +365,35 @@ static int stm32_pinctrl_config(int offset) return 0; }
+static int stm32_pinctrl_bind(struct udevice *dev) +{ + ofnode node; + const char *name; + int ret; + + dev_for_each_subnode(node, dev) { + debug("%s: bind %s\n", __func__, ofnode_get_name(node)); + + ofnode_get_property(node, "gpio-controller", &ret); + if (ret < 0) + continue; + /* Get the name of each gpio node */ + name = ofnode_get_name(node); + if (!name) + return -EINVAL; + + /* Bind each gpio node */ + ret = device_bind_driver_to_node(dev, "gpio_stm32", + name, node, NULL); + if (ret) + return ret; + + debug("%s: bind %s\n", __func__, name); + } + + return 0; +} + #if CONFIG_IS_ENABLED(PINCTRL_FULL) static int stm32_pinctrl_set_state(struct udevice *dev, struct udevice *config) { @@ -433,7 +463,7 @@ U_BOOT_DRIVER(pinctrl_stm32) = { .id = UCLASS_PINCTRL, .of_match = stm32_pinctrl_ids, .ops = &stm32_pinctrl_ops, - .bind = dm_scan_fdt_dev, + .bind = stm32_pinctrl_bind, .probe = stm32_pinctrl_probe, .priv_auto_alloc_size = sizeof(struct stm32_pinctrl_priv), };
Hi Patrice,
From: Patrice CHOTARD patrice.chotard@st.com Sent: vendredi 21 juin 2019 15:39
Update .bind callback in order to bind all pinctrl subnodes with "gpio-controller" property to gpio_stm32 driver.
Signed-off-by: Patrice Chotard patrice.chotard@st.com
Reviewed-by: Patrick Delaunay patrick.delaunay@st.com
drivers/pinctrl/pinctrl_stm32.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c index 43dbdd9d6a..e2e7be01ed 100644 --- a/drivers/pinctrl/pinctrl_stm32.c +++ b/drivers/pinctrl/pinctrl_stm32.c @@ -1,5 +1,6 @@ #include <common.h> #include <dm.h> +#include <dm/lists.h> #include <dm/pinctrl.h> #include <hwspinlock.h> #include <asm/arch/gpio.h> @@ -364,6 +365,35 @@ static int stm32_pinctrl_config(int offset) return 0; }
+static int stm32_pinctrl_bind(struct udevice *dev) {
- ofnode node;
- const char *name;
- int ret;
- dev_for_each_subnode(node, dev) {
debug("%s: bind %s\n", __func__, ofnode_get_name(node));ofnode_get_property(node, "gpio-controller", &ret);if (ret < 0)continue;/* Get the name of each gpio node */name = ofnode_get_name(node);if (!name)return -EINVAL;/* Bind each gpio node */ret = device_bind_driver_to_node(dev, "gpio_stm32",name, node, NULL);if (ret)return ret;debug("%s: bind %s\n", __func__, name);- }
- return 0;
+}
#if CONFIG_IS_ENABLED(PINCTRL_FULL) static int stm32_pinctrl_set_state(struct udevice *dev, struct udevice *config) { @@ -433,7 +463,7 @@ U_BOOT_DRIVER(pinctrl_stm32) = { .id = UCLASS_PINCTRL, .of_match = stm32_pinctrl_ids, .ops = &stm32_pinctrl_ops,
- .bind = dm_scan_fdt_dev,
- .bind = stm32_pinctrl_bind, .probe = stm32_pinctrl_probe, .priv_auto_alloc_size = sizeof(struct stm32_pinctrl_priv),
};
2.17.1
Regards Patrick
Since pinctrl_stm32 driver update, each gpio bank is now binded by pinctrl driver. The compatible string "st,stm32-gpio" becomes useless, remove it.
Signed-off-by: Patrice Chotard patrice.chotard@st.com ---
arch/arm/dts/stm32429i-eval-u-boot.dtsi | 11 ----------- arch/arm/dts/stm32f429-disco-u-boot.dtsi | 11 ----------- arch/arm/dts/stm32f469-disco-u-boot.dtsi | 11 ----------- arch/arm/dts/stm32f7-u-boot.dtsi | 17 ----------------- arch/arm/dts/stm32mp157-u-boot.dtsi | 12 ------------ 5 files changed, 62 deletions(-)
diff --git a/arch/arm/dts/stm32429i-eval-u-boot.dtsi b/arch/arm/dts/stm32429i-eval-u-boot.dtsi index 6da0a636c1..fe437bbfe2 100644 --- a/arch/arm/dts/stm32429i-eval-u-boot.dtsi +++ b/arch/arm/dts/stm32429i-eval-u-boot.dtsi @@ -92,57 +92,46 @@ };
&gpioa { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiob { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioc { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiod { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioe { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiof { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiog { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioh { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioi { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioj { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiok { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
diff --git a/arch/arm/dts/stm32f429-disco-u-boot.dtsi b/arch/arm/dts/stm32f429-disco-u-boot.dtsi index 0cc3100440..52f80320bc 100644 --- a/arch/arm/dts/stm32f429-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f429-disco-u-boot.dtsi @@ -79,57 +79,46 @@ };
&gpioa { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiob { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioc { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiod { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioe { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiof { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiog { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioh { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioi { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioj { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiok { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
diff --git a/arch/arm/dts/stm32f469-disco-u-boot.dtsi b/arch/arm/dts/stm32f469-disco-u-boot.dtsi index 3da308e6a4..2409cf746a 100644 --- a/arch/arm/dts/stm32f469-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f469-disco-u-boot.dtsi @@ -94,57 +94,46 @@ };
&gpioa { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiob { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioc { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiod { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioe { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiof { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiog { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioh { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioi { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioj { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiok { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi index 29b157324e..3ba7f8410d 100644 --- a/arch/arm/dts/stm32f7-u-boot.dtsi +++ b/arch/arm/dts/stm32f7-u-boot.dtsi @@ -65,58 +65,41 @@ };
&gpioa { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiob { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioc { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiod { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioe { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiof { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiog { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioh { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioi { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
-&gpioj { - compatible = "st,stm32-gpio"; -}; - -&gpiok { - compatible = "st,stm32-gpio"; -}; - &pinctrl { u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/stm32mp157-u-boot.dtsi b/arch/arm/dts/stm32mp157-u-boot.dtsi index 09560e2d91..66dc6df787 100644 --- a/arch/arm/dts/stm32mp157-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157-u-boot.dtsi @@ -82,62 +82,50 @@ };
&gpioa { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiob { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioc { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiod { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioe { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiof { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiog { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioh { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioi { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioj { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpiok { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
&gpioz { - compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc; };
Hi Patrice,
From: Patrice CHOTARD patrice.chotard@st.com Sent: vendredi 21 juin 2019 15:39
Since pinctrl_stm32 driver update, each gpio bank is now binded by pinctrl driver. The compatible string "st,stm32-gpio" becomes useless, remove it.
Signed-off-by: Patrice Chotard patrice.chotard@st.com
Reviewed-by: Patrick Delaunay patrick.delaunay@st.com
arch/arm/dts/stm32429i-eval-u-boot.dtsi | 11 ----------- arch/arm/dts/stm32f429- disco-u-boot.dtsi | 11 ----------- arch/arm/dts/stm32f469-disco-u-boot.dtsi | 11 -----
arch/arm/dts/stm32f7-u-boot.dtsi | 17 ----------------- arch/arm/dts/stm32mp157-u-boot.dtsi | 12 ------------ 5 files changed, 62 deletions(-)
diff --git a/arch/arm/dts/stm32429i-eval-u-boot.dtsi b/arch/arm/dts/stm32429i-eval- u-boot.dtsi index 6da0a636c1..fe437bbfe2 100644 --- a/arch/arm/dts/stm32429i-eval-u-boot.dtsi +++ b/arch/arm/dts/stm32429i-eval-u-boot.dtsi @@ -92,57 +92,46 @@ };
&gpioa {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiob {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioc {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiod {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioe {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiof {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiog {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioh {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioi {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioj {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiok {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/stm32f429-disco-u-boot.dtsi b/arch/arm/dts/stm32f429- disco-u-boot.dtsi index 0cc3100440..52f80320bc 100644 --- a/arch/arm/dts/stm32f429-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f429-disco-u-boot.dtsi @@ -79,57 +79,46 @@ };
&gpioa {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiob {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioc {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiod {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioe {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiof {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiog {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioh {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioi {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioj {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiok {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/stm32f469-disco-u-boot.dtsi b/arch/arm/dts/stm32f469- disco-u-boot.dtsi index 3da308e6a4..2409cf746a 100644 --- a/arch/arm/dts/stm32f469-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f469-disco-u-boot.dtsi @@ -94,57 +94,46 @@ };
&gpioa {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiob {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioc {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiod {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioe {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiof {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiog {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioh {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioi {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioj {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiok {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi index 29b157324e..3ba7f8410d 100644 --- a/arch/arm/dts/stm32f7-u-boot.dtsi +++ b/arch/arm/dts/stm32f7-u-boot.dtsi @@ -65,58 +65,41 @@ };
&gpioa {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiob {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioc {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiod {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioe {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiof {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiog {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioh {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioi {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
-&gpioj {
- compatible = "st,stm32-gpio";
-};
-&gpiok {
- compatible = "st,stm32-gpio";
-};
&pinctrl { u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/stm32mp157-u-boot.dtsi b/arch/arm/dts/stm32mp157-u- boot.dtsi index 09560e2d91..66dc6df787 100644 --- a/arch/arm/dts/stm32mp157-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157-u-boot.dtsi @@ -82,62 +82,50 @@ };
&gpioa {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiob {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioc {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiod {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioe {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiof {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiog {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioh {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioi {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioj {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpiok {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
&gpioz {
- compatible = "st,stm32-gpio"; u-boot,dm-pre-reloc;
};
-- 2.17.1
Regards Patrick
As compatible string "st,stm32-gpio" is no more used, .ofmatch callback becomes useless, remove it.
Signed-off-by: Patrice Chotard patrice.chotard@st.com
---
drivers/gpio/stm32_gpio.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c index 5c9f2fe64d..226f350b1a 100644 --- a/drivers/gpio/stm32_gpio.c +++ b/drivers/gpio/stm32_gpio.c @@ -210,15 +210,9 @@ static int gpio_stm32_probe(struct udevice *dev) return 0; }
-static const struct udevice_id stm32_gpio_ids[] = { - { .compatible = "st,stm32-gpio" }, - { } -}; - U_BOOT_DRIVER(gpio_stm32) = { .name = "gpio_stm32", .id = UCLASS_GPIO, - .of_match = stm32_gpio_ids, .probe = gpio_stm32_probe, #ifndef CONFIG_SPL_BUILD .ops = &gpio_stm32_ops,
Hi Patrice,
From: Patrice CHOTARD patrice.chotard@st.com Sent: vendredi 21 juin 2019 15:39
As compatible string "st,stm32-gpio" is no more used, .ofmatch callback becomes useless, remove it.
Signed-off-by: Patrice Chotard patrice.chotard@st.com
Reviewed-by: Patrick Delaunay patrick.delaunay@st.com
drivers/gpio/stm32_gpio.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c index 5c9f2fe64d..226f350b1a 100644 --- a/drivers/gpio/stm32_gpio.c +++ b/drivers/gpio/stm32_gpio.c @@ -210,15 +210,9 @@ static int gpio_stm32_probe(struct udevice *dev) return 0; }
-static const struct udevice_id stm32_gpio_ids[] = {
- { .compatible = "st,stm32-gpio" },
- { }
-};
U_BOOT_DRIVER(gpio_stm32) = { .name = "gpio_stm32", .id = UCLASS_GPIO,
- .of_match = stm32_gpio_ids, .probe = gpio_stm32_probe,
#ifndef CONFIG_SPL_BUILD .ops = &gpio_stm32_ops, -- 2.17.1
Regards Patrick
participants (2)
-
Patrice Chotard -
Patrick DELAUNAY