ARM: spitz: Use software nodes to describe MMC GPIOs

Convert Spitz to use software nodes for specifying GPIOs for the MMC.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240628180852.1738922-9-dmitry.torokhov@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index e2758c94fd77faf60f086c1a38dd667ab92fae86..d050a4c78f97eed5f2c0c0467870e39d3079fde5 100644 (file)
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -48,7 +48,7 @@ struct platform_device pxa_device_pmu = {
        .num_resources  = 1,
 };
 
-static struct resource pxamci_resources[] = {
+static const struct resource pxamci_resources[] = {
        [0] = {
                .start  = 0x41100000,
                .end    = 0x41100fff,
@@ -61,22 +61,26 @@ static struct resource pxamci_resources[] = {
        },
 };
 
-static u64 pxamci_dmamask = 0xffffffffUL;
-
-struct platform_device pxa_device_mci = {
-       .name           = "pxa2xx-mci",
-       .id             = 0,
-       .dev            = {
-               .dma_mask = &pxamci_dmamask,
-               .coherent_dma_mask = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(pxamci_resources),
-       .resource       = pxamci_resources,
-};
-
-void __init pxa_set_mci_info(struct pxamci_platform_data *info)
+void __init pxa_set_mci_info(const struct pxamci_platform_data *info,
+                            const struct property_entry *props)
 {
-       pxa_register_device(&pxa_device_mci, info);
+       const struct platform_device_info mci_info = {
+               .name           = "pxa2xx-mci",
+               .id             = 0,
+               .res            = pxamci_resources,
+               .num_res        = ARRAY_SIZE(pxamci_resources),
+               .data           = info,
+               .size_data      = sizeof(*info),
+               .dma_mask       = 0xffffffffUL,
+               .properties     = props,
+       };
+       struct platform_device *mci_dev;
+       int err;
+
+       mci_dev = platform_device_register_full(&mci_info);
+       err = PTR_ERR_OR_ZERO(mci_dev);
+       if (err)
+               pr_err("Unable to create mci device: %d\n", err);
 }
 
 static struct pxa2xx_udc_mach_info pxa_udc_info = {

diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index b7c0e138ef616e0670e097791d9eeb68bffdd456..72c556ff67dbae8bf0791fd8e6bdb1232a2adda1 100644 (file)
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -4,7 +4,6 @@
 struct mmp_dma_platdata;
 
 extern struct platform_device pxa_device_pmu;
-extern struct platform_device pxa_device_mci;
 extern struct platform_device pxa3xx_device_mci2;
 extern struct platform_device pxa3xx_device_mci3;
 extern struct platform_device pxa25x_device_udc;

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index b9eddc69109713c3627731c1318ca4f5b2a6ec87..efa6faa62a2cf0cefbfb3abd450bc176d0f49dba 100644 (file)
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -90,7 +90,7 @@ static struct pxamci_platform_data gumstix_mci_platform_data = {
 
 static void __init gumstix_mmc_init(void)
 {
-       pxa_set_mci_info(&gumstix_mci_platform_data);
+       pxa_set_mci_info(&gumstix_mci_platform_data, NULL);
 }
 #else
 static void __init gumstix_mmc_init(void)

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index c79510185ce3589ea23d97da112c6e01f9355bda..4720a40587f1474eb45179c84de96564efb3039d 100644 (file)
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -651,21 +651,17 @@ static struct pxamci_platform_data spitz_mci_platform_data = {
        .setpower               = spitz_mci_setpower,
 };
 
-static struct gpiod_lookup_table spitz_mci_gpio_table = {
-       .dev_id = "pxa2xx-mci.0",
-       .table = {
-               GPIO_LOOKUP("gpio-pxa", SPITZ_GPIO_nSD_DETECT,
-                           "cd", GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP("gpio-pxa", SPITZ_GPIO_nSD_WP,
-                           "wp", GPIO_ACTIVE_LOW),
-               { },
-       },
+static const struct property_entry spitz_mci_props[] __initconst = {
+       PROPERTY_ENTRY_GPIO("cd-gpios", &pxa2xx_gpiochip_node,
+                           SPITZ_GPIO_nSD_DETECT, GPIO_ACTIVE_LOW),
+       PROPERTY_ENTRY_GPIO("wp-gpios", &pxa2xx_gpiochip_node,
+                           SPITZ_GPIO_nSD_WP, GPIO_ACTIVE_LOW),
+       { }
 };
 
 static void __init spitz_mmc_init(void)
 {
-       gpiod_add_lookup_table(&spitz_mci_gpio_table);
-       pxa_set_mci_info(&spitz_mci_platform_data);
+       pxa_set_mci_info(&spitz_mci_platform_data, spitz_mci_props);
 }
 #else
 static inline void spitz_mmc_init(void) {}

diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h
index 7e44e84e7150904635ae0505a7608ec5a045534e..652f323b5ecca2133571a5c11169e36fbe76afa5 100644 (file)
--- a/include/linux/platform_data/mmc-pxamci.h
+++ b/include/linux/platform_data/mmc-pxamci.h
@@ -7,6 +7,7 @@
 
 struct device;
 struct mmc_host;
+struct property_entry;
 
 struct pxamci_platform_data {
        unsigned int ocr_mask;                  /* available voltages */
@@ -18,7 +19,8 @@ struct pxamci_platform_data {
        bool gpio_card_ro_invert;               /* gpio ro is inverted */
 };
 
-extern void pxa_set_mci_info(struct pxamci_platform_data *info);
+extern void pxa_set_mci_info(const struct pxamci_platform_data *info,
+                            const struct property_entry *props);
 extern void pxa3xx_set_mci2_info(struct pxamci_platform_data *info);
 extern void pxa3xx_set_mci3_info(struct pxamci_platform_data *info);