| Message ID | 1422412229-23640-1-git-send-email-chao.xie@marvell.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Jan 28, 2015 at 8:00 AM, Chao Xie <chao.xie@marvell.com> wrote: > From: Chao Xie <chao.xie@marvell.com> > > For some old PXA series, they used PXA GPIO driver. > The IP of GPIO changes since PXA988 which is Marvell MMP > series. > It will use new way to control the GPIO level, direction > and edge status. > > Signed-off-by: Chao Xie <chao.xie@marvell.com> > --- > drivers/gpio/Kconfig | 7 + > drivers/gpio/Makefile | 1 + > drivers/gpio/gpio-mmp.c | 444 ++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 452 insertions(+) > create mode 100644 drivers/gpio/gpio-mmp.c (...) > +static int mmp_gpio_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mmp_gpio_platform_data *pdata; > + struct device_node *np; > + struct mmp_gpio_chip *mmp_chip; > + struct mmp_gpio_bank *bank; > + struct resource *res; > + struct irq_domain *domain; > + struct clk *clk; > + int irq, i, ret; > + void __iomem *base; > + > + pdata = dev_get_platdata(dev); > + np = pdev->dev.of_node; > + if (!np && !pdata) > + return -EINVAL; > + > + mmp_chip = devm_kzalloc(dev, sizeof(*mmp_chip), GFP_KERNEL); > + if (mmp_chip == NULL) > + return -ENOMEM; > + Using ! operator preffred instead of comparing with NULL. > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) > + return irq; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) > + return -EINVAL; This check is not required.. Check on resource happenning with devm_ioremap_resource. > + base = devm_ioremap_resource(dev, res); > + if (!base) > + return -EINVAL; I dont think this the correct return value.. return PTR_ERR(base) > + > + mmp_chip->irq = irq; > + mmp_chip->reg_base = base; > + > + if (pdata) > + ret = mmp_gpio_probe_pdata(pdev, mmp_chip, pdata); > + else > + ret = mmp_gpio_probe_dt(pdev, mmp_chip); > + > + if (ret) { > + dev_err(dev, "Fail to initialize gpio unit, error %d.\n", ret); > + return ret; > + } > + > + clk = devm_clk_get(dev, NULL); > + if (IS_ERR(clk)) { > + dev_err(dev, "Fail to get gpio clock, error %ld.\n", > + PTR_ERR(clk)); > + return PTR_ERR(clk); > + } > + ret = clk_prepare_enable(clk); > + if (ret) { > + dev_err(dev, "Fail to enable gpio clock, error %d.\n", ret); > + return ret; > + } > + > + domain = irq_domain_add_linear(np, mmp_chip->ngpio, > + &mmp_gpio_irq_domain_ops, mmp_chip); > + if (domain == NULL) Using ! operator preferred instead of comparing with NULL.
On Wed, Jan 28, 2015 at 3:30 AM, Chao Xie <chao.xie@marvell.com> wrote: > From: Chao Xie <chao.xie@marvell.com> > > For some old PXA series, they used PXA GPIO driver. > The IP of GPIO changes since PXA988 which is Marvell MMP > series. > It will use new way to control the GPIO level, direction > and edge status. > > Signed-off-by: Chao Xie <chao.xie@marvell.com> (...) > +config GPIO_MMP > + bool "MMP GPIO support" > + depends on ARCH_MMP All new simple drivers with IRQ should select GPIOLIB_IRQCHIP Since this looks like a basic MMIO driver I think you should also use: select GPIO_GENERIC And set up simple getter/setter functions with a > + help > + Say yes here to support the MMP GPIO device at PXA1088/PXA1908/PXA1928. > + Comparing with PXA GPIO device, the IP of MMP GPIO changes a lot. > + (...) > +++ b/drivers/gpio/gpio-mmp.c > +#include <linux/err.h> > +#include <linux/init.h> > +#include <linux/irq.h> You don't need this include with GPIOLIB_IRQCHIP > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/gpio.h> #include <linux/gpio/driver.h> > +#include <linux/clk.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > +#include <linux/module.h> > +#include <linux/irqdomain.h> > +#include <linux/irqchip/chained_irq.h> get rid of these two includes in favor of using GPIOLIB_IRQCHIP > +#include <linux/platform_data/gpio-mmp.h> Add: #include <linux/basic_mmio_gpio.h> And implement generic GPIO using bgpio_init() (...) > +#define GPLR 0x0 > +#define GPDR 0xc > +#define GPSR 0x18 > +#define GPCR 0x24 > +#define GRER 0x30 > +#define GFER 0x3c > +#define GEDR 0x48 > +#define GSDR 0x54 > +#define GCDR 0x60 > +#define GSRER 0x6c > +#define GCRER 0x78 > +#define GSFER 0x84 > +#define GCFER 0x90 > +#define GAPMASK 0x9c > +#define GCPMASK 0xa8 > + > +/* Bank will have 2^n GPIOes, and for mmp-gpio n = 5 */ > +#define BANK_GPIO_ORDER 5 > +#define BANK_GPIO_NUMBER (1 << BANK_GPIO_ORDER) > +#define BANK_GPIO_MASK (BANK_GPIO_NUMBER - 1) > + > +#define mmp_gpio_to_bank_idx(gpio) ((gpio) >> BANK_GPIO_ORDER) > +#define mmp_gpio_to_bank_offset(gpio) ((gpio) & BANK_GPIO_MASK) > +#define mmp_bank_to_gpio(idx, offset) (((idx) << BANK_GPIO_ORDER) \ > + | ((offset) & BANK_GPIO_MASK)) > + This looks convoluted. Why not just register each bank as a separate device instead of trying to figure out bank index like this? > +struct mmp_gpio_bank { > + void __iomem *reg_bank; > + u32 irq_mask; > + u32 irq_rising_edge; > + u32 irq_falling_edge; > +}; > + > +struct mmp_gpio_chip { > + struct gpio_chip chip; That should then be struct bgpio_chip bgc; For generic GPIO. > + void __iomem *reg_base; > + int irq; > + struct irq_domain *domain; These two will not be necessary to keep around with GPIOLIB_IRQCHIP > + unsigned int ngpio; This is part of struct gpio_chip so do not duplicate it. > + unsigned int nbank; > + struct mmp_gpio_bank *banks; And those two I think you should get rid of by creating one chip per bank. > +}; So merge these two into one struct and instantiate one device for each bank. > +static int mmp_gpio_to_irq(struct gpio_chip *chip, unsigned offset) > +{ > + struct mmp_gpio_chip *mmp_chip = > + container_of(chip, struct mmp_gpio_chip, chip); > + > + return irq_create_mapping(mmp_chip->domain, offset); > +} This function goes away with GPIOLIB_IRQCHIP. Just leave it unassigned and let the core handle this translation. > +static int mmp_gpio_direction_input(struct gpio_chip *chip, unsigned offset) > +{ > + struct mmp_gpio_chip *mmp_chip = > + container_of(chip, struct mmp_gpio_chip, chip); Create a static inline to cast the gpio_chip to a mmp_chip like this: static inline struct mmp_gpio_chip *to_mmp(struct gpio_chip *gc) { return container_of(chip, struct mmp_gpio_chip, chip); } Use that everywhere to simplify. > + struct mmp_gpio_bank *bank = > + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; > + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); And get rid of this by using one device per bank. > +static int mmp_gpio_direction_output(struct gpio_chip *chip, > +static int mmp_gpio_get(struct gpio_chip *chip, unsigned offset) > +static void mmp_gpio_set(struct gpio_chip *chip, unsigned offset, int value) Looks like generic GPIO will do the job. > +#ifdef CONFIG_OF_GPIO > +static int mmp_gpio_of_xlate(struct gpio_chip *chip, > + const struct of_phandle_args *gpiospec, > + u32 *flags) > +{ > + struct mmp_gpio_chip *mmp_chip = > + container_of(chip, struct mmp_gpio_chip, chip); > + > + /* GPIO index start from 0. */ > + if (gpiospec->args[0] >= mmp_chip->ngpio) > + return -EINVAL; > + > + if (flags) > + *flags = gpiospec->args[1]; > + > + return gpiospec->args[0]; > +} > +#endif This also goes to the generic xlate with one device per bank. > +static int mmp_gpio_irq_type(struct irq_data *d, unsigned int type) > +static void mmp_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) > +static void mmp_ack_muxed_gpio(struct irq_data *d) > +static void mmp_mask_muxed_gpio(struct irq_data *d) > +static void mmp_unmask_muxed_gpio(struct irq_data *d) Looks OK but make sure to convert to GPIOLIB_IRQCHIP and convert from struct gpio_chip * passed as irq_data *d to the internal chip type with the new to_mmp(). (...) From here: > +static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hw) > +{ > + irq_set_chip_and_handler(irq, &mmp_muxed_gpio_chip, > + handle_edge_irq); > + irq_set_chip_data(irq, d->host_data); > + set_irq_flags(irq, IRQ_TYPE_NONE); > + > + return 0; > +} > + > +static const struct irq_domain_ops mmp_gpio_irq_domain_ops = { > + .map = mmp_irq_domain_map, > + .xlate = irq_domain_xlate_twocell, > +}; To here goes away with GPIOLIB_IRQCHIP (moved to core). > +#ifdef CONFIG_OF_GPIO > + mmp_chip->chip.of_node = np; > + mmp_chip->chip.of_xlate = mmp_gpio_of_xlate; > + mmp_chip->chip.of_gpio_n_cells = 2; > +#endif Can't we just select or depend on OF_GPIO for this driver and get rid of the #fidef:s? > +static int __init mmp_gpio_init(void) > +{ > + return platform_driver_register(&mmp_gpio_driver); > +} > +postcore_initcall(mmp_gpio_init); Why does this nees to be postcore? A normal module would be nice. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
At 2015-02-03 21:21:43, "Linus Walleij" <linus.walleij@linaro.org> wrote: >On Wed, Jan 28, 2015 at 3:30 AM, Chao Xie <chao.xie@marvell.com> wrote: > >> From: Chao Xie <chao.xie@marvell.com> >> >> For some old PXA series, they used PXA GPIO driver. >> The IP of GPIO changes since PXA988 which is Marvell MMP >> series. >> It will use new way to control the GPIO level, direction >> and edge status. >> >> Signed-off-by: Chao Xie <chao.xie@marvell.com> > >(...) > >> +config GPIO_MMP >> + bool "MMP GPIO support" >> + depends on ARCH_MMP > >All new simple drivers with IRQ should > >select GPIOLIB_IRQCHIP > Thanks for review. I will check GPIOLIB_IRQCHIP and make use of it. >Since this looks like a basic MMIO driver I think >you should also use: > >select GPIO_GENERIC > I think the gpio-mmp is not same as gpio-generic. gpio-mmp need control the level/direction/rising edge detect enable/falling edge detect enable. For each of them, there are three registers: status register, setting register and clear register. For example, for direction, if you configure it as output. You need SET the bit in setting register. If you want to configure it as input You need SET the bit in clear register. The bits will be cleared by hardware if the operation is completed by hardware. It is same for level/rising edege detect enable/falling edge detect enable. If you want to read the status of the pin. For example, the current level of the pin. You CAN NOT read the setting/clear register. You need read the level status register. >And set up simple getter/setter functions with a > > >> + help >> + Say yes here to support the MMP GPIO device at PXA1088/PXA1908/PXA1928. >> + Comparing with PXA GPIO device, the IP of MMP GPIO changes a lot. >> + > >(...) > >> +++ b/drivers/gpio/gpio-mmp.c > >> +#include <linux/err.h> >> +#include <linux/init.h> >> +#include <linux/irq.h> > >You don't need this include with GPIOLIB_IRQCHIP > I will fix it. >> +#include <linux/interrupt.h> >> +#include <linux/io.h> >> +#include <linux/gpio.h> > >#include <linux/gpio/driver.h> > >> +#include <linux/clk.h> >> +#include <linux/of_device.h> >> +#include <linux/platform_device.h> >> +#include <linux/module.h> >> +#include <linux/irqdomain.h> >> +#include <linux/irqchip/chained_irq.h> > >get rid of these two includes in favor of using GPIOLIB_IRQCHIP > I will fix it. >> +#include <linux/platform_data/gpio-mmp.h> > >Add: >#include <linux/basic_mmio_gpio.h> > >And implement generic GPIO using bgpio_init() > >(...) The reasons are listed above >> +#define GPLR 0x0 >> +#define GPDR 0xc >> +#define GPSR 0x18 >> +#define GPCR 0x24 >> +#define GRER 0x30 >> +#define GFER 0x3c >> +#define GEDR 0x48 >> +#define GSDR 0x54 >> +#define GCDR 0x60 >> +#define GSRER 0x6c >> +#define GCRER 0x78 >> +#define GSFER 0x84 >> +#define GCFER 0x90 >> +#define GAPMASK 0x9c >> +#define GCPMASK 0xa8 >> + >> +/* Bank will have 2^n GPIOes, and for mmp-gpio n = 5 */ >> +#define BANK_GPIO_ORDER 5 >> +#define BANK_GPIO_NUMBER (1 << BANK_GPIO_ORDER) >> +#define BANK_GPIO_MASK (BANK_GPIO_NUMBER - 1) >> + >> +#define mmp_gpio_to_bank_idx(gpio) ((gpio) >> BANK_GPIO_ORDER) >> +#define mmp_gpio_to_bank_offset(gpio) ((gpio) & BANK_GPIO_MASK) >> +#define mmp_bank_to_gpio(idx, offset) (((idx) << BANK_GPIO_ORDER) \ >> + | ((offset) & BANK_GPIO_MASK)) >> + > >This looks convoluted. Why not just register each bank as a separate >device instead of trying to figure out bank index like this? > There are the following reasons 1. There is only one IRQ for the whole GPIO, even there are 3 or more banks. 2. The registers are not formatted into group. They are interleaved. For example, there are three banks, So for the registers order are LEVEL_STATUS_BANK0, LEVEL_STASTUS_BANK1, LEVEL_STATUS_BANK2 DIRECTION_STATUS_BANK0, DIRECTION_STATUS_BANK1, DIRECTION_STATUS_BANK2 3. each bank has 32 bits. Formatting them into one driver will make other driver easier. For example, the MMC driver has GPIO detection for card. So it knows the GPIO is GPIO56. In the device tree of MMC driver, you can simple add as cd-gpios = <&gpio 56 X> if you format them into different devices, the mmc driver owner need to know how much bits a bank is, and calculate out correct GPIOx and offset cd-gpios = <&gpio1 24 X> >> +struct mmp_gpio_bank { >> + void __iomem *reg_bank; >> + u32 irq_mask; >> + u32 irq_rising_edge; >> + u32 irq_falling_edge; >> +}; >> + >> +struct mmp_gpio_chip { >> + struct gpio_chip chip; > >That should then be >struct bgpio_chip bgc; > >For generic GPIO. > >> + void __iomem *reg_base; >> + int irq; >> + struct irq_domain *domain; > >These two will not be necessary to keep around with >GPIOLIB_IRQCHIP > >> + unsigned int ngpio; > >This is part of struct gpio_chip so do not duplicate it. > >> + unsigned int nbank; >> + struct mmp_gpio_bank *banks; > >And those two I think you should get rid of by creating one >chip per bank. > >> +}; > >So merge these two into one struct and instantiate one device for >each bank. > The reasons of why can not separate the banks are described above. >> +static int mmp_gpio_to_irq(struct gpio_chip *chip, unsigned offset) >> +{ >> + struct mmp_gpio_chip *mmp_chip = >> + container_of(chip, struct mmp_gpio_chip, chip); >> + >> + return irq_create_mapping(mmp_chip->domain, offset); >> +} > >This function goes away with GPIOLIB_IRQCHIP. >Just leave it unassigned and let the core handle this translation. > I will check GPIOLIB_IRQCHIP. >> +static int mmp_gpio_direction_input(struct gpio_chip *chip, unsigned offset) >> +{ >> + struct mmp_gpio_chip *mmp_chip = >> + container_of(chip, struct mmp_gpio_chip, chip); > >Create a static inline to cast the gpio_chip to a mmp_chip like >this: > >static inline struct mmp_gpio_chip *to_mmp(struct gpio_chip *gc) >{ > return container_of(chip, struct mmp_gpio_chip, chip); >} > >Use that everywhere to simplify. > >> + struct mmp_gpio_bank *bank = >> + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; >> + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); > >And get rid of this by using one device per bank. > >> +static int mmp_gpio_direction_output(struct gpio_chip *chip, >> +static int mmp_gpio_get(struct gpio_chip *chip, unsigned offset) >> +static void mmp_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > >Looks like generic GPIO will do the job. > >> +#ifdef CONFIG_OF_GPIO >> +static int mmp_gpio_of_xlate(struct gpio_chip *chip, >> + const struct of_phandle_args *gpiospec, >> + u32 *flags) >> +{ >> + struct mmp_gpio_chip *mmp_chip = >> + container_of(chip, struct mmp_gpio_chip, chip); >> + >> + /* GPIO index start from 0. */ >> + if (gpiospec->args[0] >= mmp_chip->ngpio) >> + return -EINVAL; >> + >> + if (flags) >> + *flags = gpiospec->args[1]; >> + >> + return gpiospec->args[0]; >> +} >> +#endif > >This also goes to the generic xlate with one device per bank. > Yes, it is done by GPIOLIB_IRQCHIP. >> +static int mmp_gpio_irq_type(struct irq_data *d, unsigned int type) >> +static void mmp_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) >> +static void mmp_ack_muxed_gpio(struct irq_data *d) >> +static void mmp_mask_muxed_gpio(struct irq_data *d) >> +static void mmp_unmask_muxed_gpio(struct irq_data *d) > >Looks OK but make sure to convert to GPIOLIB_IRQCHIP and convert from >struct gpio_chip * passed as irq_data *d to the internal chip type >with the new to_mmp(). > >(...) > >From here: > >> +static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq, >> + irq_hw_number_t hw) >> +{ >> + irq_set_chip_and_handler(irq, &mmp_muxed_gpio_chip, >> + handle_edge_irq); >> + irq_set_chip_data(irq, d->host_data); >> + set_irq_flags(irq, IRQ_TYPE_NONE); >> + >> + return 0; >> +} >> + >> +static const struct irq_domain_ops mmp_gpio_irq_domain_ops = { >> + .map = mmp_irq_domain_map, >> + .xlate = irq_domain_xlate_twocell, >> +}; > > >To here goes away with GPIOLIB_IRQCHIP (moved to core). > I will check GPIOLIB_IRQCHIP. >> +#ifdef CONFIG_OF_GPIO >> + mmp_chip->chip.of_node = np; >> + mmp_chip->chip.of_xlate = mmp_gpio_of_xlate; >> + mmp_chip->chip.of_gpio_n_cells = 2; >> +#endif > >Can't we just select or depend on OF_GPIO for this >driver and get rid of the #fidef:s? > Sure, we can depend on OF_GPIO. >> +static int __init mmp_gpio_init(void) >> +{ >> + return platform_driver_register(&mmp_gpio_driver); >> +} >> +postcore_initcall(mmp_gpio_init); > >Why does this nees to be postcore? A normal module >would be nice. > I want to make it as module, but some devices need control the GPIO, for example, PMIC will make use of GPIO to control voltage. The voltage setting will be done before GPIO driver is initialized. So it need make sure that the GPIO APIs can work. >Yours, >Linus Walleij
On Wed, Feb 4, 2015 at 3:10 AM, Chao Xie <xiechao_mail@163.com> wrote: > At 2015-02-03 21:21:43, "Linus Walleij" <linus.walleij@linaro.org> wrote: >>Since this looks like a basic MMIO driver I think >>you should also use: >> >>select GPIO_GENERIC >> > > I think the gpio-mmp is not same as gpio-generic. > gpio-mmp need control the level/direction/rising edge detect enable/falling edge detect enable. > For each of them, there are three registers: status register, setting register and clear register. This is quite common. Notice that GPIO_GENERIC does not require you to use the library for *all* reading/writing of registers. Just those that you select. > For example, for direction, if you configure it as output. > You need SET the bit in setting register. The library function bgpio_dir_out first calls gc->set() (which may also be a generic implementation) and then sets the direction bit. This is the nominal behaviour. > If you want to configure it as input > You need SET the bit in clear register. OK this is different from the default implementation so override the dirin function to get the right behaviour. You may still use the library for everything else. > It is same for level/rising edege detect enable/falling edge detect enable. irqchip is completely orthogonal and implemented separately in the struct irq_chip callbacks. > If you want to read the status of the pin. For example, the current level of the pin. > You CAN NOT read the setting/clear register. You need read > the level status register. That's cool. You pass a separate register for reading. Check how it actually works. >>> +#define mmp_gpio_to_bank_idx(gpio) ((gpio) >> BANK_GPIO_ORDER) >>> +#define mmp_gpio_to_bank_offset(gpio) ((gpio) & BANK_GPIO_MASK) >>> +#define mmp_bank_to_gpio(idx, offset) (((idx) << BANK_GPIO_ORDER) \ >>> + | ((offset) & BANK_GPIO_MASK)) >> >>This looks convoluted. Why not just register each bank as a separate >>device instead of trying to figure out bank index like this? >> > > There are the following reasons > 1. There is only one IRQ for the whole GPIO, even there are 3 or more banks. > 2. The registers are not formatted into group. They are interleaved. > For example, there are three banks, So for the registers order are > LEVEL_STATUS_BANK0, LEVEL_STASTUS_BANK1, LEVEL_STATUS_BANK2 > DIRECTION_STATUS_BANK0, DIRECTION_STATUS_BANK1, DIRECTION_STATUS_BANK2 > 3. each bank has 32 bits. Formatting them into one driver will make other driver easier. > For example, the MMC driver has GPIO detection for card. So it knows the GPIO is GPIO56. > In the device tree of MMC driver, you can simple add as > cd-gpios = <&gpio 56 X> > if you format them into different devices, the mmc driver owner need to know how much bits a bank is, and calculate out correct GPIOx and offset > cd-gpios = <&gpio1 24 X> OK I buy this, atleast points 1 & 2. I think you can still use GPIOLIB_IRQCHIP though, since it's just one linear array of GPIO numbers. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 3, 2015 at 9:21 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Wed, Jan 28, 2015 at 3:30 AM, Chao Xie <chao.xie@marvell.com> wrote: > >> From: Chao Xie <chao.xie@marvell.com> >> >> For some old PXA series, they used PXA GPIO driver. >> The IP of GPIO changes since PXA988 which is Marvell MMP >> series. >> It will use new way to control the GPIO level, direction >> and edge status. >> >> Signed-off-by: Chao Xie <chao.xie@marvell.com> > > (...) > Just a silly question. What's the meaning of (...)? There're a lot of comments as (...). It's my first time to see this. -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 10, 2015 at 7:24 AM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote: > On Tue, Feb 3, 2015 at 9:21 PM, Linus Walleij <linus.walleij@linaro.org> wrote: >> On Wed, Jan 28, 2015 at 3:30 AM, Chao Xie <chao.xie@marvell.com> wrote: >> >>> From: Chao Xie <chao.xie@marvell.com> >>> >>> For some old PXA series, they used PXA GPIO driver. >>> The IP of GPIO changes since PXA988 which is Marvell MMP >>> series. >>> It will use new way to control the GPIO level, direction >>> and edge status. >>> >>> Signed-off-by: Chao Xie <chao.xie@marvell.com> >> >> (...) >> > > Just a silly question. What's the meaning of (...)? There're a lot of > comments as (...). It's my first time to see this. It just means I deleted and skipped over a few lines in the patch that was looking OK or irrelevant to comment on, so as to keep the mail to just the relevant parts. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 633ec21..c1e4e27 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -197,6 +197,13 @@ config GPIO_F7188X To compile this driver as a module, choose M here: the module will be called f7188x-gpio. +config GPIO_MMP + bool "MMP GPIO support" + depends on ARCH_MMP + help + Say yes here to support the MMP GPIO device at PXA1088/PXA1908/PXA1928. + Comparing with PXA GPIO device, the IP of MMP GPIO changes a lot. + config GPIO_MOXART bool "MOXART GPIO support" depends on ARCH_MOXART diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 81755f1..60a7cf5 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o obj-$(CONFIG_GPIO_MCP23S08) += gpio-mcp23s08.o obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o obj-$(CONFIG_GPIO_MM_LANTIQ) += gpio-mm-lantiq.o +obj-$(CONFIG_GPIO_MMP) += gpio-mmp.o obj-$(CONFIG_GPIO_MOXART) += gpio-moxart.o obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o diff --git a/drivers/gpio/gpio-mmp.c b/drivers/gpio/gpio-mmp.c new file mode 100644 index 0000000..63e0766 --- /dev/null +++ b/drivers/gpio/gpio-mmp.c @@ -0,0 +1,444 @@ +/* + * Copyright (C) 2014 Marvell International Ltd. + * + * Generic MMP GPIO handling + * + * Chao Xie <chao.xie@marvell.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/gpio.h> +#include <linux/clk.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/platform_data/gpio-mmp.h> + +#define GPLR 0x0 +#define GPDR 0xc +#define GPSR 0x18 +#define GPCR 0x24 +#define GRER 0x30 +#define GFER 0x3c +#define GEDR 0x48 +#define GSDR 0x54 +#define GCDR 0x60 +#define GSRER 0x6c +#define GCRER 0x78 +#define GSFER 0x84 +#define GCFER 0x90 +#define GAPMASK 0x9c +#define GCPMASK 0xa8 + +/* Bank will have 2^n GPIOes, and for mmp-gpio n = 5 */ +#define BANK_GPIO_ORDER 5 +#define BANK_GPIO_NUMBER (1 << BANK_GPIO_ORDER) +#define BANK_GPIO_MASK (BANK_GPIO_NUMBER - 1) + +#define mmp_gpio_to_bank_idx(gpio) ((gpio) >> BANK_GPIO_ORDER) +#define mmp_gpio_to_bank_offset(gpio) ((gpio) & BANK_GPIO_MASK) +#define mmp_bank_to_gpio(idx, offset) (((idx) << BANK_GPIO_ORDER) \ + | ((offset) & BANK_GPIO_MASK)) + +struct mmp_gpio_bank { + void __iomem *reg_bank; + u32 irq_mask; + u32 irq_rising_edge; + u32 irq_falling_edge; +}; + +struct mmp_gpio_chip { + struct gpio_chip chip; + void __iomem *reg_base; + int irq; + struct irq_domain *domain; + unsigned int ngpio; + unsigned int nbank; + struct mmp_gpio_bank *banks; +}; + +static int mmp_gpio_to_irq(struct gpio_chip *chip, unsigned offset) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + + return irq_create_mapping(mmp_chip->domain, offset); +} + +static int mmp_gpio_direction_input(struct gpio_chip *chip, unsigned offset) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); + + writel(bit, bank->reg_bank + GCDR); + + return 0; +} + +static int mmp_gpio_direction_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); + + /* Set value first. */ + writel(bit, bank->reg_bank + (value ? GPSR : GPCR)); + + writel(bit, bank->reg_bank + GSDR); + + return 0; +} + +static int mmp_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); + u32 gplr; + + gplr = readl(bank->reg_bank + GPLR); + + return !!(gplr & bit); +} + +static void mmp_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(offset)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(offset)); + u32 gpdr; + + gpdr = readl(bank->reg_bank + GPDR); + /* Is it configured as output? */ + if (gpdr & bit) + writel(bit, bank->reg_bank + (value ? GPSR : GPCR)); +} + +#ifdef CONFIG_OF_GPIO +static int mmp_gpio_of_xlate(struct gpio_chip *chip, + const struct of_phandle_args *gpiospec, + u32 *flags) +{ + struct mmp_gpio_chip *mmp_chip = + container_of(chip, struct mmp_gpio_chip, chip); + + /* GPIO index start from 0. */ + if (gpiospec->args[0] >= mmp_chip->ngpio) + return -EINVAL; + + if (flags) + *flags = gpiospec->args[1]; + + return gpiospec->args[0]; +} +#endif + +static int mmp_gpio_irq_type(struct irq_data *d, unsigned int type) +{ + struct mmp_gpio_chip *mmp_chip = irq_data_get_irq_chip_data(d); + int gpio = irqd_to_hwirq(d); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(gpio)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(gpio)); + + if (type & IRQ_TYPE_EDGE_RISING) { + bank->irq_rising_edge |= bit; + writel(bit, bank->reg_bank + GSRER); + } else { + bank->irq_rising_edge &= ~bit; + writel(bit, bank->reg_bank + GCRER); + } + + if (type & IRQ_TYPE_EDGE_FALLING) { + bank->irq_falling_edge |= bit; + writel(bit, bank->reg_bank + GSFER); + } else { + bank->irq_falling_edge &= ~bit; + writel(bit, bank->reg_bank + GCFER); + } + + return 0; +} + +static void mmp_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) +{ + struct irq_chip *chip = irq_desc_get_chip(desc); + struct mmp_gpio_chip *mmp_chip = irq_get_handler_data(irq); + struct mmp_gpio_bank *bank; + int i, n; + u32 gedr; + unsigned long pending = 0; + + chained_irq_enter(chip, desc); + + for (i = 0; i < mmp_chip->nbank; i++) { + bank = &mmp_chip->banks[i]; + + gedr = readl(bank->reg_bank + GEDR); + writel(gedr, bank->reg_bank + GEDR); + gedr = gedr & bank->irq_mask; + + if (!gedr) + continue; + pending = gedr; + for_each_set_bit(n, &pending, BITS_PER_LONG) + generic_handle_irq(irq_find_mapping(mmp_chip->domain, + mmp_bank_to_gpio(i, n))); + } + + chained_irq_exit(chip, desc); +} + +static void mmp_ack_muxed_gpio(struct irq_data *d) +{ + struct mmp_gpio_chip *mmp_chip = irq_data_get_irq_chip_data(d); + int gpio = irqd_to_hwirq(d); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(gpio)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(gpio)); + + writel(bit, bank->reg_bank + GEDR); +} + +static void mmp_mask_muxed_gpio(struct irq_data *d) +{ + struct mmp_gpio_chip *mmp_chip = irq_data_get_irq_chip_data(d); + int gpio = irqd_to_hwirq(d); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(gpio)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(gpio)); + + bank->irq_mask &= ~bit; + + /* Clear the bit of rising and falling edge detection. */ + writel(bit, bank->reg_bank + GCRER); + writel(bit, bank->reg_bank + GCFER); +} + +static void mmp_unmask_muxed_gpio(struct irq_data *d) +{ + struct mmp_gpio_chip *mmp_chip = irq_data_get_irq_chip_data(d); + int gpio = irqd_to_hwirq(d); + struct mmp_gpio_bank *bank = + &mmp_chip->banks[mmp_gpio_to_bank_idx(gpio)]; + u32 bit = (1 << mmp_gpio_to_bank_offset(gpio)); + + bank->irq_mask |= bit; + + /* Set the bit of rising and falling edge detection if the gpio has. */ + writel(bit & bank->irq_rising_edge, bank->reg_bank + GSRER); + writel(bit & bank->irq_falling_edge, bank->reg_bank + GSFER); +} + +static struct irq_chip mmp_muxed_gpio_chip = { + .name = "mmp-gpio-irqchip", + .irq_ack = mmp_ack_muxed_gpio, + .irq_mask = mmp_mask_muxed_gpio, + .irq_unmask = mmp_unmask_muxed_gpio, + .irq_set_type = mmp_gpio_irq_type, + .flags = IRQCHIP_SKIP_SET_WAKE, +}; + +static struct of_device_id mmp_gpio_dt_ids[] = { + { .compatible = "marvell,mmp-gpio"}, + {} +}; + +static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hw) +{ + irq_set_chip_and_handler(irq, &mmp_muxed_gpio_chip, + handle_edge_irq); + irq_set_chip_data(irq, d->host_data); + set_irq_flags(irq, IRQ_TYPE_NONE); + + return 0; +} + +static const struct irq_domain_ops mmp_gpio_irq_domain_ops = { + .map = mmp_irq_domain_map, + .xlate = irq_domain_xlate_twocell, +}; + +static int mmp_gpio_probe_pdata(struct platform_device *pdev, + struct mmp_gpio_chip *mmp_chip, + struct mmp_gpio_platform_data *pdata) +{ + int i; + + mmp_chip->nbank = pdata->nbank; + mmp_chip->banks = devm_kzalloc(&pdev->dev, + sizeof(*mmp_chip->banks) * mmp_chip->nbank, + GFP_KERNEL); + if (mmp_chip->banks == NULL) + return -ENOMEM; + + for (i = 0; i < mmp_chip->nbank; i++) + mmp_chip->banks[i].reg_bank = + mmp_chip->reg_base + pdata->bank_offset[i]; + + mmp_chip->ngpio = mmp_chip->nbank * BANK_GPIO_NUMBER; + return 0; +} + +static int mmp_gpio_probe_dt(struct platform_device *pdev, + struct mmp_gpio_chip *mmp_chip) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + u32 offset; + int i, nbank, ret; + + nbank = of_get_child_count(np); + if (nbank == 0) + return -EINVAL; + + mmp_chip->banks = devm_kzalloc(&pdev->dev, + sizeof(*mmp_chip->banks) * nbank, + GFP_KERNEL); + if (mmp_chip->banks == NULL) + return -ENOMEM; + + i = 0; + for_each_child_of_node(np, child) { + ret = of_property_read_u32(child, "reg-offset", &offset); + if (ret) + return ret; + mmp_chip->banks[i].reg_bank = mmp_chip->reg_base + offset; + i++; + } + + mmp_chip->nbank = nbank; + mmp_chip->ngpio = mmp_chip->nbank * BANK_GPIO_NUMBER; + + return 0; +} + +static int mmp_gpio_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct mmp_gpio_platform_data *pdata; + struct device_node *np; + struct mmp_gpio_chip *mmp_chip; + struct mmp_gpio_bank *bank; + struct resource *res; + struct irq_domain *domain; + struct clk *clk; + int irq, i, ret; + void __iomem *base; + + pdata = dev_get_platdata(dev); + np = pdev->dev.of_node; + if (!np && !pdata) + return -EINVAL; + + mmp_chip = devm_kzalloc(dev, sizeof(*mmp_chip), GFP_KERNEL); + if (mmp_chip == NULL) + return -ENOMEM; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -EINVAL; + base = devm_ioremap_resource(dev, res); + if (!base) + return -EINVAL; + + mmp_chip->irq = irq; + mmp_chip->reg_base = base; + + if (pdata) + ret = mmp_gpio_probe_pdata(pdev, mmp_chip, pdata); + else + ret = mmp_gpio_probe_dt(pdev, mmp_chip); + + if (ret) { + dev_err(dev, "Fail to initialize gpio unit, error %d.\n", ret); + return ret; + } + + clk = devm_clk_get(dev, NULL); + if (IS_ERR(clk)) { + dev_err(dev, "Fail to get gpio clock, error %ld.\n", + PTR_ERR(clk)); + return PTR_ERR(clk); + } + ret = clk_prepare_enable(clk); + if (ret) { + dev_err(dev, "Fail to enable gpio clock, error %d.\n", ret); + return ret; + } + + domain = irq_domain_add_linear(np, mmp_chip->ngpio, + &mmp_gpio_irq_domain_ops, mmp_chip); + if (domain == NULL) + return -EINVAL; + + mmp_chip->domain = domain; + + /* Initialize the gpio chip */ + mmp_chip->chip.label = "mmp-gpio"; + mmp_chip->chip.direction_input = mmp_gpio_direction_input; + mmp_chip->chip.direction_output = mmp_gpio_direction_output; + mmp_chip->chip.get = mmp_gpio_get; + mmp_chip->chip.set = mmp_gpio_set; + mmp_chip->chip.to_irq = mmp_gpio_to_irq; +#ifdef CONFIG_OF_GPIO + mmp_chip->chip.of_node = np; + mmp_chip->chip.of_xlate = mmp_gpio_of_xlate; + mmp_chip->chip.of_gpio_n_cells = 2; +#endif + mmp_chip->chip.ngpio = mmp_chip->ngpio; + gpiochip_add(&mmp_chip->chip); + + /* clear all GPIO edge detects */ + for (i = 0; i < mmp_chip->nbank; i++) { + bank = &mmp_chip->banks[i]; + writel(0xffffffff, bank->reg_bank + GCFER); + writel(0xffffffff, bank->reg_bank + GCRER); + /* Unmask edge detection to AP. */ + writel(0xffffffff, bank->reg_bank + GAPMASK); + } + + irq_set_chained_handler(irq, mmp_gpio_demux_handler); + irq_set_handler_data(irq, mmp_chip); + + return 0; +} + +static struct platform_driver mmp_gpio_driver = { + .probe = mmp_gpio_probe, + .driver = { + .name = "mmp-gpio", + .of_match_table = mmp_gpio_dt_ids, + }, +}; + +static int __init mmp_gpio_init(void) +{ + return platform_driver_register(&mmp_gpio_driver); +} +postcore_initcall(mmp_gpio_init);