GPIO: clps711x: Rewrite driver for using generic GPIO code
Subsystems (4)
PATCH v2 1/3 GPIO: clps711x: Rewrite driver for using generic GPIO code
This patch provides rewritten driver for CLPS711X GPIO which uses generic GPIO code.
--- drivers/gpio/Kconfig | 5 +- drivers/gpio/gpio-clps711x.c | 226 +++++++++++-------------------------------- 2 files changed, 63 insertions(+), 168 deletions(-)
drivers/gpio/Kconfig +4 -1
@@ -109,8 +109,11 @@ config GPIO_MAX730X comment "Memory mapped GPIO drivers:" config GPIO_CLPS711X - def_bool y + tristate "CLPS711X GPIO support" depends on ARCH_CLPS711X + select GPIO_GENERIC + help + Say yes here to support GPIO on CLPS711X SoCs. config GPIO_GENERIC_PLATFORM tristate "Generic memory-mapped GPIO controller support (MMIO platform device)"
drivers/gpio/gpio-clps711x.c +59 -167
257 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH v2 2/3 ARM: clps711x: Re-add GPIO support
arch_initcall was been removed from GPIO driver, so this patch re-add support for GPIO into boards as platform_device. Since some drivers (spi, nand, etc.) is not support deferred probe, separate machine init calls is used in board code to make proper loading sequence.
--- arch/arm/mach-clps711x/Makefile | 5 +--- arch/arm/mach-clps711x/board-autcpu12.c | 2 ++ arch/arm/mach-clps711x/board-cdb89712.c | 2 ++ arch/arm/mach-clps711x/board-edb7211.c | 7 +++++ arch/arm/mach-clps711x/board-p720t.c | 10 ++++--- arch/arm/mach-clps711x/devices.c | 48 +++++++++++++++++++++++++++++++++ arch/arm/mach-clps711x/devices.h | 12 +++++++++ 7 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 arch/arm/mach-clps711x/devices.c create mode 100644 arch/arm/mach-clps711x/devices.h
arch/arm/mach-clps711x/Makefile +1 -4
@@ -4,10 +4,7 @@ # Object file lists. -obj-y := common.o -obj-m := -obj-n := -obj- := +obj-y := common.o devices.o obj-$(CONFIG_ARCH_AUTCPU12) += board-autcpu12.o obj-$(CONFIG_ARCH_CDB89712) += board-cdb89712.o
arch/arm/mach-clps711x/board-autcpu12.c +2 -0
@@ -43,6 +43,7 @@#include <mach/autcpu12.h> #include "common.h" +#include "devices.h" #define AUTCPU12_CS8900_BASE (CS2_PHYS_BASE + 0x300)#define AUTCPU12_CS8900_IRQ (IRQ_EINT3)
@@ -149,6 +150,7 @@ static struct platform_device autcpu12_mmgpio_pdev __initdata = {static void __init autcpu12_init (void ) { +clps711x_devices_init ();platform_device_register_simple ("video-clps711x" ,0 ,NULL ,0 );platform_device_register_simple ("cs89x0" ,0 , autcpu12_cs8900_resource,ARRAY_SIZE (autcpu12_cs8900_resource));
arch/arm/mach-clps711x/board-cdb89712.c +2 -0
@@ -39,6 +39,7 @@#include <asm/mach/map.h> #include "common.h" +#include "devices.h" #define CDB89712_CS8900_BASE (CS2_PHYS_BASE + 0x300)#define CDB89712_CS8900_IRQ (IRQ_EINT3)
@@ -127,6 +128,7 @@ static struct platform_device cdb89712_sram_pdev __initdata = {static void __init cdb89712_init (void ) { +clps711x_devices_init ();platform_device_register (&cdb89712_flash_pdev);platform_device_register (&cdb89712_bootrom_pdev);platform_device_register (&cdb89712_sram_pdev);
arch/arm/mach-clps711x/board-edb7211.c +7 -0
@@ -29,6 +29,7 @@#include <mach/hardware.h> #include "common.h" +#include "devices.h" #define VIDEORAM_SIZE SZ_128K
@@ -151,6 +152,11 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)static void __init edb7211_init (void ) { +clps711x_devices_init (); +} + +static void __init edb7211_init_late (void ) +{gpio_request_array (edb7211_gpios,ARRAY_SIZE (edb7211_gpios));platform_device_register (&edb7211_flash_pdev);
@@ -175,6 +181,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") .init_irq = clps711x_init_irq, .init_time = clps711x_timer_init, .init_machine = edb7211_init, + .init_late = edb7211_init_late, .handle_irq = clps711x_handle_irq, .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/board-p720t.c +6 -4
@@ -43,6 +43,7 @@#include <video/platform_lcd.h> #include "common.h" +#include "devices.h" #define P720T_USERLED CLPS711X_GPIO(3, 0)#define P720T_NAND_CLE CLPS711X_GPIO(4, 0)
@@ -199,6 +200,11 @@ static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = {static void __init p720t_init (void ) { +clps711x_devices_init (); +} + +static void __init p720t_init_late (void ) +{platform_device_register (&p720t_nand_pdev); platform_device_register_data(&platform_bus, "platform-lcd", 0, &p720t_lcd_power_pdata,
@@ -207,10 +213,6 @@ static void __init p720t_init(void) &p720t_lcd_backlight_pdata, sizeof(p720t_lcd_backlight_pdata));platform_device_register_simple ("video-clps711x" ,0 ,NULL ,0 ); -} - -static void __init p720t_init_late (void ) -{platform_device_register_data (&platform_bus,"leds-gpio" ,0 , &p720t_gpio_led_pdata,sizeof (p720t_gpio_led_pdata));
arch/arm/mach-clps711x/devices.c new file +48 -0
48 lines not on this page · raw message
arch/arm/mach-clps711x/devices.h new file +12 -0
@@ -0,0 +1,12 @@ +/* +* CLPS711X common devices definitions +* +* Copyright (C) 2013 Alexander Shiyan <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +void clps711x_devices_init (void );
Signature · 1 line
1.8.1.5
PATCH v2 3/3 GPIO: clps711x: Add DT support
In reply to Alexander ShiyanAdd DT support to the CLPS711X GPIO driver.
--- .../devicetree/bindings/gpio/gpio-clps711x.txt | 28 ++++++++++++++++++++++ drivers/gpio/gpio-clps711x.c | 14 ++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-clps711x.txt
Documentation/devicetree/bindings/gpio/gpio-clps711x.txt new file +28 -0
@@ -0,0 +1,28 @@ +Cirrus Logic CLPS711X GPIO controller + +Required properties: +- compatible: Should be "cirrus,clps711x-gpio" +- reg: Physical base GPIO controller registers location and length. + There should be two registers, first is DATA register, the second + is DIRECTION. +- gpio-controller: Marks the device node as a gpio controller. +- #gpio-cells: Should be two. The first cell is the pin number and + the second cell is used to specify the gpio polarity: + 0 = active high + 1 = active low + +Note: Each GPIO port should have an alias correctly numbered in "aliases" +node. + +Example: + +aliases { + gpio0 = &porta; +}; + +porta: gpio at 80000000 { + compatible = "cirrus,clps711x-gpio"; + reg = <0x80000000 0x1>, <0x80000040 0x1>; + gpio-controller; + #gpio-cells = <2>; +};
drivers/gpio/gpio-clps711x.c +11 -3
@@ -17,10 +17,11 @@static int clps711x_gpio_probe (struct platform_device *pdev) { +struct device_node *np = pdev->dev.of_node;void __iomem *dat, *dir;struct bgpio_chip *bgc;struct resource *res; -int err, id = pdev->id; +int err, id = np ?of_alias_get_id (np,"gpio" ) : pdev->id;if ((id <0 ) || (id >4 ))return -ENODEV ;
@@ -76,10 +77,17 @@ static int clps711x_gpio_remove(struct platform_device *pdev)return bgpio_remove (bgc); } +static const struct of_device_id clps711x_gpio_ids[] = { + { .compatible ="cirrus,clps711x-gpio" }, + { } +}; +MODULE_DEVICE_TABLE (of, clps711x_gpio_ids); +static struct platform_driver clps711x_gpio_driver = { .driver = { - .name ="clps711x-gpio" , - .owner =THIS_MODULE , + .name ="clps711x-gpio" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (clps711x_gpio_ids), }, .probe = clps711x_gpio_probe, .remove = clps711x_gpio_remove,
Signature · 1 line
1.8.1.5
PATCH v2 1/3 GPIO: clps711x: Rewrite driver for using generic GPIO code
In reply to Alexander ShiyanQuoted 4 lines · Alexander Shiyan
This patch provides rewritten driver for CLPS711X GPIO which uses generic GPIO code.
Signed-off-by Alexander Shiyan <[email protected]>
All three patches
PATCH v2 1/3 GPIO: clps711x: Rewrite driver for using generic GPIO code
In reply to Alexander ShiyanQuoted 4 lines · Alexander Shiyan
This patch provides rewritten driver for CLPS711X GPIO which uses generic GPIO code.
Signed-off-by Alexander Shiyan <[email protected]>
The series:
Yours,
Linus Walleij
Olof Johansson
AppliedPATCH v2 1/3 GPIO: clps711x: Rewrite driver for using generic GPIO code
Quoted 9 lines · Linus Walleij
Quoted 4 lines · Alexander Shiyan
This patch provides rewritten driver for CLPS711X GPIO which uses generic GPIO code.
Signed-off-by Alexander Shiyan <[email protected]>The series:
Acked-by Linus Walleij <[email protected]>
Applied.
-Olof