Skip to contentSkip to conversation

pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate

PATCH New Barry Song 3 participants 3 messages Feb 4, 2013 – Feb 5, 2013 Pin control

lore
Share & tools
lore

Barry Song

author
#0 lore raw

PATCH 1/1 pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate

From: Barry Song <[email protected]>

the default of_gpio_simple_xlate() will make us fail while getting gpios bigger than 32 by of_get_named_gpio() or related APIs.
this patch adds a specific of_xlate callback for sirf gpio_chip and fix the problem.

---
 drivers/pinctrl/pinctrl-sirf.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
drivers/pinctrl/pinctrl-sirf.c +18 -0
index fc76f28..7051874 100644
@@ -1246,6 +1246,22 @@ static void __iomem *sirfsoc_rsc_of_iomap(void)
 	return of_iomap(np, 0);
 }
 
+static int sirfsoc_gpio_of_xlate(struct gpio_chip *gc,
+       const struct of_phandle_args *gpiospec,
+       u32 *flags)
+{
+       if (gpiospec->args[0] > SIRFSOC_GPIO_NO_OF_BANKS * SIRFSOC_GPIO_BANK_SIZE)
+               return -EINVAL;
+
+       if (gc != &sgpio_bank[gpiospec->args[0] / SIRFSOC_GPIO_BANK_SIZE].chip.gc)
+               return -EINVAL;
+
+       if (flags)
+               *flags = gpiospec->args[1];
+
+       return gpiospec->args[0] % SIRFSOC_GPIO_BANK_SIZE;
+}
+
 static int sirfsoc_pinmux_probe(struct platform_device *pdev)
 {
 	int ret;
@@ -1747,6 +1763,8 @@ static int sirfsoc_gpio_probe(struct device_node *np)
 		bank->chip.gc.ngpio = SIRFSOC_GPIO_BANK_SIZE;
 		bank->chip.gc.label = kstrdup(np->full_name, GFP_KERNEL);
 		bank->chip.gc.of_node = np;
+		bank->chip.gc.of_xlate = sirfsoc_gpio_of_xlate;
+		bank->chip.gc.of_gpio_n_cells = 2;
 		bank->chip.regs = regs;
 		bank->id = i;
 		bank->is_marco = is_marco;
Signature · 6 lines
1.7.5.4



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
#1 lore raw

PATCH 1/1 pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate

Quoted 8 lines · Barry Song

From: Barry Song <[email protected]>

the default of_gpio_simple_xlate() will make us fail while getting gpios bigger than 32 by of_get_named_gpio() or related APIs.
this patch adds a specific of_xlate callback for sirf gpio_chip and fix the problem.

Patch applied, hope this will be the last thing on fixes for this cycle. I really need to get the last fixes to Torvalds now.

Yours,
Linus Walleij

#2 lore raw

PATCH 1/1 pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate

2013/2/5 Linus Walleij <[email protected]>:

Quoted 9 lines · Barry Song
Quoted 8 lines

From: Barry Song <[email protected]>

the default of_gpio_simple_xlate() will make us fail while getting gpios bigger than 32 by of_get_named_gpio() or related APIs.
this patch adds a specific of_xlate callback for sirf gpio_chip and fix the problem.

Quoted 5 lines
Quoted 1 line

Patch applied, hope this will be the last thing on fixes for this cycle. I really need to get the last fixes to Torvalds now.

at least it is my last :-)

Quoted 3 lines

Yours,
Linus Walleij

-barry