The old deprecated device tree binding for the spi-gpio driver uses
"gpio-sck", "gpio-mosi" and "gpio-miso" to specify the GPIOs. Switch to
the new binding which uses the standard GPIO property names.
The old binding is still used in some device trees, but none of the SoCs
using them is actually supported in barebox, so do not bother to keep a
fallback to the old binding. The one in-tree user of the old binding is
converted in this patch.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/dts/stm32mp151-mect1s.dts | 6 +++---
arch/sandbox/dts/sandbox-libftdi-example.dtsi | 6 +++---
drivers/spi/gpio_spi.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/stm32mp151-mect1s.dts b/arch/arm/dts/stm32mp151-mect1s.dts
index 4d0e31d189..b0dc1cfaa8 100644
--- a/arch/arm/dts/stm32mp151-mect1s.dts
+++ b/arch/arm/dts/stm32mp151-mect1s.dts
@@ -65,9 +65,9 @@ led-1 {
spi_gpio: spi-gpio-0 {
compatible = "spi-gpio";
- gpio-sck = <&gpioi 1 GPIO_ACTIVE_HIGH>;
- gpio-mosi = <&gpioi 3 GPIO_ACTIVE_HIGH>;
- gpio-miso = <&gpioi 2 GPIO_ACTIVE_HIGH>;
+ sck-gpios = <&gpioi 1 GPIO_ACTIVE_HIGH>;
+ mosi-gpios = <&gpioi 3 GPIO_ACTIVE_HIGH>;
+ miso-gpios = <&gpioi 2 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpioj 3 GPIO_ACTIVE_LOW>;
num-chipselects = <1>;
#address-cells = <1>;
diff --git a/arch/sandbox/dts/sandbox-libftdi-example.dtsi b/arch/sandbox/dts/sandbox-libftdi-example.dtsi
index c1c3074097..0a1bb0bb82 100644
--- a/arch/sandbox/dts/sandbox-libftdi-example.dtsi
+++ b/arch/sandbox/dts/sandbox-libftdi-example.dtsi
@@ -25,9 +25,9 @@ spi0: spi0 {
#address-cells = <1>;
#size-cells = <0>;
- gpio-sck = <&gpio0 0 GPIO_ACTIVE_HIGH>;
- gpio-mosi = <&gpio0 1 GPIO_ACTIVE_HIGH>;
- gpio-miso = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+ sck-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+ mosi-gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+ miso-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
diff --git a/drivers/spi/gpio_spi.c b/drivers/spi/gpio_spi.c
index d23abf3dfb..417e8db30e 100644
--- a/drivers/spi/gpio_spi.c
+++ b/drivers/spi/gpio_spi.c
@@ -177,7 +177,7 @@ static int gpio_spi_of_probe(struct device *dev)
if (!IS_ENABLED(CONFIG_OFDEVICE) || dev->platform_data)
return 0;
- sck = of_get_named_gpio(np, "gpio-sck", 0);
+ sck = of_get_named_gpio(np, "sck-gpios", 0);
if (!gpio_is_valid(sck))
return dev_err_probe(dev, sck < 0 ? sck : -EINVAL,
"missing mandatory SCK gpio\n");
@@ -186,11 +186,11 @@ static int gpio_spi_of_probe(struct device *dev)
pdata->sck = sck;
pdata->num_cs = MAX_CHIPSELECT;
- pdata->miso = of_get_named_gpio(np, "gpio-miso", 0);
+ pdata->miso = of_get_named_gpio(np, "miso-gpios", 0);
if (!gpio_is_valid(pdata->miso))
pdata->miso = SPI_GPIO_NO_MISO;
- pdata->mosi = of_get_named_gpio(np, "gpio-mosi", 0);
+ pdata->mosi = of_get_named_gpio(np, "mosi-gpios", 0);
if (!gpio_is_valid(pdata->mosi))
pdata->mosi = SPI_GPIO_NO_MOSI;
--
2.39.5
