dm: gpio: Add of-platdata support

Add support for accessing GPIOs using of-plata. This uses the same
mechanism as for clocks, but allows use of the xlate() method so that
the driver can interpret the parameters.

Update the condition for GPIO_HOG so that it is not built into SPL,
since it needs SPL_OF_REAL which is not enabled in sandbox_spl.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 1fc9c9bdfc78669b703fc62d1ac9a817377bf06d..66b813faadb8fc54591080814834a45d590386fc 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -66,7 +66,7 @@
        };
 
        gpio_b: gpios@1 {
-               u-boot,dm-pre-proper;
+               u-boot,dm-spl;
                gpio-controller;
                compatible = "sandbox,gpio";
                #gpio-cells = <2>;
@@ -74,6 +74,12 @@
                sandbox,gpio-count = <10>;
        };
 
+       gpio-test {
+               u-boot,dm-spl;
+               compatible = "sandbox,gpio-test";
+               test-gpios = <&gpio_b 3 0>;
+       };
+
        hexagon {
                compatible = "demo-simple";
                colour = "white";

diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig
index 6469260b53bfb95219ddcd447a2ee1dc999133de..b3584563d245deabf51b4f54c7c2e24f4f5552a7 100644 (file)
--- a/configs/sandbox_noinst_defconfig
+++ b/configs/sandbox_noinst_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SYS_TEXT_BASE=0x200000
+CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
@@ -122,6 +123,7 @@ CONFIG_SANDBOX_GPIO=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_DM_I2C_GPIO=y
+# CONFIG_SPL_DM_I2C_GPIO is not set
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 3e9877c3ecfafd143441f9f7cc97340f8e4e555b..73cf5dd2b0457e43a492a7d4230a7d3aa579a226 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SYS_TEXT_BASE=0x200000
+CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
@@ -124,6 +125,7 @@ CONFIG_SANDBOX_GPIO=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_DM_I2C_GPIO=y
+# CONFIG_SPL_DM_I2C_GPIO is not set
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 58f4704f6bc0c77d7e05a237759eb9270df8e6a7..18917488c212e57ae26be9c1ad0764628d4dec98 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_ROCKCHIP_GPIO)   += rk_gpio.o
 obj-$(CONFIG_RCAR_GPIO)                += gpio-rcar.o
 obj-$(CONFIG_RZA1_GPIO)                += gpio-rza1.o
 obj-$(CONFIG_S5P)              += s5p_gpio.o
-obj-$(CONFIG_SANDBOX_GPIO)     += sandbox.o
+obj-$(CONFIG_SANDBOX_GPIO)     += sandbox.o sandbox_test.o
 obj-$(CONFIG_TEGRA_GPIO)       += tegra_gpio.o
 obj-$(CONFIG_TEGRA186_GPIO)    += tegra186_gpio.o
 obj-$(CONFIG_DA8XX_GPIO)       += da8xx_gpio.o
@@ -62,7 +62,7 @@ obj-$(CONFIG_OCTEON_GPIO)     += octeon_gpio.o
 obj-$(CONFIG_MVEBU_GPIO)       += mvebu_gpio.o
 obj-$(CONFIG_MSM_GPIO)         += msm_gpio.o
 obj-$(CONFIG_$(SPL_)PCF8575_GPIO)      += pcf8575_gpio.o
-obj-$(CONFIG_PM8916_GPIO)      += pm8916_gpio.o
+obj-$(CONFIG_$(SPL_TPL_)PM8916_GPIO)   += pm8916_gpio.o
 obj-$(CONFIG_MT7620_GPIO)      += mt7620_gpio.o
 obj-$(CONFIG_MT7621_GPIO)      += mt7621_gpio.o
 obj-$(CONFIG_MSCC_SGPIO)       += mscc_sgpio.o

diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index e0d3ae6f8cf86cbd00c04d609dce49986c0197cc..bb2f23241edba54f6baddc051c6ad14ee9cf09e5 100644 (file)
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dt-structs.h>
 #include <log.h>
 #include <dm/devres.h>
 #include <dm/device_compat.h>
@@ -231,7 +232,7 @@ static int gpio_find_and_xlate(struct gpio_desc *desc,
                return gpio_xlate_offs_flags(desc->dev, desc, args);
 }
 
-#if defined(CONFIG_GPIO_HOG)
+#if CONFIG_IS_ENABLED(GPIO_HOG)
 
 struct gpio_hog_priv {
        struct gpio_desc gpiod;
@@ -1226,6 +1227,27 @@ int gpio_get_list_count(struct udevice *dev, const char *list_name)
 }
 #endif /* OF_PLATDATA */
 
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+int gpio_request_by_phandle(struct udevice *dev,
+                           const struct phandle_2_arg *cells,
+                           struct gpio_desc *desc, int flags)
+{
+       struct ofnode_phandle_args args;
+       struct udevice *gpio_dev;
+       const int index = 0;
+       int ret;
+
+       ret = device_get_by_ofplat_idx(cells->idx, &gpio_dev);
+       if (ret)
+               return ret;
+       args.args[0] = cells->arg[0];
+       args.args[1] = cells->arg[1];
+
+       return gpio_request_tail(ret, NULL, &args, NULL, index, desc, flags,
+                                index > 0, gpio_dev);
+}
+#endif
+
 int dm_gpio_free(struct udevice *dev, struct gpio_desc *desc)
 {
        /* For now, we don't do any checking of dev */
@@ -1430,7 +1452,7 @@ static int gpio_post_bind(struct udevice *dev)
        }
 #endif
 
-       if (IS_ENABLED(CONFIG_GPIO_HOG)) {
+       if (CONFIG_IS_ENABLED(OF_REAL) && IS_ENABLED(CONFIG_GPIO_HOG)) {
                dev_for_each_subnode(node, dev) {
                        if (ofnode_read_bool(node, "gpio-hog")) {
                                const char *name = ofnode_get_name(node);

diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index d008fdd22249c2def99861f32276fec682792b5d..106b2a7b27c25edec466a0649aa372b553731166 100644 (file)
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -323,11 +323,13 @@ static const struct dm_gpio_ops gpio_sandbox_ops = {
 
 static int sandbox_gpio_of_to_plat(struct udevice *dev)
 {
-       struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       if (CONFIG_IS_ENABLED(OF_REAL)) {
+               struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
-       uc_priv->gpio_count = dev_read_u32_default(dev, "sandbox,gpio-count",
-                                                  0);
-       uc_priv->bank_name = dev_read_string(dev, "gpio-bank-name");
+               uc_priv->gpio_count =
+                       dev_read_u32_default(dev, "sandbox,gpio-count", 0);
+               uc_priv->bank_name = dev_read_string(dev, "gpio-bank-name");
+       }
 
        return 0;
 }
@@ -371,6 +373,8 @@ U_BOOT_DRIVER(sandbox_gpio) = {
 
 DM_DRIVER_ALIAS(sandbox_gpio, sandbox_gpio_alias)
 
+#if CONFIG_IS_ENABLED(PINCTRL)
+
 /* pincontrol: used only to check GPIO pin configuration (pinmux command) */
 
 struct sb_pinctrl_priv {
@@ -579,3 +583,5 @@ U_BOOT_DRIVER(sandbox_pinctrl_gpio) = {
        .priv_auto      = sizeof(struct sb_pinctrl_priv),
        ACPI_OPS_PTR(&pinctrl_sandbox_acpi_ops)
 };
+
+#endif /* PINCTRL */

diff --git a/drivers/gpio/sandbox_test.c b/drivers/gpio/sandbox_test.c
new file mode 100644 (file)
index 0000000..c76e199
--- /dev/null
+++ b/drivers/gpio/sandbox_test.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Sandbox driver for testing GPIOs with of-platdata
+ *
+ * Copyright 2021 Google LLC
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <asm-generic/gpio.h>
+
+static const struct udevice_id sandbox_gpio_test_ids[] = {
+       { .compatible = "sandbox,gpio-test" },
+       { }
+};
+
+U_BOOT_DRIVER(sandbox_gpio_test) = {
+       .name = "sandbox_gpio_test",
+       .id = UCLASS_MISC,
+       .of_match = sandbox_gpio_test_ids,
+};

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index e33cde7abdda95e4b797ef1316f1c267c399f837..6de13d925eb01b4cb7dfe191fbdf1adfe79cd1ca 100644 (file)
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -608,6 +608,11 @@ int gpio_request_list_by_name(struct udevice *dev, const char *list_name,
  */
 int dm_gpio_request(struct gpio_desc *desc, const char *label);
 
+struct phandle_2_arg;
+int gpio_request_by_phandle(struct udevice *dev,
+                           const struct phandle_2_arg *cells,
+                           struct gpio_desc *desc, int flags);
+
 /**
  * gpio_get_list_count() - Returns the number of GPIOs in a list
  *

diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c
index 082989021d9806bddfd7136d4c2dd2059f1cc149..ec41087a558c41a06a1a969ce3455b16e2e24908 100644 (file)
--- a/test/dm/of_platdata.c
+++ b/test/dm/of_platdata.c
@@ -8,6 +8,7 @@
 #include <dm/test.h>
 #include <test/test.h>
 #include <test/ut.h>
+#include <asm-generic/gpio.h>
 #include <asm/global_data.h>
 
 /* Test that we can find a device using of-platdata */
@@ -259,3 +260,22 @@ static int dm_test_of_plat_irq(struct unit_test_state *uts)
        return 0;
 }
 DM_TEST(dm_test_of_plat_irq, UT_TESTF_SCAN_PDATA);
+
+/* Test GPIOs with of-platdata */
+static int dm_test_of_plat_gpio(struct unit_test_state *uts)
+{
+       struct dtd_sandbox_gpio_test *plat;
+       struct udevice *dev;
+       struct gpio_desc desc;
+
+       ut_assertok(uclass_get_device_by_name(UCLASS_MISC, "sandbox_gpio_test",
+                                             &dev));
+       plat = dev_get_plat(dev);
+
+       ut_assertok(gpio_request_by_phandle(dev, &plat->test_gpios[0], &desc,
+                                           GPIOD_IS_OUT));
+       ut_asserteq_str("sandbox_gpio", desc.dev->name);
+
+       return 0;
+}
+DM_TEST(dm_test_of_plat_gpio, UT_TESTF_SCAN_PDATA);