UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: maps: gpio-addr-flash: Convert to gpiod 

Convert from legacy gpio API to gpiod.
Board files will have to use gpiod_lookup_tables.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Suggested-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Ricardo Ribalda Delgado 2018-10-04 15:01:08 +02:00 committed by Boris Brezillon
parent 0304f8eaa3
commit 299b43535d
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/mtd/maps/gpio-addr-flash.c
View File

@ -14,6 +14,7 @@
*/ */
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
@ -33,16 +34,14 @@
* struct async_state - keep GPIO flash state * struct async_state - keep GPIO flash state
* @mtd: MTD state for this mapping * @mtd: MTD state for this mapping
* @map: MTD map state for this flash * @map: MTD map state for this flash
* @gpio_count: number of GPIOs used to address * @gpios: Struct containing the array of GPIO descriptors
* @gpio_addrs: array of GPIOs to twiddle
* @gpio_values: cached GPIO values * @gpio_values: cached GPIO values
* @win_order: dedicated memory size (if no GPIOs) * @win_order: dedicated memory size (if no GPIOs)
*/ */
struct async_state { struct async_state {
struct mtd_info *mtd; struct mtd_info *mtd;
struct map_info map; struct map_info map;
size_t gpio_count; struct gpio_descs *gpios;
unsigned *gpio_addrs;
unsigned int gpio_values; unsigned int gpio_values;
unsigned int win_order; unsigned int win_order;
}; };
@ -66,11 +65,11 @@ static void gf_set_gpios(struct async_state *state, unsigned long ofs)
if (ofs == state->gpio_values) if (ofs == state->gpio_values)
return; return;
for (i = 0; i < state->gpio_count; i++) { for (i = 0; i < state->gpios->ndescs; i++) {
if ((ofs & BIT(i)) == (state->gpio_values & BIT(i))) if ((ofs & BIT(i)) == (state->gpio_values & BIT(i)))
continue; continue;
gpio_set_value(state->gpio_addrs[i], !!(ofs & BIT(i))); gpiod_set_value(state->gpios->desc[i], !!(ofs & BIT(i)));
} }
state->gpio_values = ofs; state->gpio_values = ofs;
@ -182,18 +181,22 @@ static const char * const part_probe_types[] = {
* The platform resource layout expected looks something like: * The platform resource layout expected looks something like:
* struct mtd_partition partitions[] = { ... }; * struct mtd_partition partitions[] = { ... };
* struct physmap_flash_data flash_data = { ... }; * struct physmap_flash_data flash_data = { ... };
* unsigned flash_gpios[] = { GPIO_XX, GPIO_XX, ... }; * static struct gpiod_lookup_table addr_flash_gpios = {
* .dev_id = "gpio-addr-flash.0",
* .table = {
* GPIO_LOOKUP_IDX("gpio.0", 15, "addr", 0, GPIO_ACTIVE_HIGH),
* GPIO_LOOKUP_IDX("gpio.0", 16, "addr", 1, GPIO_ACTIVE_HIGH),
* );
* };
* gpiod_add_lookup_table(&addr_flash_gpios);
*
* struct resource flash_resource[] = { * struct resource flash_resource[] = {
* { * {
* .name = "cfi_probe", * .name = "cfi_probe",
* .start = 0x20000000, * .start = 0x20000000,
* .end = 0x201fffff, * .end = 0x201fffff,
* .flags = IORESOURCE_MEM, * .flags = IORESOURCE_MEM,
* }, { * },
* .start = (unsigned long)flash_gpios,
* .end = ARRAY_SIZE(flash_gpios),
* .flags = IORESOURCE_IRQ,
* }
* }; * };
* struct platform_device flash_device = { * struct platform_device flash_device = {
* .name = "gpio-addr-flash", * .name = "gpio-addr-flash",
@ -205,29 +208,24 @@ static const char * const part_probe_types[] = {
*/ */
static int gpio_flash_probe(struct platform_device *pdev) static int gpio_flash_probe(struct platform_device *pdev)
{ {
size_t i;
struct physmap_flash_data *pdata; struct physmap_flash_data *pdata;
struct resource *memory; struct resource *memory;
struct resource *gpios;
struct async_state *state; struct async_state *state;
pdata = dev_get_platdata(&pdev->dev); pdata = dev_get_platdata(&pdev->dev);
memory = platform_get_resource(pdev, IORESOURCE_MEM, 0); memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!memory || !gpios || !gpios->end) if (!memory)
return -EINVAL; return -EINVAL;
state = devm_kzalloc(&pdev->dev, sizeof(*state), GFP_KERNEL); state = devm_kzalloc(&pdev->dev, sizeof(*state), GFP_KERNEL);
if (!state) if (!state)
return -ENOMEM; return -ENOMEM;
/* state->gpios = devm_gpiod_get_array(&pdev->dev, "addr", GPIOD_OUT_LOW);
* We cast start/end to known types in the boards file, so cast if (IS_ERR(state->gpios))
* away their pointer types here to the known types (gpios->xxx). return PTR_ERR(state->gpios);
*/
state->gpio_count = gpios->end;
state->gpio_addrs = (void *)(unsigned long)gpios->start;
state->win_order = get_bitmask_order(resource_size(memory)) - 1; state->win_order = get_bitmask_order(resource_size(memory)) - 1;
state->map.name = DRIVER_NAME; state->map.name = DRIVER_NAME;
@ -236,7 +234,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
state->map.write = gf_write; state->map.write = gf_write;
state->map.copy_to = gf_copy_to; state->map.copy_to = gf_copy_to;
state->map.bankwidth = pdata->width; state->map.bankwidth = pdata->width;
state->map.size = BIT(state->win_order + state->gpio_count); state->map.size = BIT(state->win_order + state->gpios->ndescs);
state->map.virt = devm_ioremap_resource(&pdev->dev, memory); state->map.virt = devm_ioremap_resource(&pdev->dev, memory);
if (IS_ERR(state->map.virt)) if (IS_ERR(state->map.virt))
return PTR_ERR(state->map.virt); return PTR_ERR(state->map.virt);
@ -246,17 +244,6 @@ static int gpio_flash_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, state); platform_set_drvdata(pdev, state);
i = 0;
do {
if (devm_gpio_request(&pdev->dev, state->gpio_addrs[i],
DRIVER_NAME)) {
dev_err(&pdev->dev, "failed to request gpio %d\n",
state->gpio_addrs[i]);
return -EBUSY;
}
gpio_direction_output(state->gpio_addrs[i], 0);
} while (++i < state->gpio_count);
dev_notice(&pdev->dev, "probing %d-bit flash bus\n", dev_notice(&pdev->dev, "probing %d-bit flash bus\n",
state->map.bankwidth * 8); state->map.bankwidth * 8);
state->mtd = do_map_probe(memory->name, &state->map); state->mtd = do_map_probe(memory->name, &state->map);