rtc-v3020: add ability to access v3020 chip with GPIOs
PATCH 1/1 rtc-v3020: add ability to access v3020 chip with GPIOs
The v3020 RTC can be connected to GPIOs as well as to memory-like interface. Add ability to use GPIO bit-bang for v3020 read-write access.
The first patch in the serie is just coding style cleanup.
Mike Rapoport (2):
rtc-v3020: coding style cleanup
rtc-v3020: add ability to access v3020 chip with GPIOs
drivers/rtc/rtc-v3020.c | 230 ++++++++++++++++++++++++++++++++++++-------- include/linux/rtc-v3020.h | 6 + 2 files changed, 194 insertions(+), 42 deletions(-)
PATCH 1/1 rtc-v3020: coding style cleanup
--- drivers/rtc/rtc-v3020.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-)
drivers/rtc/rtc-v3020.c +18 -22
@@ -28,7 +28,7 @@#include <linux/rtc-v3020.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> #undef DEBUG
@@ -63,7 +63,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,static unsigned char v3020_get_reg (struct v3020 *chip,unsigned char address) { -unsigned int data=0 ; +unsigned int data =0 ;int i;for (i =0 ; i <4 ; i++) {
@@ -106,16 +106,14 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt) tmp =v3020_get_reg (chip,V3020_YEAR ); dt->tm_year =bcd2bin (tmp)+100 ; -#ifdef DEBUG -printk ("\n%s : Read RTC values\n" ,__func__); -printk ("tm_hour: %i\n" ,dt->tm_hour); -printk ("tm_min : %i\n" ,dt->tm_min); -printk ("tm_sec : %i\n" ,dt->tm_sec); -printk ("tm_year: %i\n" ,dt->tm_year); -printk ("tm_mon : %i\n" ,dt->tm_mon); -printk ("tm_mday: %i\n" ,dt->tm_mday); -printk ("tm_wday: %i\n" ,dt->tm_wday); -#endif +dev_dbg (dev,"\n%s : Read RTC values\n" , __func__); +dev_dbg (dev,"tm_hour: %i\n" , dt->tm_hour); +dev_dbg (dev,"tm_min : %i\n" , dt->tm_min); +dev_dbg (dev,"tm_sec : %i\n" , dt->tm_sec); +dev_dbg (dev,"tm_year: %i\n" , dt->tm_year); +dev_dbg (dev,"tm_mon : %i\n" , dt->tm_mon); +dev_dbg (dev,"tm_mday: %i\n" , dt->tm_mday); +dev_dbg (dev,"tm_wday: %i\n" , dt->tm_wday);return 0 ; }
@@ -125,15 +123,13 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt) {struct v3020 *chip =dev_get_drvdata (dev); -#ifdef DEBUG -printk ("\n%s : Setting RTC values\n" ,__func__); -printk ("tm_sec : %i\n" ,dt->tm_sec); -printk ("tm_min : %i\n" ,dt->tm_min); -printk ("tm_hour: %i\n" ,dt->tm_hour); -printk ("tm_mday: %i\n" ,dt->tm_mday); -printk ("tm_wday: %i\n" ,dt->tm_wday); -printk ("tm_year: %i\n" ,dt->tm_year); -#endif +dev_dbg (dev,"\n%s : Setting RTC values\n" , __func__); +dev_dbg (dev,"tm_sec : %i\n" , dt->tm_sec); +dev_dbg (dev,"tm_min : %i\n" , dt->tm_min); +dev_dbg (dev,"tm_hour: %i\n" , dt->tm_hour); +dev_dbg (dev,"tm_mday: %i\n" , dt->tm_mday); +dev_dbg (dev,"tm_wday: %i\n" , dt->tm_wday); +dev_dbg (dev,"tm_year: %i\n" , dt->tm_year);/* Write all the values to ram... */ v3020_set_reg (chip,V3020_SECONDS ,bin2bcd (dt->tm_sec));
@@ -191,7 +187,7 @@ static int rtc_probe(struct platform_device *pdev)/* Test chip by doing a write/read sequence * to the chip ram */ v3020_set_reg (chip,V3020_SECONDS ,0x33 ); -if (v3020_get_reg (chip,V3020_SECONDS ) !=0x33 ) { +if (v3020_get_reg (chip,V3020_SECONDS ) !=0x33 ) { retval = -ENODEV ; goto err_io; }
Signature · 1 line
1.5.6.4
Re: [PATCH] rtc-v3020: coding style cleanup
Quoted 1 line · On Mon, 2 Mar 2009 13:40:56 +0200 Mike Rapoport <[email protected]> wrote:
Signed-off-by Mike Rapoport <[email protected]>
Signature · 6 lines
Best regards, Alessandro Zummo, Tower Technologies - Torino, Italy http://www.towertech.it
PATCH 1/1 rtc-v3020: add ability to access v3020 chip with GPIOs
In reply to Mike RapoportThe v3020 RTC can be connected to GPIOs as well as to memory-like interface. Add ability to use GPIO bit-bang for v3020 read-write access.
--- drivers/rtc/rtc-v3020.c | 190 ++++++++++++++++++++++++++++++++++++++++----- include/linux/rtc-v3020.h | 6 ++ 2 files changed, 176 insertions(+), 20 deletions(-)
drivers/rtc/rtc-v3020.c +170 -20
@@ -27,17 +27,162 @@#include <linux/bcd.h> #include <linux/rtc-v3020.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/io.h> #undef DEBUG +struct v3020 ; + +struct v3020_chip_ops { +int (*map_io)(struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata); +void (*unmap_io)(struct v3020 *chip); +unsigned char (*read_bit)(struct v3020 *chip); +void (*write_bit)(struct v3020 *chip,unsigned char bit); +}; + +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 + +struct v3020_gpio { +const char *name; +unsigned int gpio; +}; +struct v3020 { +/* MMIO access */ void __iomem *ioaddress;int leftshift; + +/* GPIO access */ +struct v3020_gpio *gpio; + +struct v3020_chip_ops *ops; +struct rtc_device *rtc; }; + +static int v3020_mmio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +if (pdev->num_resources !=1 ) +return -EBUSY ; + +if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) +return -EBUSY ; + + chip->leftshift = pdata->leftshift; + chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); +if (chip->ioaddress ==NULL ) +return -EBUSY ; + +return 0 ; +} + +static void v3020_mmio_unmap (struct v3020 *chip) +{ +iounmap (chip->ioaddress); +} + +static void v3020_mmio_write_bit (struct v3020 *chip,unsigned char bit) +{ +writel (bit << chip->leftshift, chip->ioaddress); +} + +static unsigned char v3020_mmio_read_bit (struct v3020 *chip) +{ +return readl (chip->ioaddress) & (1 << chip->leftshift); +} + +static struct v3020_chip_ops v3020_mmio_ops = { + .map_io = v3020_mmio_map, + .unmap_io = v3020_mmio_unmap, + .read_bit = v3020_mmio_read_bit, + .write_bit = v3020_mmio_write_bit, +}; + +static struct v3020_gpio v3020_gpio[] = { + {"RTC CS" ,0 }, + {"RTC WR" ,0 }, + {"RTC RD" ,0 }, + {"RTC IO" ,0 }, +}; + +static int v3020_gpio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +int i, err; + + v3020_gpio[V3020_CS ].gpio = pdata->gpio_cs; + v3020_gpio[V3020_WR ].gpio = pdata->gpio_wr; + v3020_gpio[V3020_RD ].gpio = pdata->gpio_rd; + v3020_gpio[V3020_IO ].gpio = pdata->gpio_io; + +for (i =0 ; i <ARRAY_SIZE (v3020_gpio); i++) { + err =gpio_request (v3020_gpio[i].gpio, v3020_gpio[i].name); +if (err) + goto err_request; + +gpio_direction_output (v3020_gpio[i].gpio,1 ); + } + + chip->gpio = v3020_gpio; + +return 0 ; + +err_request: +for (; i >=0 ; i--) +gpio_free (v3020_gpio[i].gpio); + +return err; +} + +static void v3020_gpio_unmap (struct v3020 *chip) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (v3020_gpio); i++) +gpio_free (v3020_gpio[i].gpio); +} + +static void v3020_gpio_write_bit (struct v3020 *chip,unsigned char bit) +{ +gpio_direction_output (chip->gpio[V3020_IO ].gpio, bit); +gpio_set_value (chip->gpio[V3020_CS ].gpio,0 ); +gpio_set_value (chip->gpio[V3020_WR ].gpio,0 ); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_WR ].gpio,1 ); +gpio_set_value (chip->gpio[V3020_CS ].gpio,1 ); +} + +static unsigned char v3020_gpio_read_bit (struct v3020 *chip) +{ +int bit; + +gpio_direction_input (chip->gpio[V3020_IO ].gpio); +gpio_set_value (chip->gpio[V3020_CS ].gpio,0 ); +gpio_set_value (chip->gpio[V3020_RD ].gpio,0 ); +udelay (1 ); + bit = !!gpio_get_value (chip->gpio[V3020_IO ].gpio); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_RD ].gpio,1 ); +gpio_set_value (chip->gpio[V3020_CS ].gpio,1 ); + +return bit; +} + +static struct v3020_chip_ops v3020_gpio_ops = { + .map_io = v3020_gpio_map, + .unmap_io = v3020_gpio_unmap, + .read_bit = v3020_gpio_read_bit, + .write_bit = v3020_gpio_write_bit, +}; +static void v3020_set_reg (struct v3020 *chip,unsigned char address,unsigned char data) {
@@ -46,7 +191,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, tmp = address;for (i =0 ; i <4 ; i++) { -writel ((tmp &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (tmp &1 )); tmp >>=1 ;udelay (1 ); }
@@ -54,7 +199,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,/* Commands dont have data */ if (!V3020_IS_COMMAND (address)) {for (i =0 ; i <8 ; i++) { -writel ((data &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (data &1 )); data >>=1 ;udelay (1 ); }
@@ -67,14 +212,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)int i;for (i =0 ; i <4 ; i++) { -writel ((address &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (address &1 )); address >>=1 ;udelay (1 ); }for (i =0 ; i <8 ; i++) { data >>=1 ; -if (readl (chip->ioaddress) & (1 << chip->leftshift)) +if (chip->ops->read_bit (chip)) data |=0x80 ;udelay (1 ); }
@@ -164,25 +309,23 @@ static int rtc_probe(struct platform_device *pdev)int i;int temp; -if (pdev->num_resources !=1 ) -return -EBUSY ; - -if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) -return -EBUSY ; - chip =kzalloc (sizeof *chip,GFP_KERNEL );if (!chip)return -ENOMEM ; - chip->leftshift = pdata->leftshift; - chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); -if (chip->ioaddress ==NULL ) +if (pdata->use_gpio) + chip->ops = &v3020_gpio_ops; +else + chip->ops = &v3020_mmio_ops; + + retval = chip->ops->map_io (chip, pdev, pdata); +if (retval) goto err_chip;/* Make sure the v3020 expects a communication cycle * by reading 8 times */ for (i =0 ; i <8 ; i++) - temp =readl (chip->ioaddress); + temp = chip->ops->read_bit (chip);/* Test chip by doing a write/read sequence * to the chip ram */
@@ -196,10 +339,17 @@ static int rtc_probe(struct platform_device *pdev)* are all disabled */ v3020_set_reg (chip,V3020_STATUS_0 ,0x0 ); -dev_info (&pdev->dev,"Chip available at physical address 0x%llx," -"data connected to D%d\n" , - (unsigned long long )pdev->resource[0 ].start, - chip->leftshift); +if (pdata->use_gpio) +dev_info (&pdev->dev,"Chip available at GPIOs " +"%d, %d, %d, %d\n" , + chip->gpio[V3020_CS ].gpio, chip->gpio[V3020_WR ].gpio, + chip->gpio[V3020_RD ].gpio, chip->gpio[V3020_IO ].gpio); +else +dev_info (&pdev->dev,"Chip available at " +"physical address 0x%llx," +"data connected to D%d\n" , + (unsigned long long )pdev->resource[0 ].start, + chip->leftshift);platform_set_drvdata (pdev, chip);
@@ -214,7 +364,7 @@ static int rtc_probe(struct platform_device *pdev)return 0 ; err_io: -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip); err_chip:kfree (chip);
@@ -229,7 +379,7 @@ static int rtc_remove(struct platform_device *dev)if (rtc)rtc_device_unregister (rtc); -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip);kfree (chip);return 0 ;
include/linux/rtc-v3020.h +6 -0
@@ -14,6 +14,12 @@* is used depends on the board. */ struct v3020_platform_data {int leftshift;/* (1<<(leftshift)) & readl() */ + +int use_gpio:1 ; +unsigned int gpio_cs; +unsigned int gpio_wr; +unsigned int gpio_rd; +unsigned int gpio_io; };#define V3020_STATUS_0 0x00
Signature · 1 line
1.5.6.4
Quoted 4 lines · On Mon, 2 Mar 2009 13:40:57 +0200 Mike Rapoport <[email protected]> wrote:
The v3020 RTC can be connected to GPIOs as well as to memory-like interface. Add ability to use GPIO bit-bang for v3020 read-write access.
Signed-off-by Mike Rapoport <[email protected]>
For the rtc part you have my
please send the patch to the GPIO maintainer . Once you have his Acked-by and the one of the driver's author you can send it to Andrew for inclusion.
Signature · 6 lines
Best regards, Alessandro Zummo, Tower Technologies - Torino, Italy http://www.towertech.it
David,
Can you please review and Ack the GPIO part of the below patch?
Quoted 8 lines · Alessandro Zummo
Quoted 4 lines · On Mon, 2 Mar 2009 13:40:57 +0200 Mike Rapoport <[email protected]> wrote:
The v3020 RTC can be connected to GPIOs as well as to memory-like interface. Add ability to use GPIO bit-bang for v3020 read-write access.
Signed-off-by Mike Rapoport <[email protected]>
Quoted 8 lines
For the rtc part you have my
Acked-by Alessandro Zummo <[email protected]>please send the patch to the GPIO maintainer . Once you have his Acked-by and the one of the driver's author you can send it to Andrew for inclusion.
--- drivers/rtc/rtc-v3020.c | 190 ++++++++++++++++++++++++++++++++++++++++----- include/linux/rtc-v3020.h | 6 ++ 2 files changed, 176 insertions(+), 20 deletions(-)
drivers/rtc/rtc-v3020.c +170 -20
@@ -27,17 +27,162 @@#include <linux/bcd.h> #include <linux/rtc-v3020.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/io.h> #undef DEBUG +struct v3020 ; + +struct v3020_chip_ops { +int (*map_io)(struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata); +void (*unmap_io)(struct v3020 *chip); +unsigned char (*read_bit)(struct v3020 *chip); +void (*write_bit)(struct v3020 *chip,unsigned char bit); +}; + +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 + +struct v3020_gpio { +const char *name; +unsigned int gpio; +}; +struct v3020 { +/* MMIO access */ void __iomem *ioaddress;int leftshift; + +/* GPIO access */ +struct v3020_gpio *gpio; + +struct v3020_chip_ops *ops; +struct rtc_device *rtc; }; + +static int v3020_mmio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +if (pdev->num_resources !=1 ) +return -EBUSY ; + +if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) +return -EBUSY ; + + chip->leftshift = pdata->leftshift; + chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); +if (chip->ioaddress ==NULL ) +return -EBUSY ; + +return 0 ; +} + +static void v3020_mmio_unmap (struct v3020 *chip) +{ +iounmap (chip->ioaddress); +} + +static void v3020_mmio_write_bit (struct v3020 *chip,unsigned char bit) +{ +writel (bit << chip->leftshift, chip->ioaddress); +} + +static unsigned char v3020_mmio_read_bit (struct v3020 *chip) +{ +return readl (chip->ioaddress) & (1 << chip->leftshift); +} + +static struct v3020_chip_ops v3020_mmio_ops = { + .map_io = v3020_mmio_map, + .unmap_io = v3020_mmio_unmap, + .read_bit = v3020_mmio_read_bit, + .write_bit = v3020_mmio_write_bit, +}; + +static struct v3020_gpio v3020_gpio[] = { + {"RTC CS" ,0 }, + {"RTC WR" ,0 }, + {"RTC RD" ,0 }, + {"RTC IO" ,0 }, +}; + +static int v3020_gpio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +int i, err; + + v3020_gpio[V3020_CS ].gpio = pdata->gpio_cs; + v3020_gpio[V3020_WR ].gpio = pdata->gpio_wr; + v3020_gpio[V3020_RD ].gpio = pdata->gpio_rd; + v3020_gpio[V3020_IO ].gpio = pdata->gpio_io; + +for (i =0 ; i <ARRAY_SIZE (v3020_gpio); i++) { + err =gpio_request (v3020_gpio[i].gpio, v3020_gpio[i].name); +if (err) + goto err_request; + +gpio_direction_output (v3020_gpio[i].gpio,1 ); + } + + chip->gpio = v3020_gpio; + +return 0 ; + +err_request: +for (; i >=0 ; i--) +gpio_free (v3020_gpio[i].gpio); + +return err; +} + +static void v3020_gpio_unmap (struct v3020 *chip) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (v3020_gpio); i++) +gpio_free (v3020_gpio[i].gpio); +} + +static void v3020_gpio_write_bit (struct v3020 *chip,unsigned char bit) +{ +gpio_direction_output (chip->gpio[V3020_IO ].gpio, bit); +gpio_set_value (chip->gpio[V3020_CS ].gpio,0 ); +gpio_set_value (chip->gpio[V3020_WR ].gpio,0 ); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_WR ].gpio,1 ); +gpio_set_value (chip->gpio[V3020_CS ].gpio,1 ); +} + +static unsigned char v3020_gpio_read_bit (struct v3020 *chip) +{ +int bit; + +gpio_direction_input (chip->gpio[V3020_IO ].gpio); +gpio_set_value (chip->gpio[V3020_CS ].gpio,0 ); +gpio_set_value (chip->gpio[V3020_RD ].gpio,0 ); +udelay (1 ); + bit = !!gpio_get_value (chip->gpio[V3020_IO ].gpio); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_RD ].gpio,1 ); +gpio_set_value (chip->gpio[V3020_CS ].gpio,1 ); + +return bit; +} + +static struct v3020_chip_ops v3020_gpio_ops = { + .map_io = v3020_gpio_map, + .unmap_io = v3020_gpio_unmap, + .read_bit = v3020_gpio_read_bit, + .write_bit = v3020_gpio_write_bit, +}; +static void v3020_set_reg (struct v3020 *chip,unsigned char address,unsigned char data) {
@@ -46,7 +191,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, tmp = address;for (i =0 ; i <4 ; i++) { -writel ((tmp &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (tmp &1 )); tmp >>=1 ;udelay (1 ); }
@@ -54,7 +199,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,/* Commands dont have data */ if (!V3020_IS_COMMAND (address)) {for (i =0 ; i <8 ; i++) { -writel ((data &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (data &1 )); data >>=1 ;udelay (1 ); }
@@ -67,14 +212,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)int i;for (i =0 ; i <4 ; i++) { -writel ((address &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (address &1 )); address >>=1 ;udelay (1 ); }for (i =0 ; i <8 ; i++) { data >>=1 ; -if (readl (chip->ioaddress) & (1 << chip->leftshift)) +if (chip->ops->read_bit (chip)) data |=0x80 ;udelay (1 ); }
@@ -164,25 +309,23 @@ static int rtc_probe(struct platform_device *pdev)int i;int temp; -if (pdev->num_resources !=1 ) -return -EBUSY ; - -if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) -return -EBUSY ; - chip =kzalloc (sizeof *chip,GFP_KERNEL );if (!chip)return -ENOMEM ; - chip->leftshift = pdata->leftshift; - chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); -if (chip->ioaddress ==NULL ) +if (pdata->use_gpio) + chip->ops = &v3020_gpio_ops; +else + chip->ops = &v3020_mmio_ops; + + retval = chip->ops->map_io (chip, pdev, pdata); +if (retval) goto err_chip;/* Make sure the v3020 expects a communication cycle * by reading 8 times */ for (i =0 ; i <8 ; i++) - temp =readl (chip->ioaddress); + temp = chip->ops->read_bit (chip);/* Test chip by doing a write/read sequence * to the chip ram */
@@ -196,10 +339,17 @@ static int rtc_probe(struct platform_device *pdev)* are all disabled */ v3020_set_reg (chip,V3020_STATUS_0 ,0x0 ); -dev_info (&pdev->dev,"Chip available at physical address 0x%llx," -"data connected to D%d\n" , - (unsigned long long )pdev->resource[0 ].start, - chip->leftshift); +if (pdata->use_gpio) +dev_info (&pdev->dev,"Chip available at GPIOs " +"%d, %d, %d, %d\n" , + chip->gpio[V3020_CS ].gpio, chip->gpio[V3020_WR ].gpio, + chip->gpio[V3020_RD ].gpio, chip->gpio[V3020_IO ].gpio); +else +dev_info (&pdev->dev,"Chip available at " +"physical address 0x%llx," +"data connected to D%d\n" , + (unsigned long long )pdev->resource[0 ].start, + chip->leftshift);platform_set_drvdata (pdev, chip);
@@ -214,7 +364,7 @@ static int rtc_probe(struct platform_device *pdev)return 0 ; err_io: -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip); err_chip:kfree (chip);
@@ -229,7 +379,7 @@ static int rtc_remove(struct platform_device *dev)if (rtc)rtc_device_unregister (rtc); -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip);kfree (chip);return 0 ;
include/linux/rtc-v3020.h +6 -0
@@ -14,6 +14,12 @@* is used depends on the board. */ struct v3020_platform_data {int leftshift;/* (1<<(leftshift)) & readl() */ + +int use_gpio:1 ; +unsigned int gpio_cs; +unsigned int gpio_wr; +unsigned int gpio_rd; +unsigned int gpio_io; };#define V3020_STATUS_0 0x00
Signature · 7 lines
1.5.6.4 -- Sincerely yours, Mike.
Quoted 8 lines · Mike Rapoport
drivers/rtc/rtc-v3020.c +8
-0+ +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 + +struct v3020_gpio { + const char *name;
drivers/rtc/rtc-v3020.c line 114
Quoted 10 lines
drivers/rtc/rtc-v3020.c +9
-0+ unsigned int gpio; +}; + +static struct v3020_gpio v3020_gpio[] = { + { "RTC CS", 0 }, + { "RTC WR", 0 }, + { "RTC RD", 0 }, + { "RTC IO", 0 }, +};
After Andrew's fault path cleanup it looks OK, but I see no point to that GPIO struct with the name. You know the name based on the position, if you ever need one. Take that away, and you can add my ack.
Also, best not to have a single static struct; there's no need to add a driver restriction that there be only one of these chips in a system.
- Dave
David,
Quoted 26 lines · David Brownell
Quoted 8 lines · Mike Rapoport
(quoted diff) +8
-0+ +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 + +struct v3020_gpio { + const char *name;Review
Quoted 10 lines
(quoted diff) +9
-0+ unsigned int gpio; +}; + +static struct v3020_gpio v3020_gpio[] = { + { "RTC CS", 0 }, + { "RTC WR", 0 }, + { "RTC RD", 0 }, + { "RTC IO", 0 }, +};After Andrew's fault path cleanup it looks OK, but I see no point to that GPIO struct with the name. You know the name based on the position, if you ever need one. Take that away, and you can add my ack.
Quoted 3 lines
Also, best not to have a single static struct; there's no need to add a driver restriction that there be only one of these chips in a system.
What about the below version?
Quoted 2 lines
- Dave
--- drivers/rtc/rtc-v3020.c | 183 ++++++++++++++++++++++++++++++++++++++++----- include/linux/rtc-v3020.h | 6 ++ 2 files changed, 169 insertions(+), 20 deletions(-)
drivers/rtc/rtc-v3020.c +163 -20
@@ -27,17 +27,155 @@#include <linux/bcd.h> #include <linux/rtc-v3020.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/io.h> #undef DEBUG +struct v3020 ; + +struct v3020_chip_ops { +int (*map_io)(struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata); +void (*unmap_io)(struct v3020 *chip); +unsigned char (*read_bit)(struct v3020 *chip); +void (*write_bit)(struct v3020 *chip,unsigned char bit); +}; + +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 +struct v3020 { +/* MMIO access */ void __iomem *ioaddress;int leftshift; + +/* GPIO access */ +unsigned int gpio[4 ]; + +struct v3020_chip_ops *ops; +struct rtc_device *rtc; }; + +static int v3020_mmio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +if (pdev->num_resources !=1 ) +return -EBUSY ; + +if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) +return -EBUSY ; + + chip->leftshift = pdata->leftshift; + chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); +if (chip->ioaddress ==NULL ) +return -EBUSY ; + +return 0 ; +} + +static void v3020_mmio_unmap (struct v3020 *chip) +{ +iounmap (chip->ioaddress); +} + +static void v3020_mmio_write_bit (struct v3020 *chip,unsigned char bit) +{ +writel (bit << chip->leftshift, chip->ioaddress); +} + +static unsigned char v3020_mmio_read_bit (struct v3020 *chip) +{ +return readl (chip->ioaddress) & (1 << chip->leftshift); +} + +static struct v3020_chip_ops v3020_mmio_ops = { + .map_io = v3020_mmio_map, + .unmap_io = v3020_mmio_unmap, + .read_bit = v3020_mmio_read_bit, + .write_bit = v3020_mmio_write_bit, +}; + +static const char *v3020_gpio_names[] = { +"RTC CS" , +"RTC WR" , +"RTC RD" , +"RTC IO" , +}; + +static int v3020_gpio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +int i, err; + + chip->gpio[V3020_CS ] = pdata->gpio_cs; + chip->gpio[V3020_WR ] = pdata->gpio_wr; + chip->gpio[V3020_RD ] = pdata->gpio_rd; + chip->gpio[V3020_IO ] = pdata->gpio_io; + +for (i =0 ; i <ARRAY_SIZE (chip->gpio); i++) { + err =gpio_request (chip->gpio[i], v3020_gpio_names[i]); +if (err) + goto err_request; + +gpio_direction_output (chip->gpio[i],1 ); + } + +return 0 ; + +err_request: +while (--i >=0 ) +gpio_free (chip->gpio[i]); + +return err; +} + +static void v3020_gpio_unmap (struct v3020 *chip) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (chip->gpio); i++) +gpio_free (chip->gpio[i]); +} + +static void v3020_gpio_write_bit (struct v3020 *chip,unsigned char bit) +{ +gpio_direction_output (chip->gpio[V3020_IO ], bit); +gpio_set_value (chip->gpio[V3020_CS ],0 ); +gpio_set_value (chip->gpio[V3020_WR ],0 ); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_WR ],1 ); +gpio_set_value (chip->gpio[V3020_CS ],1 ); +} + +static unsigned char v3020_gpio_read_bit (struct v3020 *chip) +{ +int bit; + +gpio_direction_input (chip->gpio[V3020_IO ]); +gpio_set_value (chip->gpio[V3020_CS ],0 ); +gpio_set_value (chip->gpio[V3020_RD ],0 ); +udelay (1 ); + bit = !!gpio_get_value (chip->gpio[V3020_IO ]); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_RD ],1 ); +gpio_set_value (chip->gpio[V3020_CS ],1 ); + +return bit; +} + +static struct v3020_chip_ops v3020_gpio_ops = { + .map_io = v3020_gpio_map, + .unmap_io = v3020_gpio_unmap, + .read_bit = v3020_gpio_read_bit, + .write_bit = v3020_gpio_write_bit, +}; +static void v3020_set_reg (struct v3020 *chip,unsigned char address,unsigned char data) {
@@ -46,7 +184,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, tmp = address;for (i =0 ; i <4 ; i++) { -writel ((tmp &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (tmp &1 )); tmp >>=1 ;udelay (1 ); }
@@ -54,7 +192,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,/* Commands dont have data */ if (!V3020_IS_COMMAND (address)) {for (i =0 ; i <8 ; i++) { -writel ((data &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (data &1 )); data >>=1 ;udelay (1 ); }
@@ -67,14 +205,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)int i;for (i =0 ; i <4 ; i++) { -writel ((address &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (address &1 )); address >>=1 ;udelay (1 ); }for (i =0 ; i <8 ; i++) { data >>=1 ; -if (readl (chip->ioaddress) & (1 << chip->leftshift)) +if (chip->ops->read_bit (chip)) data |=0x80 ;udelay (1 ); }
@@ -164,25 +302,23 @@ static int rtc_probe(struct platform_device *pdev)int i;int temp; -if (pdev->num_resources !=1 ) -return -EBUSY ; - -if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) -return -EBUSY ; - chip =kzalloc (sizeof *chip,GFP_KERNEL );if (!chip)return -ENOMEM ; - chip->leftshift = pdata->leftshift; - chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); -if (chip->ioaddress ==NULL ) +if (pdata->use_gpio) + chip->ops = &v3020_gpio_ops; +else + chip->ops = &v3020_mmio_ops; + + retval = chip->ops->map_io (chip, pdev, pdata); +if (retval) goto err_chip;/* Make sure the v3020 expects a communication cycle * by reading 8 times */ for (i =0 ; i <8 ; i++) - temp =readl (chip->ioaddress); + temp = chip->ops->read_bit (chip);/* Test chip by doing a write/read sequence * to the chip ram */
@@ -196,10 +332,17 @@ static int rtc_probe(struct platform_device *pdev)* are all disabled */ v3020_set_reg (chip,V3020_STATUS_0 ,0x0 ); -dev_info (&pdev->dev,"Chip available at physical address 0x%llx," -"data connected to D%d\n" , - (unsigned long long )pdev->resource[0 ].start, - chip->leftshift); +if (pdata->use_gpio) +dev_info (&pdev->dev,"Chip available at GPIOs " +"%d, %d, %d, %d\n" , + chip->gpio[V3020_CS ], chip->gpio[V3020_WR ], + chip->gpio[V3020_RD ], chip->gpio[V3020_IO ]); +else +dev_info (&pdev->dev,"Chip available at " +"physical address 0x%llx," +"data connected to D%d\n" , + (unsigned long long )pdev->resource[0 ].start, + chip->leftshift);platform_set_drvdata (pdev, chip);
@@ -214,7 +357,7 @@ static int rtc_probe(struct platform_device *pdev)return 0 ; err_io: -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip); err_chip:kfree (chip);
@@ -229,7 +372,7 @@ static int rtc_remove(struct platform_device *dev)if (rtc)rtc_device_unregister (rtc); -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip);kfree (chip);return 0 ;
include/linux/rtc-v3020.h +6 -0
@@ -14,6 +14,12 @@* is used depends on the board. */ struct v3020_platform_data {int leftshift;/* (1<<(leftshift)) & readl() */ + +int use_gpio:1 ; +unsigned int gpio_cs; +unsigned int gpio_wr; +unsigned int gpio_rd; +unsigned int gpio_io; };#define V3020_STATUS_0 0x00
Signature · 8 lines
1.5.6.4 -- Sincerely yours, Mike.
Quoted 2 lines · Mike Rapoport
What about the below version?
Looks OK.
Quoted 306 lines
Signed-off-by Mike Rapoport <[email protected]>CC Alessandro Zummo <[email protected]>CC David Brownell <[email protected]>CC Andrew Morton <[email protected]>--- drivers/rtc/rtc-v3020.c | 183 ++++++++++++++++++++++++++++++++++++++++----- include/linux/rtc-v3020.h | 6 ++ 2 files changed, 169 insertions(+), 20 deletions(-)drivers/rtc/rtc-v3020.c +163
-20@@ -27,17 +27,155 @@#include <linux/bcd.h> #include <linux/rtc-v3020.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/io.h> #undef DEBUG +struct v3020 ; + +struct v3020_chip_ops { +int (*map_io)(struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata); +void (*unmap_io)(struct v3020 *chip); +unsigned char (*read_bit)(struct v3020 *chip); +void (*write_bit)(struct v3020 *chip,unsigned char bit); +}; + +#define V3020_CS 0 +#define V3020_WR 1 +#define V3020_RD 2 +#define V3020_IO 3 +struct v3020 { +/* MMIO access */ void __iomem *ioaddress;int leftshift; + +/* GPIO access */ +unsigned int gpio[4 ]; + +struct v3020_chip_ops *ops; +struct rtc_device *rtc; }; + +static int v3020_mmio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +if (pdev->num_resources !=1 ) +return -EBUSY ; + +if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) +return -EBUSY ; + + chip->leftshift = pdata->leftshift; + chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); +if (chip->ioaddress ==NULL ) +return -EBUSY ; + +return 0 ; +} + +static void v3020_mmio_unmap (struct v3020 *chip) +{ +iounmap (chip->ioaddress); +} + +static void v3020_mmio_write_bit (struct v3020 *chip,unsigned char bit) +{ +writel (bit << chip->leftshift, chip->ioaddress); +} + +static unsigned char v3020_mmio_read_bit (struct v3020 *chip) +{ +return readl (chip->ioaddress) & (1 << chip->leftshift); +} + +static struct v3020_chip_ops v3020_mmio_ops = { + .map_io = v3020_mmio_map, + .unmap_io = v3020_mmio_unmap, + .read_bit = v3020_mmio_read_bit, + .write_bit = v3020_mmio_write_bit, +}; + +static const char *v3020_gpio_names[] = { +"RTC CS" , +"RTC WR" , +"RTC RD" , +"RTC IO" , +}; + +static int v3020_gpio_map (struct v3020 *chip,struct platform_device *pdev, +struct v3020_platform_data *pdata) +{ +int i, err; + + chip->gpio[V3020_CS ] = pdata->gpio_cs; + chip->gpio[V3020_WR ] = pdata->gpio_wr; + chip->gpio[V3020_RD ] = pdata->gpio_rd; + chip->gpio[V3020_IO ] = pdata->gpio_io; + +for (i =0 ; i <ARRAY_SIZE (chip->gpio); i++) { + err =gpio_request (chip->gpio[i], v3020_gpio_names[i]); +if (err) + goto err_request; + +gpio_direction_output (chip->gpio[i],1 ); + } + +return 0 ; + +err_request: +while (--i >=0 ) +gpio_free (chip->gpio[i]); + +return err; +} + +static void v3020_gpio_unmap (struct v3020 *chip) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (chip->gpio); i++) +gpio_free (chip->gpio[i]); +} + +static void v3020_gpio_write_bit (struct v3020 *chip,unsigned char bit) +{ +gpio_direction_output (chip->gpio[V3020_IO ], bit); +gpio_set_value (chip->gpio[V3020_CS ],0 ); +gpio_set_value (chip->gpio[V3020_WR ],0 ); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_WR ],1 ); +gpio_set_value (chip->gpio[V3020_CS ],1 ); +} + +static unsigned char v3020_gpio_read_bit (struct v3020 *chip) +{ +int bit; + +gpio_direction_input (chip->gpio[V3020_IO ]); +gpio_set_value (chip->gpio[V3020_CS ],0 ); +gpio_set_value (chip->gpio[V3020_RD ],0 ); +udelay (1 ); + bit = !!gpio_get_value (chip->gpio[V3020_IO ]); +udelay (1 ); +gpio_set_value (chip->gpio[V3020_RD ],1 ); +gpio_set_value (chip->gpio[V3020_CS ],1 ); + +return bit; +} + +static struct v3020_chip_ops v3020_gpio_ops = { + .map_io = v3020_gpio_map, + .unmap_io = v3020_gpio_unmap, + .read_bit = v3020_gpio_read_bit, + .write_bit = v3020_gpio_write_bit, +}; +static void v3020_set_reg (struct v3020 *chip,unsigned char address,unsigned char data) {@@ -46,7 +184,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, tmp = address;for (i =0 ; i <4 ; i++) { -writel ((tmp &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (tmp &1 )); tmp >>=1 ;udelay (1 ); }@@ -54,7 +192,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,/* Commands dont have data */ if (!V3020_IS_COMMAND (address)) {for (i =0 ; i <8 ; i++) { -writel ((data &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (data &1 )); data >>=1 ;udelay (1 ); }@@ -67,14 +205,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)int i;for (i =0 ; i <4 ; i++) { -writel ((address &1 ) << chip->leftshift, chip->ioaddress); + chip->ops->write_bit (chip, (address &1 )); address >>=1 ;udelay (1 ); }for (i =0 ; i <8 ; i++) { data >>=1 ; -if (readl (chip->ioaddress) & (1 << chip->leftshift)) +if (chip->ops->read_bit (chip)) data |=0x80 ;udelay (1 ); }@@ -164,25 +302,23 @@ static int rtc_probe(struct platform_device *pdev)int i;int temp; -if (pdev->num_resources !=1 ) -return -EBUSY ; - -if (pdev->resource[0 ].flags !=IORESOURCE_MEM ) -return -EBUSY ; - chip =kzalloc (sizeof *chip,GFP_KERNEL );if (!chip)return -ENOMEM ; - chip->leftshift = pdata->leftshift; - chip->ioaddress =ioremap (pdev->resource[0 ].start,1 ); -if (chip->ioaddress ==NULL ) +if (pdata->use_gpio) + chip->ops = &v3020_gpio_ops; +else + chip->ops = &v3020_mmio_ops; + + retval = chip->ops->map_io (chip, pdev, pdata); +if (retval) goto err_chip;/* Make sure the v3020 expects a communication cycle * by reading 8 times */ for (i =0 ; i <8 ; i++) - temp =readl (chip->ioaddress); + temp = chip->ops->read_bit (chip);/* Test chip by doing a write/read sequence * to the chip ram */ @@ -196,10 +332,17 @@ static int rtc_probe(struct platform_device *pdev)* are all disabled */ v3020_set_reg (chip,V3020_STATUS_0 ,0x0 ); -dev_info (&pdev->dev,"Chip available at physical address 0x%llx," -"data connected to D%d\n" , - (unsigned long long )pdev->resource[0 ].start, - chip->leftshift); +if (pdata->use_gpio) +dev_info (&pdev->dev,"Chip available at GPIOs " +"%d, %d, %d, %d\n" , + chip->gpio[V3020_CS ], chip->gpio[V3020_WR ], + chip->gpio[V3020_RD ], chip->gpio[V3020_IO ]); +else +dev_info (&pdev->dev,"Chip available at " +"physical address 0x%llx," +"data connected to D%d\n" , + (unsigned long long )pdev->resource[0 ].start, + chip->leftshift);platform_set_drvdata (pdev, chip);@@ -214,7 +357,7 @@ static int rtc_probe(struct platform_device *pdev)return 0 ; err_io: -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip); err_chip:kfree (chip);@@ -229,7 +372,7 @@ static int rtc_remove(struct platform_device *dev)if (rtc)rtc_device_unregister (rtc); -iounmap (chip->ioaddress); + chip->ops->unmap_io (chip);kfree (chip);return 0 ;include/linux/rtc-v3020.h +6
-0@@ -14,6 +14,12 @@* is used depends on the board. */ struct v3020_platform_data {int leftshift;/* (1<<(leftshift)) & readl() */ + +int use_gpio:1 ; +unsigned int gpio_cs; +unsigned int gpio_wr; +unsigned int gpio_rd; +unsigned int gpio_io; };#define V3020_STATUS_0 0x00Signature · 8 lines
1.5.6.4 -- Sincerely yours, Mike.
Quoted 18 lines · On Mon, 2 Mar 2009 13:40:57 +0200 Mike Rapoport <[email protected]> wrote:
(quoted diff) +18
-0+static int v3020_gpio_map(struct v3020 *chip, struct platform_device *pdev, + struct v3020_platform_data *pdata) +{ + int i, err; + + v3020_gpio[V3020_CS].gpio = pdata->gpio_cs; + v3020_gpio[V3020_WR].gpio = pdata->gpio_wr; + v3020_gpio[V3020_RD].gpio = pdata->gpio_rd; + v3020_gpio[V3020_IO].gpio = pdata->gpio_io; + + for (i = 0; i < ARRAY_SIZE(v3020_gpio); i++) { + err = gpio_request(v3020_gpio[i].gpio, v3020_gpio[i].name); + if (err) + goto err_request; + + gpio_direction_output(v3020_gpio[i].gpio, 1); + } +
Review
Quoted 10 lines
(quoted diff) +10
-0+ chip->gpio = v3020_gpio; + + return 0; + +err_request: + for (; i >= 0; i--) + gpio_free(v3020_gpio[i].gpio); + + return err; +}
It needs this fix, I think?
fix off-by-one in error path
drivers/rtc/rtc-v3020.c renamed from drivers/rtc/rtc-v3020.c~rtc-v3020-add-ability-to-access-v3020-chip-with-gpios-fix +1 -1
@@ -136,7 +136,7 @@ static int v3020_gpio_map(struct v3020 *return 0 ; err_request: -for (; i >=0 ; i--) +while (--i >=0 )gpio_free (v3020_gpio[i].gpio);return err;
Quoted 25 lines · Andrew Morton
Quoted 22 lines · On Mon, 2 Mar 2009 13:40:57 +0200 Mike Rapoport <[email protected]> wrote:
(quoted diff) +22
-0+static int v3020_gpio_map(struct v3020 *chip, struct platform_device *pdev, + struct v3020_platform_data *pdata) +{ + int i, err; + + v3020_gpio[V3020_CS].gpio = pdata->gpio_cs; + v3020_gpio[V3020_WR].gpio = pdata->gpio_wr; + v3020_gpio[V3020_RD].gpio = pdata->gpio_rd; + v3020_gpio[V3020_IO].gpio = pdata->gpio_io; + + for (i = 0; i < ARRAY_SIZE(v3020_gpio); i++) { + err = gpio_request(v3020_gpio[i].gpio, v3020_gpio[i].name); + if (err) + goto err_request; + + gpio_direction_output(v3020_gpio[i].gpio, 1); + } + + chip->gpio = v3020_gpio; + + return 0; +
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+err_request: + for (; i >= 0; i--) + gpio_free(v3020_gpio[i].gpio); + + return err; +}It needs this fix, I think?
Indeed. Thanks.
Quoted 21 lines
fix off-by-one in error path
drivers/rtc/rtc-v3020.c renamed from drivers/rtc/rtc-v3020.c~rtc-v3020-add-ability-to-access-v3020-chip-with-gpios-fix +1
-2@@ -136,7 +136,7 @@ static int v3020_gpio_map(struct v3020 *return 0 ; err_request: -for (; i >=0 ; i--) +while (--i >=0 )gpio_free (v3020_gpio[i].gpio);return err; --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
Sincerely yours, Mike.