From: Arnd Bergmann <arnd@arndb.de>
To: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
linux-mtd@lists.infradead.org
Subject: [PATCH 11/46] ARM: pxa: cmx270: use platform device for nand
Date: Fri, 18 Oct 2019 17:41:26 +0200 [thread overview]
Message-ID: <20191018154201.1276638-11-arnd@arndb.de> (raw)
In-Reply-To: <20191018154052.1276506-1-arnd@arndb.de>
The driver traditionally hardcodes the MMIO register address and
the GPIO numbers from data defined in platform header files.
To make it indepdendent of that, use a memory resource for the
registers, and a gpio lookup table to replace the gpio numbers.
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-pxa/cm-x270.c | 25 +++++++++
drivers/mtd/nand/raw/cmx270_nand.c | 88 +++++++++++-------------------
2 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 9baad11314f2..6d80400d8887 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -40,6 +40,10 @@
#define GPIO19_WLAN_STRAP (19)
#define GPIO102_WLAN_RST (102)
+/* NAND GPIOS */
+#define GPIO_NAND_CS (11)
+#define GPIO_NAND_RB (89)
+
static unsigned long cmx270_pin_config[] = {
/* AC'97 */
GPIO28_AC97_BITCLK,
@@ -403,6 +407,26 @@ static void __init cmx270_init_spi(void)
static inline void cmx270_init_spi(void) {}
#endif
+static struct gpiod_lookup_table cmx270_nand_gpio_table = {
+ .dev_id = "cmx270-nand",
+ .table = {
+ GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CS, "cs", GPIO_ACTIVE_HIGH),
+ GPIO_LOOKUP("gpio-pxa", GPIO_NAND_RB, "rb", GPIO_ACTIVE_HIGH),
+ { },
+ },
+};
+
+static struct resource cmx270_nand_resources[] __initdata = {
+ DEFINE_RES_MEM(PXA_CS1_PHYS, 12),
+};
+
+static void __init cmx270_init_nand(void)
+{
+ platform_device_register_simple("cmx270-nand", -1,
+ cmx270_nand_resources, 1);
+ gpiod_add_lookup_table(&cmx270_nand_gpio_table);
+}
+
void __init cmx270_init(void)
{
pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_pin_config));
@@ -416,4 +440,5 @@ void __init cmx270_init(void)
cmx270_init_ohci();
cmx270_init_2700G();
cmx270_init_spi();
+ cmx270_init_nand();
}
diff --git a/drivers/mtd/nand/raw/cmx270_nand.c b/drivers/mtd/nand/raw/cmx270_nand.c
index 7af3d0bdcdb8..31cb20858c46 100644
--- a/drivers/mtd/nand/raw/cmx270_nand.c
+++ b/drivers/mtd/nand/raw/cmx270_nand.c
@@ -15,18 +15,17 @@
#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
#include <linux/slab.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/module.h>
#include <linux/soc/pxa/cpu.h>
+#include <linux/platform_device.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
-#include <mach/addr-map.h>
-
-#define GPIO_NAND_CS (11)
-#define GPIO_NAND_RB (89)
+static struct gpio_desc *gpiod_nand_cs;
+static struct gpio_desc *gpiod_nand_rb;
/* MTD structure for CM-X270 board */
static struct mtd_info *cmx270_nand_mtd;
@@ -70,14 +69,14 @@ static void cmx270_read_buf(struct nand_chip *this, u_char *buf, int len)
static inline void nand_cs_on(void)
{
- gpio_set_value(GPIO_NAND_CS, 0);
+ gpiod_set_value(gpiod_nand_cs, 0);
}
static void nand_cs_off(void)
{
dsb();
- gpio_set_value(GPIO_NAND_CS, 1);
+ gpiod_set_value(gpiod_nand_cs, 1);
}
/*
@@ -120,48 +119,41 @@ static int cmx270_device_ready(struct nand_chip *this)
{
dsb();
- return (gpio_get_value(GPIO_NAND_RB));
+ return (gpiod_get_value(gpiod_nand_rb));
}
/*
* Main initialization routine
*/
-static int __init cmx270_init(void)
+static int cmx270_probe(struct platform_device *pdev)
{
struct nand_chip *this;
+ struct device *dev = &pdev->dev;
int ret;
- if (!(machine_is_armcore() && cpu_is_pxa27x()))
- return -ENODEV;
-
- ret = gpio_request(GPIO_NAND_CS, "NAND CS");
+ gpiod_nand_cs = devm_gpiod_get(dev, "cs", GPIOD_OUT_HIGH);
+ ret = PTR_ERR_OR_ZERO(gpiod_nand_cs);
if (ret) {
pr_warn("CM-X270: failed to request NAND CS gpio\n");
return ret;
}
- gpio_direction_output(GPIO_NAND_CS, 1);
-
- ret = gpio_request(GPIO_NAND_RB, "NAND R/B");
+ gpiod_nand_rb = devm_gpiod_get(dev, "rb", GPIOD_IN);
+ ret = PTR_ERR_OR_ZERO(gpiod_nand_rb);
if (ret) {
pr_warn("CM-X270: failed to request NAND R/B gpio\n");
- goto err_gpio_request;
+ return ret;
}
- gpio_direction_input(GPIO_NAND_RB);
-
/* Allocate memory for MTD device structure and private data */
- this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);
- if (!this) {
- ret = -ENOMEM;
- goto err_kzalloc;
- }
+ this = devm_kzalloc(dev, sizeof(struct nand_chip), GFP_KERNEL);
+ if (!this)
+ return -ENOMEM;
- cmx270_nand_io = ioremap(PXA_CS1_PHYS, 12);
+ cmx270_nand_io = devm_platform_ioremap_resource(pdev, 0);
if (!cmx270_nand_io) {
pr_debug("Unable to ioremap NAND device\n");
- ret = -EINVAL;
- goto err_ioremap;
+ return -EINVAL;
}
cmx270_nand_mtd = nand_to_mtd(this);
@@ -189,48 +181,30 @@ static int __init cmx270_init(void)
ret = nand_scan(this, 1);
if (ret) {
pr_notice("No NAND device\n");
- goto err_scan;
+ return ret;
}
/* Register the partitions */
- ret = mtd_device_register(cmx270_nand_mtd, partition_info,
- NUM_PARTITIONS);
- if (ret)
- goto err_scan;
-
- /* Return happy */
- return 0;
-
-err_scan:
- iounmap(cmx270_nand_io);
-err_ioremap:
- kfree(this);
-err_kzalloc:
- gpio_free(GPIO_NAND_RB);
-err_gpio_request:
- gpio_free(GPIO_NAND_CS);
-
- return ret;
-
+ return mtd_device_register(cmx270_nand_mtd, partition_info,
+ NUM_PARTITIONS);
}
-module_init(cmx270_init);
/*
* Clean up routine
*/
-static void __exit cmx270_cleanup(void)
+static int cmx270_remove(struct platform_device *pdev)
{
- /* Release resources, unregister device */
nand_release(mtd_to_nand(cmx270_nand_mtd));
- gpio_free(GPIO_NAND_RB);
- gpio_free(GPIO_NAND_CS);
-
- iounmap(cmx270_nand_io);
-
- kfree(mtd_to_nand(cmx270_nand_mtd));
+ return 0;
}
-module_exit(cmx270_cleanup);
+
+static struct platform_driver cmx270_nand_driver = {
+ .driver.name = "cmx270-nand",
+ .probe = cmx270_probe,
+ .remove = cmx270_remove,
+};
+module_platform_driver(cmx270_nand_driver);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
--
2.20.0
next prev parent reply other threads:[~2019-10-18 15:44 UTC|newest]
Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 15:40 [PATCH 00/46] ARM: pxa: towards multiplatform support Arnd Bergmann
2019-10-18 15:41 ` [PATCH 01/46] ARM: pxa: split mach/generic.h Arnd Bergmann
2019-10-28 18:06 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 02/46] ARM: pxa: make mainstone.h private Arnd Bergmann
2019-10-28 18:08 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 03/46] ARM: pxa: make mach/regs-uart.h private Arnd Bergmann
2019-10-28 18:14 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 04/46] ARM: pxa: remove mach/dma.h Arnd Bergmann
2019-10-28 18:15 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 05/46] ARM: pxa: split up mach/hardware.h Arnd Bergmann
2019-10-18 18:37 ` Dmitry Torokhov
2019-10-19 21:22 ` Alexandre Belloni
2019-10-21 2:27 ` Viresh Kumar
2019-10-21 9:58 ` Ulf Hansson
2019-10-22 16:36 ` Mark Brown
2019-10-28 9:18 ` Stephen Boyd
2019-10-28 19:14 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 06/46] ARM: pxa: stop using mach/bitfield.h Arnd Bergmann
2019-10-28 19:20 ` Robert Jarzmik
2019-11-08 14:39 ` Bartlomiej Zolnierkiewicz
2019-10-18 15:41 ` [PATCH 07/46] ARM: pxa: move mach/sound.h to linux/platform_data/ Arnd Bergmann
2019-10-22 16:36 ` Mark Brown
2019-10-28 19:21 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 08/46] ARM: pxa: move regs-lcd.h into driver Arnd Bergmann
2019-10-28 19:24 ` Robert Jarzmik
2019-11-08 14:40 ` Bartlomiej Zolnierkiewicz
2019-10-18 15:41 ` [PATCH 09/46] watchdog: sa1100: use platform device registration Arnd Bergmann
2019-10-19 14:06 ` Guenter Roeck
2019-10-22 9:44 ` Arnd Bergmann
2019-10-22 13:38 ` Guenter Roeck
2019-10-18 15:41 ` [PATCH 10/46] ARM: pxa: pxa2xx-ac97-lib: use IRQ resource Arnd Bergmann
2019-10-28 20:19 ` Robert Jarzmik
2019-10-18 15:41 ` Arnd Bergmann [this message]
2019-10-19 9:44 ` [PATCH 11/46] ARM: pxa: cmx270: use platform device for nand Miquel Raynal
2019-10-22 10:00 ` Arnd Bergmann
2019-10-28 20:25 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 12/46] ARM: pxa: make addr-map.h header local Arnd Bergmann
2019-10-28 20:27 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 13/46] ARM: pxa: move pcmcia board data into mach-pxa Arnd Bergmann
2019-10-18 15:41 ` [PATCH 14/46] ARM: pxa: use pdev resource for palmld mmio Arnd Bergmann
2019-10-28 20:34 ` Robert Jarzmik
2019-11-08 14:40 ` Bartlomiej Zolnierkiewicz
2019-10-18 15:41 ` [PATCH 15/46] ARM: pxa: maybe fix gpio lookup tables Arnd Bergmann
2019-10-28 20:48 ` Robert Jarzmik
2019-11-04 15:45 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 16/46] ARM: pxa: tosa: use gpio descriptor for audio Arnd Bergmann
2019-10-22 16:36 ` Mark Brown
2019-10-28 20:49 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 17/46] ARM: pxa: poodle: use platform data for poodle asoc driver Arnd Bergmann
2019-10-22 16:37 ` Mark Brown
2019-10-28 20:53 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 18/46] ARM: pxa: corgi: use gpio descriptors for audio Arnd Bergmann
2019-10-22 16:37 ` Mark Brown
2019-10-28 20:56 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 19/46] ARM: pxa: hx4700: " Arnd Bergmann
2019-10-22 16:37 ` Mark Brown
2019-10-28 20:59 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 20/46] ARM: pxa: lubbock: pass udc irqs as resource Arnd Bergmann
2019-10-28 21:05 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 21/46] ARM: pxa: spitz: use gpio descriptors for audio Arnd Bergmann
2019-10-22 16:38 ` Mark Brown
2019-10-28 21:08 ` Robert Jarzmik
2022-04-19 15:40 ` Arnd Bergmann
2019-10-18 15:41 ` [PATCH 22/46] ARM: pxa: eseries: use gpio lookup " Arnd Bergmann
2019-10-22 16:38 ` Mark Brown
2019-10-28 21:13 ` Robert Jarzmik
2019-11-05 9:21 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 23/46] ARM: pxa: z2: use gpio lookup for audio device Arnd Bergmann
2019-10-22 16:38 ` Mark Brown
2019-10-28 21:17 ` Robert Jarzmik
2019-11-05 9:22 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 24/46] ARM: pxa: magician: use platform driver for audio Arnd Bergmann
2019-10-22 16:38 ` Mark Brown
2019-10-28 21:19 ` Robert Jarzmik
2019-11-05 9:22 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 25/46] ARM: pxa: mainstone-wm97xx: use gpio lookup table Arnd Bergmann
2019-10-18 18:39 ` Dmitry Torokhov
[not found] ` <CAK8P3a1Fc=ogknDRGJ3Sn8bZ8tsR_ebE8_bDtF_kZ4AZ5YG_+g@mail.gmail.com>
2019-10-18 19:37 ` Arnd Bergmann
2019-10-18 20:39 ` Dmitry Torokhov
2019-10-28 21:24 ` Robert Jarzmik
2019-11-05 9:25 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 26/46] ARM: pxa: zylonite: use gpio lookup instead mfp header Arnd Bergmann
2019-10-28 21:31 ` Robert Jarzmik
2019-11-05 9:28 ` Linus Walleij
2019-10-18 15:41 ` [PATCH 27/46] input: touchscreen: mainstone: fix pxa2xx+pxa3xx configuration Arnd Bergmann
2019-10-18 18:40 ` Dmitry Torokhov
2019-10-28 21:33 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 28/46] input: touchscreen: mainstone: sync with zylonite driver Arnd Bergmann
2019-10-18 18:41 ` Dmitry Torokhov
2019-10-28 21:40 ` Robert Jarzmik
2022-04-19 15:51 ` Arnd Bergmann
2019-10-18 15:41 ` [PATCH 29/46] Input: touchscreen: use wrapper for pxa2xx ac97 registers Arnd Bergmann
2019-10-18 18:48 ` Dmitry Torokhov
[not found] ` <CAK8P3a27==9TeS-RWEvrpnxh+6McqRF-xeb8WPj9pHOn+0zbOQ@mail.gmail.com>
2019-10-18 19:39 ` Fwd: " Arnd Bergmann
2019-10-18 20:39 ` Dmitry Torokhov
2019-10-30 20:33 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 30/46] SoC: pxa: use pdev resource for FIFO regs Arnd Bergmann
2019-10-22 16:39 ` Mark Brown
2019-10-22 20:13 ` Arnd Bergmann
2019-10-28 21:45 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 31/46] ASoC: pxa: ac97: use normal MMIO accessors Arnd Bergmann
2019-10-28 21:47 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 32/46] ASoC: pxa: i2s: " Arnd Bergmann
2019-10-22 16:39 ` Mark Brown
2019-10-28 21:50 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 33/46] ARM: pxa: pcmcia: move smemc configuration back to arch Arnd Bergmann
2019-10-28 21:57 ` Robert Jarzmik
2022-04-19 15:55 ` Arnd Bergmann
2019-10-18 15:41 ` [PATCH 34/46] ARM: pxa: remove get_clk_frequency_khz() Arnd Bergmann
2019-10-21 2:26 ` Viresh Kumar
2019-10-28 21:58 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 35/46] cpufreq: pxa3: move clk register access to clk driver Arnd Bergmann
2019-10-21 2:26 ` Viresh Kumar
2019-10-18 15:41 ` [PATCH 36/46] ARM: pxa: move smemc register access from clk to platform Arnd Bergmann
2019-10-28 9:34 ` Stephen Boyd
2019-10-30 20:57 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 37/46] ARM: pxa: move clk register definitions to driver Arnd Bergmann
2019-10-28 9:34 ` Stephen Boyd
2019-10-30 21:00 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 38/46] video: backlight: tosa: use gpio lookup table Arnd Bergmann
2019-10-30 21:10 ` Robert Jarzmik
2019-11-05 10:04 ` Linus Walleij
2019-11-05 10:17 ` Daniel Thompson
2019-11-11 9:30 ` Lee Jones
2019-10-18 15:41 ` [PATCH 39/46] power: tosa: simplify probe function Arnd Bergmann
2019-10-19 9:07 ` Sebastian Reichel
2019-10-30 21:12 ` Robert Jarzmik
2019-10-30 21:21 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 40/46] ARM: pxa: tosa: use gpio lookup for battery Arnd Bergmann
2019-10-19 9:09 ` Sebastian Reichel
2019-10-18 15:41 ` [PATCH 41/46] ARM: pxa: move it8152 PCI support into machine Arnd Bergmann
2019-10-18 15:41 ` [PATCH 42/46] ARM: pxa: remove unused mach/bitfield.h Arnd Bergmann
2019-10-30 21:33 ` Robert Jarzmik
2019-10-18 15:41 ` [PATCH 43/46] ARM: pxa: pci-it8152: add platform checks Arnd Bergmann
2019-10-18 15:41 ` [PATCH 44/46] ARM: mmp: remove tavorevb board support Arnd Bergmann
2019-10-19 14:20 ` Lubomir Rintel
2019-10-19 19:34 ` Arnd Bergmann
2019-10-18 15:42 ` [PATCH 45/46] ARM: mmp: rename pxa_register_device Arnd Bergmann
2019-10-31 8:53 ` Lubomir Rintel
2019-10-18 15:42 ` [PATCH 46/46] ARM: pxa: move plat-pxa to drivers/soc/ Arnd Bergmann
2019-10-30 21:40 ` Robert Jarzmik
2019-10-31 8:53 ` Lubomir Rintel
2019-10-18 19:03 ` [PATCH 00/46] ARM: pxa: towards multiplatform support Robert Jarzmik
[not found] ` <CAK8P3a1JDtHsOW=iaxEycbJ4TBkR9MHUyDMeJnwxCtb=tefnBQ@mail.gmail.com>
2019-10-18 19:32 ` Arnd Bergmann
2019-10-19 10:35 ` Robert Jarzmik
2019-10-24 20:49 ` Robert Jarzmik
2019-10-25 10:50 ` Arnd Bergmann
2019-10-19 1:02 ` Guenter Roeck
2019-10-19 10:08 ` Arnd Bergmann
2019-10-19 10:09 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018154201.1276638-11-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=computersforpeace@gmail.com \
--cc=daniel@zonque.org \
--cc=dwmw2@infradead.org \
--cc=haojian.zhuang@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=robert.jarzmik@free.fr \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).