enhance DT support on gpio pxa
Subsystems (7)
v5 cover enhance DT support on gpio pxa
Changelog:
v5:
* Replace of_find_property() by of_property_read_bool().
* Rename __gpio_is_occupied() & __gpio_is_inverted().
* Avoid to use pxachip as variable name. Use chip instead.
v4:
* Re-oragnize these patches.
* Append document for new properties binding.
* Discard the full support on irq domain. It will be appended in other series.
v3:
* Fix the gpio irq issue on legacy platform.
* Discard irq_base & use irq domain instead in pxa_gpio_chip structure.
* Update DTS file since it's depend on latest pinctrl single driver.
v2:
* Fix the build issue without CONFIG_OF
* Append to check PINCTRL_SINGLE because of arch pxa not moved to DT
* Use bool for inverted, ed_mask, gafr variable
PATCH v5 1/12 gpio: pxa: identify ed mask reg with platform data
Avoid to judge whether edge mask register exists by CPU. Use platform data to identify it instead. The gpio edge mask register exists in MMP series SoC.
--- arch/arm/mach-mmp/aspenite.c | 7 +++++++ arch/arm/mach-mmp/avengers_lite.c | 7 +++++++ arch/arm/mach-mmp/brownstone.c | 7 +++++++ arch/arm/mach-mmp/flint.c | 7 +++++++ arch/arm/mach-mmp/gplugd.c | 7 +++++++ arch/arm/mach-mmp/tavorevb.c | 7 +++++++ arch/arm/mach-mmp/teton_bga.c | 7 +++++++ arch/arm/mach-mmp/ttc_dkb.c | 7 +++++++ drivers/gpio/gpio-pxa.c | 9 ++++++++- include/linux/gpio-pxa.h | 1 + 10 files changed, 65 insertions(+), 1 deletion(-)
arch/arm/mach-mmp/aspenite.c +7 -0
@@ -9,6 +9,7 @@* publishhed by the Free Software Foundation. */ #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/platform_device.h>
@@ -110,6 +111,10 @@ static unsigned long common_pin_config[] __initdata = { GPIO121_KP_MKIN4, }; +static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .ed_mask = true, +}; +static struct smc91x_platdata smc91x_info = { .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , };
@@ -248,6 +253,8 @@ static void __init common_init(void)pxa168_add_nand (&aspenite_nand_info);pxa168_add_fb (&aspenite_lcd_info);pxa168_add_keypad (&aspenite_keypad_info); +platform_device_add_data (&pxa168_device_gpio, &pxa168_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&pxa168_device_gpio);/* off-chip devices */
arch/arm/mach-mmp/avengers_lite.c +7 -0
@@ -12,6 +12,7 @@#include <linux/init.h> #include <linux/kernel.h> +#include <linux/gpio-pxa.h> #include <linux/platform_device.h> #include <asm/mach-types.h>
@@ -32,12 +33,18 @@ static unsigned long avengers_lite_pin_config_V16F[] __initdata = { GPIO89_UART2_RXD, }; +static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .ed_mask = true, +}; +static void __init avengers_lite_init (void ) {mfp_config (ARRAY_AND_SIZE (avengers_lite_pin_config_V16F));/* on-chip devices */ pxa168_add_uart (2 ); +platform_device_add_data (&pxa168_device_gpio, &pxa168_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&pxa168_device_gpio); }
arch/arm/mach-mmp/brownstone.c +7 -0
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/gpio-pxa.h> #include <linux/regulator/machine.h> #include <linux/regulator/max8649.h> #include <linux/regulator/fixed.h>
@@ -104,6 +105,10 @@ static unsigned long brownstone_pin_config[] __initdata = { GPIO89_GPIO, }; +static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .ed_mask = true, +}; +static struct regulator_consumer_supply max8649_supply[] = {REGULATOR_SUPPLY ("vcc_core" ,NULL ), };
@@ -202,6 +207,8 @@ static void __init brownstone_init(void)/* on-chip devices */ mmp2_add_uart (1 );mmp2_add_uart (3 ); +platform_device_add_data (&mmp2_device_gpio, &mmp2_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&mmp2_device_gpio);mmp2_add_twsi (1 ,NULL ,ARRAY_AND_SIZE (brownstone_twsi1_info));mmp2_add_sdhost (0 , &mmp2_sdh_platdata_mmc0);/* SD/MMC */
arch/arm/mach-mmp/flint.c +7 -0
@@ -16,6 +16,7 @@#include <linux/smc91x.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/interrupt.h> #include <asm/mach-types.h>
@@ -77,6 +78,10 @@ static unsigned long flint_pin_config[] __initdata = { GPIO160_ND_RDY1, }; +static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .ed_mask = true, +}; +static struct smc91x_platdata flint_smc91x_info = { .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , };
@@ -111,6 +116,8 @@ static void __init flint_init(void)/* on-chip devices */ mmp2_add_uart (1 );mmp2_add_uart (2 ); +platform_device_add_data (&mmp2_device_gpio, &mmp2_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&mmp2_device_gpio);/* off-chip devices */
arch/arm/mach-mmp/gplugd.c +7 -0
@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <asm/mach/arch.h> #include <asm/mach-types.h>
@@ -127,6 +128,10 @@ static unsigned long gplugd_pin_config[] __initdata = {GPIO116_I2S_TXD }; +static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .ed_mask = true, +}; +static struct i2c_board_info gplugd_i2c_board_info[] = { { .type ="isl1208" ,
@@ -185,6 +190,8 @@ static void __init gplugd_init(void)pxa168_add_uart (3 );pxa168_add_ssp (1 );pxa168_add_twsi (0 ,NULL ,ARRAY_AND_SIZE (gplugd_i2c_board_info)); +platform_device_add_data (&pxa168_device_gpio, &pxa168_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&pxa168_device_gpio);pxa168_add_eth (&gplugd_eth_platform_data);
arch/arm/mach-mmp/tavorevb.c +7 -0
@@ -8,6 +8,7 @@* publishhed by the Free Software Foundation. */ #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/platform_device.h>
@@ -60,6 +61,10 @@ static unsigned long tavorevb_pin_config[] __initdata = { DF_RDY0_DF_RDY0, }; +static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .ed_mask = true, +}; +static struct smc91x_platdata tavorevb_smc91x_info = { .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , };
@@ -93,6 +98,8 @@ static void __init tavorevb_init(void)/* on-chip devices */ pxa910_add_uart (1 ); +platform_device_add_data (&pxa910_device_gpio, &ttc_dkb_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&pxa910_device_gpio);/* off-chip devices */
arch/arm/mach-mmp/teton_bga.c +7 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/input.h> #include <linux/platform_data/keypad-pxa27x.h> #include <linux/i2c.h>
@@ -49,6 +50,10 @@ static unsigned long teton_bga_pin_config[] __initdata = { GPIO78_GPIO, }; +static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .ed_mask = true, +}; +static unsigned int teton_bga_matrix_key_map[] = {KEY (0 ,6 ,KEY_ESC ),KEY (0 ,7 ,KEY_ENTER ),
@@ -79,6 +84,8 @@ static void __init teton_bga_init(void)pxa168_add_uart (1 );pxa168_add_keypad (&teton_bga_keypad_info);pxa168_add_twsi (0 ,NULL ,ARRAY_AND_SIZE (teton_bga_i2c_info)); +platform_device_add_data (&pxa168_device_gpio, &pxa168_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_device_register (&pxa168_device_gpio); }
arch/arm/mach-mmp/ttc_dkb.c +7 -0
@@ -17,6 +17,7 @@#include <linux/interrupt.h> #include <linux/i2c/pca953x.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/mfd/88pm860x.h> #include <linux/platform_data/mv_usb.h> #include <linux/spi/spi.h>
@@ -75,6 +76,10 @@ static unsigned long ttc_dkb_pin_config[] __initdata = { DF_RDY0_DF_RDY0, }; +static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .ed_mask = true, +}; +static struct mtd_partition ttc_dkb_onenand_partitions[] = { { .name ="bootloader" ,
@@ -284,6 +289,8 @@ static void __init ttc_dkb_init(void)/* off-chip devices */ pxa910_add_twsi (0 ,NULL ,ARRAY_AND_SIZE (ttc_dkb_i2c_info)); +platform_device_add_data (&pxa910_device_gpio, &ttc_dkb_gpio_pdata, +sizeof (struct pxa_gpio_platform_data ));platform_add_devices (ARRAY_AND_SIZE (ttc_dkb_devices));#ifdef CONFIG_USB_MV_UDC
drivers/gpio/gpio-pxa.c +8 -1
@@ -493,6 +493,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = {static int pxa_gpio_probe_dt (struct platform_device *pdev) {int ret, nr_banks, nr_gpios; +struct pxa_gpio_platform_data *pdata;struct device_node *prev, *next, *np = pdev->dev.of_node;const struct of_device_id *of_id =of_match_device (pxa_gpio_dt_ids, &pdev->dev);
@@ -501,6 +502,12 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)dev_err (&pdev->dev,"Failed to find gpio controller\n" );return -EFAULT ; } + pdata =devm_kzalloc (&pdev->dev,sizeof (*pdata),GFP_KERNEL ); +if (!pdata) +return -ENOMEM ; + pdata->ed_mask =of_property_read_bool (np,"marvell,gpio-ed-mask" ); +/* set the platform data */ + pdev->dev.platform_data = pdata; gpio_type = (int )of_id->data; next =of_get_next_child (np,NULL );
@@ -604,7 +611,7 @@ static int pxa_gpio_probe(struct platform_device *pdev)writel_relaxed (0 , c->regbase +GRER_OFFSET );writel_relaxed (~0 ,c->regbase +GEDR_OFFSET );/* unmask GPIO edge detect for AP side */ -if (gpio_is_mmp_type (gpio_type)) +if (info->ed_mask)writel_relaxed (~0 , c->regbase +ED_MASK_OFFSET ); }
include/linux/gpio-pxa.h +1 -0
@@ -14,6 +14,7 @@ extern int pxa_last_gpio;extern int pxa_irq_to_gpio (int irq);struct pxa_gpio_platform_data { +bool ed_mask;/* true means that ed_mask reg is available */ int (*gpio_set_wake)(unsigned int gpio,unsigned int on); };
Signature · 1 line
1.7.10.4
PATCH v5 1/12 gpio: pxa: identify ed mask reg with platform data
Quoted 5 lines · Haojian Zhuang
Avoid to judge whether edge mask register exists by CPU. Use platform data to identify it instead. The gpio edge mask register exists in MMP series SoC.
Signed-off-by Haojian Zhuang <[email protected]>
Hi Haojian,
I don't think patches like this are a good idea. The driver already knows the difference between different types of chips. Adding /more/ platform data is making life worse, not better. The diffstat is evidence of that:
Quoted 1 line
10 files changed, 65 insertions(+), 1 deletion(-)
If you're looking to get rid of the pxa_gpio_nums() function, then a much better way to do it is to use a platform_device_id table and differentiate the type by the name. You can attach data to that table with the parameters for each chip. For example:
struct pxa_gpio_id_data pxa_gpio_id_data[] = {
{ .count = 84, type = PXA25X_GPIO, },
{ .count = 89, type = PXA26X_GPIO, },
{ .count = 127, type = MMP_GPIO, },
};static const struct platform_device_id pxa_gpio_id_table[] = {
{ "pxa25x-gpio", (unsigned long) &pxa_gpio_id_data[0], },
{ "pxa65x-gpio", (unsigned long) &pxa_gpio_id_data[1], },
{ "mmp-gpio", (unsigned long) &pxa_gpio_id_data[2], },
};static struct platform_driver pxa_gpio_driver = {
.probe = pxa_gpio_probe,
.driver = {
.name = "pxa-gpio",
.of_match_table = of_match_ptr(pxa_gpio_dt_ids),
},
.id_table = pxa_gpio_id_table,
};And that same data table can be used in the of_match_table too.
g.
Haojian Zhuang
maintainerPATCH v5 1/12 gpio: pxa: identify ed mask reg with platform data
Quoted 42 lines · Grant Likely
Quoted 5 lines · Haojian Zhuang
Avoid to judge whether edge mask register exists by CPU. Use platform data to identify it instead. The gpio edge mask register exists in MMP series SoC.
Signed-off-by Haojian Zhuang <[email protected]>Hi Haojian,
I don't think patches like this are a good idea. The driver already knows the difference between different types of chips. Adding /more/ platform data is making life worse, not better. The diffstat is evidence of that:
Quoted 1 line
10 files changed, 65 insertions(+), 1 deletion(-)If you're looking to get rid of the
pxa_gpio_nums()function, then a much better way to do it is to use aplatform_device_idtable and differentiate the type by the name. You can attach data to that table with the parameters for each chip. For example:struct pxa_gpio_id_data pxa_gpio_id_data[] = { { .count = 84, type = PXA25X_GPIO, }, { .count = 89, type = PXA26X_GPIO, }, { .count = 127, type = MMP_GPIO, }, };static const struct platform_device_id pxa_gpio_id_table[] = { { "pxa25x-gpio", (unsigned long) &pxa_gpio_id_data[0], }, { "pxa65x-gpio", (unsigned long) &pxa_gpio_id_data[1], }, { "mmp-gpio", (unsigned long) &pxa_gpio_id_data[2], }, };static struct
platform_driverpxa_gpio_driver= {
.probe =pxa_gpio_probe,
.driver = {
.name = "pxa-gpio",
.of_match_table =of_match_ptr(pxa_gpio_dt_ids),
},
.id_table =pxa_gpio_id_table,
};
Quoted 4 lines
And that same data table can be used in the
of_match_tabletoo.g.
OK. I'll update it.
Thanks
Haojian
PATCH v5 2/12 gpio: pxa: clean code with same variable name
In reply to Haojian ZhuangClean code to avoid similar variable. Now use gc for gpio_chip, and use c/chip for pxa_gpio_chip. It's used to avoid confusion.
--- drivers/gpio/gpio-pxa.c | 113 +++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 58 deletions(-)
drivers/gpio/gpio-pxa.c +55 -58
@@ -69,20 +69,20 @@ static struct device_node *pxa_gpio_of_node;#endif struct pxa_gpio_chip { -struct gpio_chip chip; -void __iomem *regbase; -char label[10 ]; +struct gpio_chip gc; +void __iomem *regbase; +char label[10 ]; -unsigned long irq_mask; -unsigned long irq_edge_rise; -unsigned long irq_edge_fall; -int (*set_wake)(unsigned int gpio,unsigned int on); +unsigned long irq_mask; +unsigned long irq_edge_rise; +unsigned long irq_edge_fall; +int (*set_wake)(unsigned int gpio,unsigned int on);#ifdef CONFIG_PM -unsigned long saved_gplr; -unsigned long saved_gpdr; -unsigned long saved_grer; -unsigned long saved_gfer; +unsigned long saved_gplr; +unsigned long saved_gpdr; +unsigned long saved_grer; +unsigned long saved_gfer;#endif };
@@ -103,9 +103,9 @@ static void __iomem *gpio_reg_base;#define for_each_gpio_chip (i, c) \ for (i = 0, c = &pxa_gpio_chips[0]; i <= pxa_last_gpio; i += 32, c++) -static inline void __iomem *gpio_chip_base (struct gpio_chip *c) +static inline void __iomem *gpio_chip_base (struct gpio_chip *gc) { - return container_of(c, struct pxa_gpio_chip, chip)->regbase; + return container_of(gc, struct pxa_gpio_chip, gc)->regbase; }static inline struct pxa_gpio_chip *gpio_to_pxachip (unsigned gpio)
@@ -141,13 +141,13 @@ static inline int __gpio_is_inverted(int gpio)*/ static inline int __gpio_is_occupied (unsigned gpio) { -struct pxa_gpio_chip *pxachip; +struct pxa_gpio_chip *chip;void __iomem *base;unsigned long gafr =0 , gpdr =0 ;int ret, af =0 , dir =0 ; - pxachip =gpio_to_pxachip (gpio); - base =gpio_chip_base (&pxachip->chip); + chip =gpio_to_pxachip (gpio); + base =gpio_chip_base (&chip->gc); gpdr =readl_relaxed (base +GPDR_OFFSET );switch (gpio_type) {
@@ -170,9 +170,9 @@ static inline int __gpio_is_occupied(unsigned gpio)return ret; } -static int pxa_gpio_to_irq (struct gpio_chip *chip,unsigned offset) +static int pxa_gpio_to_irq (struct gpio_chip *gc,unsigned offset) { -return chip->base + offset + irq_base; +return gc->base + offset + irq_base; }int pxa_irq_to_gpio (int irq)
@@ -180,16 +180,16 @@ int pxa_irq_to_gpio(int irq)return irq - irq_base; } -static int pxa_gpio_direction_input (struct gpio_chip *chip,unsigned offset) +static int pxa_gpio_direction_input (struct gpio_chip *gc,unsigned offset) { -void __iomem *base =gpio_chip_base (chip); +void __iomem *base =gpio_chip_base (gc);uint32_t value, mask =1 << offset;unsigned long flags;spin_lock_irqsave (&gpio_lock, flags); value =readl_relaxed (base +GPDR_OFFSET ); -if (__gpio_is_inverted (chip->base + offset)) +if (__gpio_is_inverted (gc->base + offset)) value |= mask;else value &= ~mask;
@@ -199,10 +199,10 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)return 0 ; } -static int pxa_gpio_direction_output (struct gpio_chip *chip, +static int pxa_gpio_direction_output (struct gpio_chip *gc,unsigned offset,int value) { -void __iomem *base =gpio_chip_base (chip); +void __iomem *base =gpio_chip_base (gc);uint32_t tmp, mask =1 << offset;unsigned long flags;
@@ -211,7 +211,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,spin_lock_irqsave (&gpio_lock, flags); tmp =readl_relaxed (base +GPDR_OFFSET ); -if (__gpio_is_inverted (chip->base + offset)) +if (__gpio_is_inverted (gc->base + offset)) tmp &= ~mask;else tmp |= mask;
@@ -221,15 +221,15 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,return 0 ; } -static int pxa_gpio_get (struct gpio_chip *chip,unsigned offset) +static int pxa_gpio_get (struct gpio_chip *gc,unsigned offset) { -return readl_relaxed (gpio_chip_base (chip) +GPLR_OFFSET ) & (1 << offset); +return readl_relaxed (gpio_chip_base (gc) +GPLR_OFFSET ) & (1 << offset); } -static void pxa_gpio_set (struct gpio_chip *chip,unsigned offset,int value) +static void pxa_gpio_set (struct gpio_chip *gc,unsigned offset,int value) { -writel_relaxed (1 << offset,gpio_chip_base (chip) + - (value ?GPSR_OFFSET :GPCR_OFFSET )); +writel_relaxed (1 << offset,gpio_chip_base (gc) + + (value ?GPSR_OFFSET :GPCR_OFFSET )); }#ifdef CONFIG_OF_GPIO
@@ -240,7 +240,7 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,if (gpiospec->args[0 ] > pxa_last_gpio)return -EINVAL ; -if (gc != &pxa_gpio_chips[gpiospec->args[0 ] /32 ].chip) +if (gc != &pxa_gpio_chips[gpiospec->args[0 ] /32 ].gc)return -EINVAL ;if (flags)
@@ -250,42 +250,43 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc, }#endif -static int pxa_init_gpio_chip (int gpio_end, -int (*set_wake)(unsigned int ,unsigned int )) +static int pxa_init_gpio_chip (struct platform_device *pdev,int gpio_end) {int i, gpio, nbanks =gpio_to_bank (gpio_end) +1 ;struct pxa_gpio_chip *chips; +struct pxa_gpio_platform_data *pdata =dev_get_platdata (&pdev->dev); - chips =kzalloc (nbanks *sizeof (struct pxa_gpio_chip ),GFP_KERNEL ); -if (chips ==NULL ) { -pr_err ("%s: failed to allocate GPIO chips\n" , __func__); + chips =devm_kzalloc (&pdev->dev, nbanks *sizeof (*chips),GFP_KERNEL ); +if (!chips) { +dev_err (&pdev->dev,"failed to allocate GPIO chips\n" );return -ENOMEM ; }for (i =0 , gpio =0 ; i < nbanks; i++, gpio +=32 ) { -struct gpio_chip *c = &chips[i].chip; +struct gpio_chip *gc = &chips[i].gc;sprintf (chips[i].label,"gpio-%d" , i); chips[i].regbase = gpio_reg_base +BANK_OFF (i); - chips[i].set_wake = set_wake; +if (pdata->gpio_set_wake) + chips[i].set_wake = pdata->gpio_set_wake; - c->base = gpio; - c->label = chips[i].label; + gc->base = gpio; + gc->label = chips[i].label; - c->direction_input = pxa_gpio_direction_input; - c->direction_output = pxa_gpio_direction_output; - c->get = pxa_gpio_get; - c->set = pxa_gpio_set; - c->to_irq = pxa_gpio_to_irq; + gc->direction_input = pxa_gpio_direction_input; + gc->direction_output = pxa_gpio_direction_output; + gc->get = pxa_gpio_get; + gc->set = pxa_gpio_set; + gc->to_irq = pxa_gpio_to_irq;#ifdef CONFIG_OF_GPIO - c->of_node = pxa_gpio_of_node; - c->of_xlate = pxa_gpio_of_xlate; - c->of_gpio_n_cells =2 ; + gc->of_node = pxa_gpio_of_node; + gc->of_xlate = pxa_gpio_of_xlate; + gc->of_gpio_n_cells =2 ;#endif /* number of GPIOs on last bank may be less than 32 */ - c->ngpio = (gpio +31 > gpio_end) ? (gpio_end - gpio +1 ) :32 ; -gpiochip_add (c); + gc->ngpio = (gpio +31 > gpio_end) ? (gpio_end - gpio +1 ) :32 ; +gpiochip_add (gc); } pxa_gpio_chips = chips;return 0 ;
@@ -364,7 +365,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) do { loop = 0; for_each_gpio_chip(gpio, c) { - gpio_base = c->chip.base; + gpio_base = c->gc.base; gedr = readl_relaxed(c->regbase + GEDR_OFFSET); gedr = gedr & c->irq_mask;
@@ -492,7 +493,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = {static int pxa_gpio_probe_dt (struct platform_device *pdev) { -int ret, nr_banks, nr_gpios; +int nr_banks, nr_gpios;struct pxa_gpio_platform_data *pdata;struct device_node *prev, *next, *np = pdev->dev.of_node; const struct of_device_id *of_id =
@@ -514,8 +515,7 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) prev = next;if (!next) {dev_err (&pdev->dev,"Failed to find child gpio node\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; }for (nr_banks =1 ; ; nr_banks++) { next =of_get_next_child (np, prev);
@@ -530,15 +530,12 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) irq_base =irq_alloc_descs (-1 ,0 , nr_gpios,0 );if (irq_base <0 ) {dev_err (&pdev->dev,"Failed to allocate IRQ numbers\n" ); - goto err; +return -EINVAL ; } domain =irq_domain_add_legacy (np, nr_gpios, irq_base,0 , &pxa_irq_domain_ops,NULL ); pxa_gpio_of_node = np; return 0; -err: -iounmap (gpio_reg_base); - return ret; }#else #define pxa_gpio_probe_dt (pdev) (-1)
@@ -603,7 +600,7 @@ static int pxa_gpio_probe(struct platform_device *pdev)/* Initialize GPIO chips */ info =dev_get_platdata (&pdev->dev); -pxa_init_gpio_chip (pxa_last_gpio, info ? info->gpio_set_wake :NULL ); +pxa_init_gpio_chip (pdev, pxa_last_gpio);/* clear all GPIO edge detects */ for_each_gpio_chip (gpio, c) {
Signature · 1 line
1.7.10.4
PATCH v5 3/12 gpio: pxa: rename function name
In reply to Haojian ZhuangRename __gpio_is_occupied() & __gpio_is_inverted() to pxa_gpio_is_occupied() & pxa_gpio_is_inverted().
--- drivers/gpio/gpio-pxa.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpio/gpio-pxa.c +7 -7
@@ -126,7 +126,7 @@ static inline int gpio_is_mmp_type(int type)/* GPIO86/87/88/89 on PXA26x have their direction bits in PXA_GPDR(2 inverted, * as well as their Alternate Function value being '1' for GPIO in GAFRx. */ -static inline int __gpio_is_inverted (int gpio) +static inline int pxa_gpio_is_inverted (int gpio) {if ((gpio_type ==PXA26X_GPIO ) && (gpio >85 ))return 1 ;
@@ -139,7 +139,7 @@ static inline int __gpio_is_inverted(int gpio)* is attributed as "occupied" here (I know this terminology isn't * accurate, you are welcome to propose a better one :-) */ -static inline int __gpio_is_occupied (unsigned gpio) +static inline int pxa_gpio_is_occupied (unsigned gpio) {struct pxa_gpio_chip *chip;void __iomem *base;
@@ -158,7 +158,7 @@ static inline int __gpio_is_occupied(unsigned gpio) af = (gafr >> ((gpio &0xf ) *2 )) &0x3 ; dir = gpdr &GPIO_bit (gpio); -if (__gpio_is_inverted (gpio)) +if (pxa_gpio_is_inverted (gpio)) ret = (af !=1 ) || (dir ==0 );else ret = (af !=0 ) || (dir !=0 );
@@ -189,7 +189,7 @@ static int pxa_gpio_direction_input(struct gpio_chip *gc, unsigned offset)spin_lock_irqsave (&gpio_lock, flags); value =readl_relaxed (base +GPDR_OFFSET ); -if (__gpio_is_inverted (gc->base + offset)) +if (pxa_gpio_is_inverted (gc->base + offset)) value |= mask;else value &= ~mask;
@@ -211,7 +211,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *gc,spin_lock_irqsave (&gpio_lock, flags); tmp =readl_relaxed (base +GPDR_OFFSET ); -if (__gpio_is_inverted (gc->base + offset)) +if (pxa_gpio_is_inverted (gc->base + offset)) tmp &= ~mask;else tmp |= mask;
@@ -322,7 +322,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)if ((c->irq_edge_rise | c->irq_edge_fall) &GPIO_bit (gpio))return 0 ; -if (__gpio_is_occupied (gpio)) +if (pxa_gpio_is_occupied (gpio))return 0 ; type =IRQ_TYPE_EDGE_RISING |IRQ_TYPE_EDGE_FALLING ;
@@ -330,7 +330,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type) gpdr =readl_relaxed (c->regbase +GPDR_OFFSET ); -if (__gpio_is_inverted (gpio)) +if (pxa_gpio_is_inverted (gpio))writel_relaxed (gpdr | mask, c->regbase +GPDR_OFFSET );else writel_relaxed (gpdr & ~mask, c->regbase +GPDR_OFFSET );
Signature · 1 line
1.7.10.4
PATCH v5 4/12 gpio: pxa: use platform data for gpio inverted
In reply to Haojian ZhuangAvoid to judge whether gpio is inverted by identifying cpu in gpio driver. Move this into platform data of gpio driver.
--- arch/arm/mach-pxa/pxa25x.c | 3 +++ drivers/gpio/gpio-pxa.c | 28 ++++++++++++++++++---------- include/linux/gpio-pxa.h | 1 + 3 files changed, 22 insertions(+), 10 deletions(-)
arch/arm/mach-pxa/pxa25x.c +3 -0
@@ -340,6 +340,9 @@ void __init pxa25x_map_io(void) }static struct pxa_gpio_platform_data pxa25x_gpio_info__initdata = { +#ifdef CONFIG_CPU_PXA26x + .inverted = true, +#endif .gpio_set_wake = gpio_set_wake, };
drivers/gpio/gpio-pxa.c +18 -10
@@ -71,6 +71,7 @@ static struct device_node *pxa_gpio_of_node;struct pxa_gpio_chip {struct gpio_chip gc;void __iomem *regbase; +bool inverted;char label[10 ];unsigned long irq_mask;
@@ -126,9 +127,9 @@ static inline int gpio_is_mmp_type(int type)/* GPIO86/87/88/89 on PXA26x have their direction bits in PXA_GPDR(2 inverted, * as well as their Alternate Function value being '1' for GPIO in GAFRx. */ -static inline int pxa_gpio_is_inverted (int gpio) +static inline int pxa_gpio_is_inverted (struct pxa_gpio_chip *chip,int gpio) { -if ((gpio_type ==PXA26X_GPIO ) && (gpio >85 )) +if ((chip->inverted) && (gpio >85 ))return 1 ;return 0 ; }
@@ -139,14 +140,12 @@ static inline int pxa_gpio_is_inverted(int gpio)* is attributed as "occupied" here (I know this terminology isn't * accurate, you are welcome to propose a better one :-) */ -static inline int pxa_gpio_is_occupied (unsigned gpio) +static inline int pxa_gpio_is_occupied (struct pxa_gpio_chip *chip,unsigned gpio) { -struct pxa_gpio_chip *chip;void __iomem *base;unsigned long gafr =0 , gpdr =0 ;int ret, af =0 , dir =0 ; - chip =gpio_to_pxachip (gpio); base =gpio_chip_base (&chip->gc); gpdr =readl_relaxed (base +GPDR_OFFSET );
@@ -158,7 +157,7 @@ static inline int pxa_gpio_is_occupied(unsigned gpio) af = (gafr >> ((gpio &0xf ) *2 )) &0x3 ; dir = gpdr &GPIO_bit (gpio); -if (pxa_gpio_is_inverted (gpio)) +if (pxa_gpio_is_inverted (chip, gpio)) ret = (af !=1 ) || (dir ==0 );else ret = (af !=0 ) || (dir !=0 );
@@ -183,13 +182,16 @@ int pxa_irq_to_gpio(int irq)static int pxa_gpio_direction_input (struct gpio_chip *gc,unsigned offset) {void __iomem *base =gpio_chip_base (gc); +struct pxa_gpio_chip *chip;uint32_t value, mask =1 << offset;unsigned long flags; + chip = container_of(gc, struct pxa_gpio_chip, gc); +spin_lock_irqsave (&gpio_lock, flags); value =readl_relaxed (base +GPDR_OFFSET ); -if (pxa_gpio_is_inverted (gc->base + offset)) +if (pxa_gpio_is_inverted (chip, gc->base + offset)) value |= mask;else value &= ~mask;
@@ -203,15 +205,17 @@ static int pxa_gpio_direction_output(struct gpio_chip *gc, unsigned offset, int value) { void __iomem *base = gpio_chip_base(gc); +struct pxa_gpio_chip *chip;uint32_t tmp, mask =1 << offset;unsigned long flags; + chip = container_of(gc, struct pxa_gpio_chip, gc);writel_relaxed (mask, base + (value ?GPSR_OFFSET :GPCR_OFFSET ));spin_lock_irqsave (&gpio_lock, flags); tmp =readl_relaxed (base +GPDR_OFFSET ); -if (pxa_gpio_is_inverted (gc->base + offset)) +if (pxa_gpio_is_inverted (chip, gc->base + offset)) tmp &= ~mask;else tmp |= mask;
@@ -322,7 +326,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)if ((c->irq_edge_rise | c->irq_edge_fall) &GPIO_bit (gpio))return 0 ; -if (pxa_gpio_is_occupied (gpio)) +if (pxa_gpio_is_occupied (c, gpio))return 0 ; type =IRQ_TYPE_EDGE_RISING |IRQ_TYPE_EDGE_FALLING ;
@@ -330,7 +334,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type) gpdr =readl_relaxed (c->regbase +GPDR_OFFSET ); -if (pxa_gpio_is_inverted (gpio)) +if (pxa_gpio_is_inverted (c, gpio))writel_relaxed (gpdr | mask, c->regbase +GPDR_OFFSET );else writel_relaxed (gpdr & ~mask, c->regbase +GPDR_OFFSET );
@@ -507,6 +511,8 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)if (!pdata)return -ENOMEM ; pdata->ed_mask =of_property_read_bool (np,"marvell,gpio-ed-mask" ); +/* It's only valid for PXA26x */ + pdata->inverted =of_property_read_bool (np,"marvell,gpio-inverted" );/* set the platform data */ pdev->dev.platform_data = pdata; gpio_type = (int )of_id->data;
@@ -610,6 +616,8 @@ static int pxa_gpio_probe(struct platform_device *pdev)/* unmask GPIO edge detect for AP side */ if (info->ed_mask)writel_relaxed (~0 , c->regbase +ED_MASK_OFFSET ); +/* update for gpio inverted */ + c->inverted = info->inverted; }if (!use_of) {
include/linux/gpio-pxa.h +1 -0
@@ -15,6 +15,7 @@ extern int pxa_irq_to_gpio(int irq);struct pxa_gpio_platform_data {bool ed_mask;/* true means that ed_mask reg is available */ +bool inverted;/* only valid for PXA26x */ int (*gpio_set_wake)(unsigned int gpio,unsigned int on); };
Signature · 1 line
1.7.10.4
PATCH v5 5/12 gpio: pxa: remove gpio_type
In reply to Haojian ZhuangSince gpio_type is used to check whether gafr register is valid. So move it into platform data.
--- arch/arm/mach-pxa/pxa25x.c | 1 + arch/arm/mach-pxa/pxa27x.c | 1 + drivers/gpio/gpio-pxa.c | 54 +++++++++----------------------------------- include/linux/gpio-pxa.h | 1 + 4 files changed, 14 insertions(+), 43 deletions(-)
arch/arm/mach-pxa/pxa25x.c +1 -0
@@ -343,6 +343,7 @@ static struct pxa_gpio_platform_data pxa25x_gpio_info __initdata = {#ifdef CONFIG_CPU_PXA26x .inverted = true, #endif + .gafr = true, .gpio_set_wake = gpio_set_wake, };
arch/arm/mach-pxa/pxa27x.c +1 -0
@@ -431,6 +431,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) }static struct pxa_gpio_platform_data pxa27x_gpio_info__initdata = { + .gafr = true, .gpio_set_wake = gpio_set_wake, };
drivers/gpio/gpio-pxa.c +11 -43
135 lines not on this page · raw message
include/linux/gpio-pxa.h +1 -0
@@ -16,6 +16,7 @@ extern int pxa_irq_to_gpio(int irq);struct pxa_gpio_platform_data {bool ed_mask;/* true means that ed_mask reg is available */ bool inverted;/* only valid for PXA26x */ +bool gafr;/* only valid for PXA25x/PXA26x/PXA27x */ int (*gpio_set_wake)(unsigned int gpio,unsigned int on); };
Signature · 1 line
1.7.10.4
PATCH v5 6/12 gpio: pxa: define nr gpios in platform data
In reply to Haojian ZhuangAvoid to identify gpio numbers in gpio driver. Identify it in platform data instead. So we can remove code of identifying cpu.
--- arch/arm/mach-mmp/aspenite.c | 1 + arch/arm/mach-mmp/avengers_lite.c | 1 + arch/arm/mach-mmp/brownstone.c | 1 + arch/arm/mach-mmp/flint.c | 1 + arch/arm/mach-mmp/gplugd.c | 1 + arch/arm/mach-mmp/tavorevb.c | 1 + arch/arm/mach-mmp/teton_bga.c | 1 + arch/arm/mach-mmp/ttc_dkb.c | 1 + arch/arm/mach-pxa/pxa25x.c | 3 +++ arch/arm/mach-pxa/pxa27x.c | 1 + arch/arm/mach-pxa/pxa3xx.c | 17 ++++++++++-- drivers/gpio/gpio-pxa.c | 53 ++++++++----------------------------- include/linux/gpio-pxa.h | 1 + 13 files changed, 39 insertions(+), 44 deletions(-)
arch/arm/mach-mmp/aspenite.c +1 -0
@@ -112,6 +112,7 @@ static unsigned long common_pin_config[] __initdata = { };static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-mmp/avengers_lite.c +1 -0
@@ -34,6 +34,7 @@ static unsigned long avengers_lite_pin_config_V16F[] __initdata = { };static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-mmp/brownstone.c +1 -0
@@ -106,6 +106,7 @@ static unsigned long brownstone_pin_config[] __initdata = { };static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .nr_gpios =192 , .ed_mask = true, };
arch/arm/mach-mmp/flint.c +1 -0
@@ -79,6 +79,7 @@ static unsigned long flint_pin_config[] __initdata = { };static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .nr_gpios =192 , .ed_mask = true, };
arch/arm/mach-mmp/gplugd.c +1 -0
@@ -129,6 +129,7 @@ static unsigned long gplugd_pin_config[] __initdata = { };static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-mmp/tavorevb.c +1 -0
@@ -62,6 +62,7 @@ static unsigned long tavorevb_pin_config[] __initdata = { };static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-mmp/teton_bga.c +1 -0
@@ -51,6 +51,7 @@ static unsigned long teton_bga_pin_config[] __initdata = { };static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-mmp/ttc_dkb.c +1 -0
@@ -77,6 +77,7 @@ static unsigned long ttc_dkb_pin_config[] __initdata = { };static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .nr_gpios =128 , .ed_mask = true, };
arch/arm/mach-pxa/pxa25x.c +3 -0
@@ -342,6 +342,9 @@ void __init pxa25x_map_io(void)static struct pxa_gpio_platform_data pxa25x_gpio_info__initdata = { #ifdef CONFIG_CPU_PXA26x .inverted = true, + .nr_gpios =90 , +#else + .nr_gpios =85 , #endif .gafr = true, .gpio_set_wake = gpio_set_wake,
arch/arm/mach-pxa/pxa27x.c +1 -0
@@ -432,6 +432,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)static struct pxa_gpio_platform_data pxa27x_gpio_info__initdata = { .gafr = true, + .nr_gpios =121 , .gpio_set_wake = gpio_set_wake, };
arch/arm/mach-pxa/pxa3xx.c +15 -2
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/gpio-pxa.h> #include <linux/pm.h> #include <linux/platform_device.h> #include <linux/irq.h>
@@ -435,6 +436,10 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)pxa_register_device (&pxa3xx_device_i2c_power, info); } +static struct pxa_gpio_platform_data pxa3xx_gpio_info__initdata = { + .nr_gpios =128 , +}; +static struct platform_device *devices[]__initdata = { &pxa_device_gpio, &pxa27x_device_udc,
@@ -482,8 +487,16 @@ static int __init pxa3xx_init(void)register_syscore_ops (&pxa3xx_mfp_syscore_ops);register_syscore_ops (&pxa3xx_clock_syscore_ops); -if (!of_have_populated_dt ()) - ret =platform_add_devices (devices,ARRAY_SIZE (devices)); +if (!of_have_populated_dt ()) { +if (cpu_is_pxa93x ()) + pxa3xx_gpio_info.nr_gpios =192 ; + ret =platform_device_add_data (&pxa_device_gpio, + &pxa3xx_gpio_info, +sizeof (struct pxa_gpio_platform_data )); +if (!ret) + ret =platform_add_devices (devices, +ARRAY_SIZE (devices)); + } }return ret;
drivers/gpio/gpio-pxa.c +11 -42
106 lines not on this page · raw message
include/linux/gpio-pxa.h +1 -0
@@ -17,6 +17,7 @@ struct pxa_gpio_platform_data {bool ed_mask;/* true means that ed_mask reg is available */ bool inverted;/* only valid for PXA26x */ bool gafr;/* only valid for PXA25x/PXA26x/PXA27x */ +unsigned int nr_gpios;int (*gpio_set_wake)(unsigned int gpio,unsigned int on); };
Signature · 1 line
1.7.10.4
PATCH v5 7/12 gpio: pxa: add irq base in platform data
In reply to Haojian ZhuangMacro PXA_GPIO_TO_IRQ() & MMP_GPIO_TO_IRQ() is used in machine driver without DT. So move them into machine driver.
--- arch/arm/mach-mmp/aspenite.c | 1 + arch/arm/mach-mmp/avengers_lite.c | 1 + arch/arm/mach-mmp/brownstone.c | 1 + arch/arm/mach-mmp/flint.c | 1 + arch/arm/mach-mmp/gplugd.c | 1 + arch/arm/mach-mmp/tavorevb.c | 1 + arch/arm/mach-mmp/teton_bga.c | 1 + arch/arm/mach-mmp/ttc_dkb.c | 1 + arch/arm/mach-pxa/pxa25x.c | 1 + arch/arm/mach-pxa/pxa27x.c | 1 + arch/arm/mach-pxa/pxa3xx.c | 1 + drivers/gpio/gpio-pxa.c | 22 +++++++++------------- include/linux/gpio-pxa.h | 1 + 13 files changed, 21 insertions(+), 13 deletions(-)
arch/arm/mach-mmp/aspenite.c +1 -0
@@ -113,6 +113,7 @@ static unsigned long common_pin_config[] __initdata = {static struct pxa_gpio_platform_data pxa168_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/avengers_lite.c +1 -0
@@ -35,6 +35,7 @@ static unsigned long avengers_lite_pin_config_V16F[] __initdata = {static struct pxa_gpio_platform_data pxa168_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/brownstone.c +1 -0
@@ -107,6 +107,7 @@ static unsigned long brownstone_pin_config[] __initdata = {static struct pxa_gpio_platform_data mmp2_gpio_pdata = { .nr_gpios =192 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/flint.c +1 -0
@@ -80,6 +80,7 @@ static unsigned long flint_pin_config[] __initdata = {static struct pxa_gpio_platform_data mmp2_gpio_pdata = { .nr_gpios =192 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/gplugd.c +1 -0
@@ -130,6 +130,7 @@ static unsigned long gplugd_pin_config[] __initdata = {static struct pxa_gpio_platform_data pxa168_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/tavorevb.c +1 -0
@@ -63,6 +63,7 @@ static unsigned long tavorevb_pin_config[] __initdata = {static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/teton_bga.c +1 -0
@@ -52,6 +52,7 @@ static unsigned long teton_bga_pin_config[] __initdata = {static struct pxa_gpio_platform_data pxa168_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-mmp/ttc_dkb.c +1 -0
@@ -78,6 +78,7 @@ static unsigned long ttc_dkb_pin_config[] __initdata = {static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { .nr_gpios =128 , + .irq_base =MMP_GPIO_TO_IRQ (0 ), .ed_mask = true, };
arch/arm/mach-pxa/pxa25x.c +1 -0
@@ -346,6 +346,7 @@ static struct pxa_gpio_platform_data pxa25x_gpio_info __initdata = {#else .nr_gpios = 85, #endif + .irq_base = PXA_GPIO_TO_IRQ(0), .gafr = true, .gpio_set_wake = gpio_set_wake, };
arch/arm/mach-pxa/pxa27x.c +1 -0
@@ -433,6 +433,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)static struct pxa_gpio_platform_data pxa27x_gpio_info__initdata = { .gafr = true, .nr_gpios =121 , + .irq_base =PXA_GPIO_TO_IRQ (0 ), .gpio_set_wake = gpio_set_wake, };
arch/arm/mach-pxa/pxa3xx.c +1 -0
@@ -438,6 +438,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)static struct pxa_gpio_platform_data pxa3xx_gpio_info__initdata = { .nr_gpios =128 , + .irq_base =PXA_GPIO_TO_IRQ (0 ), };static struct platform_device *devices[]__initdata = {
drivers/gpio/gpio-pxa.c +9 -13
@@ -457,8 +457,6 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)dev_err (&pdev->dev,"nr-gpios isn't specified\n" );return -ENOTSUPP ; } -/* set the platform data */ - pdev->dev.platform_data = pdata; next =of_get_next_child (np,NULL ); prev = next;
@@ -479,6 +477,9 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)dev_err (&pdev->dev,"Failed to allocate IRQ numbers\n" );return -EINVAL ; } + pdata->irq_base = irq_base; +/* set the platform data */ + pdev->dev.platform_data = pdata; domain =irq_domain_add_legacy (np, pdata->nr_gpios, irq_base,0 , &pxa_irq_domain_ops,NULL ); pxa_gpio_of_node = np;
@@ -498,16 +499,13 @@ static int pxa_gpio_probe(struct platform_device *pdev)int irq0 =0 , irq1 =0 , irq_mux, gpio_offset =0 ; ret =pxa_gpio_probe_dt (pdev); -if (ret <0 ) { -#ifdef CONFIG_ARCH_PXA - irq_base =PXA_GPIO_TO_IRQ (0 ); -#elif defined(CONFIG_ARCH_MMP ) - irq_base =MMP_GPIO_TO_IRQ (0 ); -#else -#error "gpio-pxa driver can't be used for your architecture" -#endif +if (ret <0 ) use_of =0 ; - } + info =dev_get_platdata (&pdev->dev); + pxa_last_gpio = info->nr_gpios -1 ; + irq_base = info->irq_base; +if (pxa_last_gpio <=0 || irq_base <=0 ) +return -EINVAL ; irq0 =platform_get_irq_byname (pdev,"gpio0" ); irq1 =platform_get_irq_byname (pdev,"gpio1" );
@@ -540,8 +538,6 @@ static int pxa_gpio_probe(struct platform_device *pdev) }/* Initialize GPIO chips */ - info =dev_get_platdata (&pdev->dev); - pxa_last_gpio = info->nr_gpios -1 ;pxa_init_gpio_chip (pdev, pxa_last_gpio);/* clear all GPIO edge detects */
include/linux/gpio-pxa.h +1 -0
@@ -18,6 +18,7 @@ struct pxa_gpio_platform_data {bool inverted;/* only valid for PXA26x */ bool gafr;/* only valid for PXA25x/PXA26x/PXA27x */ unsigned int nr_gpios; +unsigned int irq_base;int (*gpio_set_wake)(unsigned int gpio,unsigned int on); };
Signature · 1 line
1.7.10.4
PATCH v5 8/12 document: devicetree: add properties in mrvl gpio
In reply to Haojian ZhuangAppend new properties for mrvl gpio. They're in below. marvell,gpio-ed-mask marvell,gpio-inverted & marvell,nr_gpios.
--- Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 9 +++++++++ 1 file changed, 9 insertions(+)
Documentation/devicetree/bindings/gpio/mrvl-gpio.txt +9 -0
@@ -14,6 +14,13 @@ Required properties: interrupt source. - gpio-controller : Marks the device node as a gpio controller. - #gpio-cells : Should be one. It is the pin number. +- marvell,nr-gpios : Should be the number of total gpio pins. + +Optional properties: +- marvell,gpio-ed-mask : It means that there's gpio edge mask register. + It only exists in mmp family SoC. +- marvell,gpio-inverted : It means that some gpio pins are inverted. + It only exists in PXA26x SoC. Example:
@@ -26,6 +33,8 @@ Example: #gpio-cells = <1>; interrupt-controller; #interrupt-cells = <1>; + marvell,gpio-ed-mask; + marvell,nr-gpios = <128>; }; * Marvell Orion GPIO Controller
Signature · 1 line
1.7.10.4
PATCH v5 9/12 gpio: pxa: remove arch related macro
In reply to Haojian ZhuangRemove macro CONFIG_ARCH_PXA.
--- drivers/gpio/gpio-pxa.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/gpio/gpio-pxa.c +15 -15
@@ -554,21 +554,21 @@ static int pxa_gpio_probe(struct platform_device *pdev) }if (!use_of) { -#ifdef CONFIG_ARCH_PXA - irq =gpio_to_irq (0 ); -irq_set_chip_and_handler (irq, &pxa_muxed_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); -irq_set_chained_handler (IRQ_GPIO0 , pxa_gpio_demux_handler); - - irq =gpio_to_irq (1 ); -irq_set_chip_and_handler (irq, &pxa_muxed_gpio_chip, - handle_edge_irq); -set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); -irq_set_chained_handler (IRQ_GPIO1 , pxa_gpio_demux_handler); -#endif - -for (irq =gpio_to_irq (gpio_offset); +if (irq0 >0 ) { + irq =gpio_to_irq (0 ); +irq_set_chip_and_handler (irq, &pxa_muxed_gpio_chip, + handle_edge_irq); +set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); +irq_set_chained_handler (irq0, pxa_gpio_demux_handler); + } +if (irq1 >0 ) { + irq =gpio_to_irq (1 ); +irq_set_chip_and_handler (irq, &pxa_muxed_gpio_chip, + handle_edge_irq); +set_irq_flags (irq,IRQF_VALID |IRQF_PROBE ); +irq_set_chained_handler (irq1, pxa_gpio_demux_handler); + } +for (irq =gpio_to_irq (gpio_offset); irq <=gpio_to_irq (pxa_last_gpio); irq++) {irq_set_chip_and_handler (irq, &pxa_muxed_gpio_chip, handle_edge_irq);
Signature · 1 line
1.7.10.4
PATCH v5 10/12 gpio: pxa: move gpio properties into child node
In reply to Haojian ZhuangMove gpio properties into child node. So pinctrl driver could binds to each gpio chip with gpio range.
--- drivers/gpio/gpio-pxa.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-)
drivers/gpio/gpio-pxa.c +18 -23
@@ -65,7 +65,6 @@ static int irq_base;#ifdef CONFIG_OF static struct irq_domain *domain; -static struct device_node *pxa_gpio_of_node;#endif struct pxa_gpio_chip {
@@ -233,8 +232,9 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,static int pxa_init_gpio_chip (struct platform_device *pdev,int gpio_end) {int i, gpio, nbanks =gpio_to_bank (gpio_end) +1 ; -struct pxa_gpio_chip *chips;struct pxa_gpio_platform_data *pdata =dev_get_platdata (&pdev->dev); +struct pxa_gpio_chip *chips; +struct device_node *next =NULL , *np =NULL ; chips =devm_kzalloc (&pdev->dev, nbanks *sizeof (*chips),GFP_KERNEL );if (!chips) {
@@ -242,6 +242,11 @@ static int pxa_init_gpio_chip(struct platform_device *pdev, int gpio_end)return -ENOMEM ; } + np = pdev->dev.of_node; +#ifdef CONFIG_OF +if (np) + next =of_get_next_child (np,NULL ); +#endif for (i =0 , gpio =0 ; i < nbanks; i++, gpio +=32 ) {struct gpio_chip *gc = &chips[i].gc;
@@ -258,16 +263,21 @@ static int pxa_init_gpio_chip(struct platform_device *pdev, int gpio_end) gc->get = pxa_gpio_get; gc->set = pxa_gpio_set; gc->to_irq = pxa_gpio_to_irq; -#ifdef CONFIG_OF_GPIO - gc->of_node = pxa_gpio_of_node; - gc->of_xlate = pxa_gpio_of_xlate; - gc->of_gpio_n_cells =2 ; +#ifdef CONFIG_OF +if (np) { + gc->of_node = next; + next =of_get_next_child (np, next); + + gc->of_xlate = pxa_gpio_of_xlate; + gc->of_gpio_n_cells =2 ; + }#endif /* number of GPIOs on last bank may be less than 32 */ gc->ngpio = (gpio +31 > gpio_end) ? (gpio_end - gpio +1 ) :32 ;gpiochip_add (gc); } +of_node_put (next); pxa_gpio_chips = chips;return 0 ; }
@@ -436,9 +446,9 @@ const struct irq_domain_ops pxa_irq_domain_ops = {static int pxa_gpio_probe_dt (struct platform_device *pdev) { -int ret, nr_banks; +int ret;struct pxa_gpio_platform_data *pdata; -struct device_node *prev, *next, *np = pdev->dev.of_node; +struct device_node *np = pdev->dev.of_node;const struct of_device_id *of_id =of_match_device (pxa_gpio_dt_ids, &pdev->dev);
@@ -458,20 +468,6 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)return -ENOTSUPP ; } - next =of_get_next_child (np,NULL ); - prev = next; -if (!next) { -dev_err (&pdev->dev,"Failed to find child gpio node\n" ); -return -EINVAL ; - } -for (nr_banks =1 ; ; nr_banks++) { - next =of_get_next_child (np, prev); -if (!next) -break ; - prev = next; - } -of_node_put (prev); - irq_base =irq_alloc_descs (-1 ,0 , pdata->nr_gpios,0 );if (irq_base <0 ) {dev_err (&pdev->dev,"Failed to allocate IRQ numbers\n" );
@@ -482,7 +478,6 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) pdev->dev.platform_data = pdata; domain =irq_domain_add_legacy (np, pdata->nr_gpios, irq_base,0 , &pxa_irq_domain_ops,NULL ); - pxa_gpio_of_node = np; return 0; }#else
Signature · 1 line
1.7.10.4
PATCH v5 11/12 gpio: pxa: bind to pinctrl by request
In reply to Haojian ZhuangWhile gpio pins is requested, request the pin of pinctrl driver first.
--- drivers/gpio/gpio-pxa.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpio/gpio-pxa.c +19 -0
@@ -22,6 +22,7 @@#include <linux/io.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/syscore_ops.h> #include <linux/slab.h>
@@ -154,6 +155,23 @@ int pxa_irq_to_gpio(int irq)return irq - irq_base; } +static int pxa_gpio_request (struct gpio_chip *gc,unsigned offset) +{ +/* +* Map back to global GPIO space and request muxing, the direction +* parameter does not matter for this controller. +*/ +int gpio = gc->base + offset; + +/* +* Platforms in ARCH_PXA doesn't move to device tree yet, +* and PINCTRL_SINGLE is depend on device tree. +*/ +if (IS_ENABLED (CONFIG_PINCTRL_SINGLE )) +return pinctrl_request_gpio (gpio); +return 0 ; +} +static int pxa_gpio_direction_input (struct gpio_chip *gc,unsigned offset) {void __iomem *base =gpio_chip_base (gc);
@@ -258,6 +276,7 @@ static int pxa_init_gpio_chip(struct platform_device *pdev, int gpio_end) gc->base = gpio; gc->label = chips[i].label; + gc->request = pxa_gpio_request; gc->direction_input = pxa_gpio_direction_input; gc->direction_output = pxa_gpio_direction_output; gc->get = pxa_gpio_get;
Signature · 1 line
1.7.10.4
PATCH v5 12/12 ARM: dts: support pinmux in pxa910
In reply to Haojian ZhuangAdd gpio range, pinmux settings in pxa910 dkb DTS file.
--- arch/arm/boot/dts/pxa910-dkb.dts | 248 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/pxa910.dtsi | 29 ++++- 2 files changed, 275 insertions(+), 2 deletions(-)
arch/arm/boot/dts/pxa910-dkb.dts +248 -0
@@ -170,6 +170,254 @@ rtc: rtc at d4010000 { status = "okay"; }; + gpio-keys { + compatible = "gpio-keys"; + + /* in6, out3, out4 */ + right { + label = "right"; + gpios = <&gcb0 12 0>; + linux,code = <106>; /* KEY_RIGHT */ + }; + num5 { + label = "5"; + gpios = <&gcb0 4 0>; + linux,code = <6>; /* KEY_5 */ + }; + }; + gpio at d4019000 { + status = "okay"; + + /* + * In theorical, some gpios could be routed to + * multiple pins. So define the gpio-ranges in + * board file, not silicon file. + */ + gcb0: gpio at d4019000 { + /* <gpio_offset, pin_offset, nr_pins> */ + gpio-ranges = <&pmx 0 55 32>; + }; + gcb1: gpio at d4019004 { + /* <gpio_offset, pin_offset, nr_pins> */ + gpio-ranges = <&pmx 0 87 23 &pmx 23 188 9>; + }; + gcb2: gpio at d4019008 { + /* <gpio_offset, pin_offset, nr_pins> */ + gpio-ranges = <&pmx 0 197 3 &pmx 3 110 29>; + }; + gcb3: gpio at d4019100 { + /* <gpio_offset, pin_offset, nr_pins> */ + gpio-ranges = < &pmx 0 139 14 &pmx 14 166 7 + &pmx 21 45 4 &pmx 25 203 1 + &pmx 26 50 4 &pmx 30 27 2>; + }; + }; + pmx: pinmux at d401e000 { + /* pin base, nr pins & gpio function */ + pinctrl-single,gpio-range = < + /* + * GPIO number is hardcoded for range@here. + * In gpio chip, GPIO number is not hardcoded for range. + * Since one gpio pin may be routed to multiple pins, + * define these gpio range in pxa910-dkb.dts not pxa910.dtsi. + */ + &range 55 55 0 /* GPIO0 ~ GPIO54 */ + &range 188 5 1 /* GPIO55 ~ GPIO59 */ + &range 193 7 0 /* GPIO60 ~ GPIO66 */ + &range 110 43 0 /* GPIO67 ~ GPIO109 */ + &range 166 7 0 /* GPIO110 ~ GPIO116 */ + &range 45 4 0 /* GPIO117 ~ GPIO120 */ + &range 50 2 1 /* GPIO122 ~ GPIO123 */ + &range 203 1 0 /* GPIO121 */ + &range 52 1 0 /* GPIO124 */ + &range 53 1 1 /* GPIO125 */ + &range 27 2 0 /* GPIO126 ~ GPIO127 */ + >; + + pinctrl-names = "default"; + pinctrl-0 = <&keypad_pmx_func>; + + uart1_pmx_func: pinmux_uart1_pins at 0 { + pinctrl-single,pins = < + 0x198 0x6 /* GPIO47_UART1_RXD */ + 0x19c 0x6 /* GPIO48_UART1_TXD */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + uart2_pmx_func: pinmux_uart2_pins at 0 { + pinctrl-single,pins = < + 0x150 0x4 /* GPIO29_UART2_CTS */ + 0x154 0x4 /* GPIO30_UART2_RTS */ + 0x158 0x4 /* GPIO31_UART2_TXD */ + 0x15c 0x4 /* GPIO32_UART2_RXD */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + uart3_pmx_func: pinmux_uart3_pins at 0 { + pinctrl-single,pins = < + 0x188 0x7 /* GPIO43_UART3_RXD */ + 0x18c 0x7 /* GPIO44_UART3_TXD */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + twsi1_pmx_func: pinmux_twsi1_pins at 0 { + pinctrl-single,pins = < + 0x1b0 0x2 /* GPIO53_TWSI_SCL */ + 0x1b4 0x2 /* GPIO54_TWSI_SDA */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + nand_pmx_func: pinmux_nand_pins at 0 { + pinctrl-single,pins = < + 0x040 0x0 /* ND_IO0 */ + 0x03c 0x0 /* ND_IO1 */ + 0x038 0x0 /* ND_IO2 */ + 0x034 0x0 /* ND_IO3 */ + 0x030 0x0 /* ND_IO4 */ + 0x02c 0x0 /* ND_IO5 */ + 0x028 0x0 /* ND_IO6 */ + 0x024 0x0 /* ND_IO7 */ + 0x020 0x0 /* ND_IO8 */ + 0x01c 0x0 /* ND_IO9 */ + 0x018 0x0 /* ND_IO10 */ + 0x014 0x0 /* ND_IO11 */ + 0x010 0x0 /* ND_IO12 */ + 0x00c 0x0 /* ND_IO13 */ + 0x008 0x0 /* ND_IO14 */ + 0x004 0x0 /* ND_IO15 */ + 0x044 0x0 /* ND_nCS0 */ + 0x060 0x1 /* ND_ALE */ + 0x05c 0x0 /* ND_CLE */ + 0x054 0x1 /* ND_nWE */ + 0x058 0x1 /* ND_nRE */ + 0x068 0x0 /* ND_RDY0 */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + mmc1_pmx_func1: pinmux_mmc1_pins at 0 { + pinctrl-single,pins = < + 0x0a0 0x0 /* MMC1_DATA0 */ + 0x09c 0x0 /* MMC1_DATA1 */ + 0x098 0x0 /* MMC1_DATA2 */ + 0x094 0x0 /* MMC1_DATA3 */ + 0x090 0x0 /* MMC1_DATA4 */ + 0x08c 0x0 /* MMC1_DATA5 */ + 0x088 0x0 /* MMC1_DATA6 */ + 0x084 0x0 /* MMC1_DATA7 */ + 0x0a4 0x0 /* MMC1_CMD */ + 0x0a8 0x0 /* MMC1_CLK */ + >; + pinctrl-single,slew-rate = <0x1800 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + mmc1_pmx_func2: pinmux_mmc1_pins at 1 { + pinctrl-single,pins = < + 0x0ac 0x0 /* MMC1_CD */ + 0x0b0 0x0 /* MMC1_WP */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + mmc2_pmx_func: pinmux_mmc2_pins at 0 { + pinctrl-single,pins = < + 0x180 0x1 /* MMC2_CMD */ + 0x184 0x1 /* MMC2_CLK */ + 0x17c 0x1 /* MMC2_DATA0 */ + 0x178 0x1 /* MMC2_DATA1 */ + 0x174 0x1 /* MMC2_DATA2 */ + 0x170 0x1 /* MMC2_DATA3 */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + ssp1_pmx_func: pinmux_ssp1_pins at 0 { + pinctrl-single,pins = < + 0x130 0x1 /* GPIO21_SSP1_SCLK */ + 0x134 0x1 /* GPIO22_SSP1_FRM */ + 0x138 0x1 /* GPIO23_SSP1_TXD */ + 0x13c 0x1 /* GPIO24_SSP1_RXD */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + keypad_pmx_func: pinmux_keypad_pins at 0 { + pinctrl-single,pins = < + 0x0dc 0x1 /* GPIO0_MKIN0 */ + 0x0e0 0x1 /* GPIO1_MKOUT0 */ + 0x0e4 0x1 /* GPIO2_MKIN1 */ + 0x0e8 0x1 /* GPIO3_MKOUT1 */ + 0x0ec 0x1 /* GPIO4_MKIN2 */ + 0x0f0 0x1 /* GPIO5_MKOUT2 */ + 0x0f4 0x1 /* GPIO6_MKIN3 */ + 0x0f8 0x1 /* GPIO7_MKOUT3 */ + 0x0fc 0x1 /* GPIO8_MKIN4 */ + 0x100 0x1 /* GPIO9_MKOUT4 */ + 0x10c 0x1 /* GPIO12_MKIN6 */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0xa000 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + nfc_pmx_func: pinmux_nfc_pins at 0 { + pinctrl-single,pins = < + 0x120 0x0 /* GPIO17 */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0x0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + wlan_pmx_func: pinmux_wlan_pins at 0 { + pinctrl-single,pins = < + 0x114 0x0 /* GPIO14 */ + 0x12c 0x0 /* GPIO20 */ + 0x160 0x0 /* GPIO33 */ + 0x164 0x0 /* GPIO34 */ + 0x168 0x0 /* GPIO35 */ + 0x16c 0x0 /* GPIO36 */ + >; + pinctrl-single,slew-rate = <0x1000 0x1800>; + pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>; + pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>; + pinctrl-single,input-schmitt = <0 0x30>; + pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>; + }; + }; }; }; };
arch/arm/boot/dts/pxa910.dtsi +27 -2
@@ -93,28 +93,37 @@ #address-cells = <1>; #size-cells = <1>; reg = <0xd4019000 0x1000>; - gpio-controller; - #gpio-cells = <2>; + marvell,gpio-ed-mask = <1>; + marvell,nr-gpios = <128>; interrupts = <49>; interrupt-names = "gpio_mux"; interrupt-controller; #interrupt-cells = <1>; + status = "disabled"; ranges; gcb0: gpio at d4019000 { reg = <0xd4019000 0x4>; + gpio-controller; + #gpio-cells = <2>; }; gcb1: gpio at d4019004 { reg = <0xd4019004 0x4>; + gpio-controller; + #gpio-cells = <2>; }; gcb2: gpio at d4019008 { reg = <0xd4019008 0x4>; + gpio-controller; + #gpio-cells = <2>; }; gcb3: gpio at d4019100 { reg = <0xd4019100 0x4>; + gpio-controller; + #gpio-cells = <2>; }; };
@@ -144,6 +153,22 @@ interrupt-names = "rtc 1Hz", "rtc alarm"; status = "disabled"; }; + + pmx: pinmux at d401e000 { + compatible = "pinconf-single"; + reg = <0xd401e000 0x330>; + #address-cells = <1>; + #size-cells = <1>; + #gpio-range-cells = <3>; + ranges; + + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <7>; + + range: gpio-range { + #pinctrl-single,gpio-range-cells = <3>; + }; + }; }; }; };
Signature · 1 line
1.7.10.4
PATCH v5 12/12 ARM: dts: support pinmux in pxa910
Quoted 3 lines · Haojian Zhuang
Add gpio range, pinmux settings in pxa910 dkb DTS file.
Signed-off-by Haojian Zhuang <[email protected]>
Overall the file is looking real nice.
Quoted 2 lines
arch/arm/boot/dts/pxa910-dkb.dts +2
-0+ &range 55 55 0 /* GPIO0 ~ GPIO54 */ + &range 188 5 1 /* GPIO55 ~ GPIO59 */
(...)
arch/arm/boot/dts/pxa910-dkb.dts line 243
Quoted 2 lines
arch/arm/boot/dts/pxa910-dkb.dts +2
-0+ 0x198 0x6 /* GPIO47_UART1_RXD */ + 0x19c 0x6 /* GPIO48_UART1_TXD */
The Freescale people just started using the new C preprocessor for defining real constants for this type of stuff.
In this case it's be way more helpful to use
#define GPIO47_UART1_RXD 0x198
and use that.
(Though I'm not sure why hex numbers are helpful on such physical things as pins, but your choice.)
Yours,
Linus Walleij
v5 cover enhance DT support on gpio pxa
In reply to Haojian ZhuangQuoted 6 lines · Haojian Zhuang
Changelog:
v5:
* Replaceof_find_property()byof_property_read_bool().
* Rename__gpio_is_occupied()&__gpio_is_inverted().
* Avoid to use pxachip as variable name. Use chip instead.
Bah I've been talking crap in my other comments. This series looks great. Acked-by: Linus Walleij <[email protected]> for the entire series (but I have a comment on patch 12/12, even though I Ack it).
Will you take this through the PXA tree?
Yours,
Linus Walleij
v5 cover enhance DT support on gpio pxa
Quoted 15 lines · Linus Walleij
Quoted 6 lines · Haojian Zhuang
Changelog:
v5:
* Replaceof_find_property()byof_property_read_bool().
* Rename__gpio_is_occupied()&__gpio_is_inverted().
* Avoid to use pxachip as variable name. Use chip instead.Bah I've been talking crap in my other comments. This series looks great. Acked-by: Linus Walleij <[email protected]> for the entire series (but I have a comment on patch 12/12, even though I Ack it).
Quoted 4 lines
Will you take this through the PXA tree?
Yours,
Linus Walleij
Since Grant has some comments on the platform data usage, I'll give out the v6 later.
By the way, I'll take it through the PXA tree.
Regards
Haojian