mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the pinctrl tree with the driver-core.current tree
@ 2012-12-24  1:47 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2012-12-24  1:47 UTC (permalink / raw)
  To: Linus Walleij; +Cc: linux-next, linux-kernel, Greg Kroah-Hartman, Barry Song

[-- Attachment #1: Type: text/plain, Size: 2185 bytes --]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/pinctrl-sirf.c between commit c2c57b329c7b ("Drivers:
pinctrl: remove __dev* attributes") from the driver-core.current tree and
commit 19d601d8e0a7 ("pinctrl: sirf: enable GPIO pullup/down
configuration from dts") from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/pinctrl/pinctrl-sirf.c
index c776046,30e1a38..0000000
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@@ -1663,7 -1663,45 +1663,45 @@@ const struct irq_domain_ops sirfsoc_gpi
  	.xlate = irq_domain_xlate_twocell,
  };
  
+ static void sirfsoc_gpio_set_pullup(const u32 *pullups)
+ {
+ 	int i, n;
+ 	const unsigned long *p = (const unsigned long *)pullups;
+ 
+ 	for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
+ 		n = find_first_bit(p + i, BITS_PER_LONG);
+ 		while (n < BITS_PER_LONG) {
+ 			u32 offset = SIRFSOC_GPIO_CTRL(i, n);
+ 			u32 val = readl(sgpio_bank[i].chip.regs + offset);
+ 			val |= SIRFSOC_GPIO_CTL_PULL_MASK;
+ 			val |= SIRFSOC_GPIO_CTL_PULL_HIGH;
+ 			writel(val, sgpio_bank[i].chip.regs + offset);
+ 
+ 			n = find_next_bit(p + i, BITS_PER_LONG, n + 1);
+ 		}
+ 	}
+ }
+ 
+ static void sirfsoc_gpio_set_pulldown(const u32 *pulldowns)
+ {
+ 	int i, n;
+ 	const unsigned long *p = (const unsigned long *)pulldowns;
+ 
+ 	for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
+ 		n = find_first_bit(p + i, BITS_PER_LONG);
+ 		while (n < BITS_PER_LONG) {
+ 			u32 offset = SIRFSOC_GPIO_CTRL(i, n);
+ 			u32 val = readl(sgpio_bank[i].chip.regs + offset);
+ 			val |= SIRFSOC_GPIO_CTL_PULL_MASK;
+ 			val &= ~SIRFSOC_GPIO_CTL_PULL_HIGH;
+ 			writel(val, sgpio_bank[i].chip.regs + offset);
+ 
+ 			n = find_next_bit(p + i, BITS_PER_LONG, n + 1);
+ 		}
+ 	}
+ }
+ 
 -static int __devinit sirfsoc_gpio_probe(struct device_node *np)
 +static int sirfsoc_gpio_probe(struct device_node *np)
  {
  	int i, err = 0;
  	struct sirfsoc_gpio_bank *bank;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread
* linux-next: manual merge of the pinctrl tree with the driver-core.current tree
@ 2013-01-03  1:35 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-01-03  1:35 UTC (permalink / raw)
  To: Linus Walleij; +Cc: linux-next, linux-kernel, Greg KH, Julien Delacou

[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit c2c57b329c7b ("Drivers:
pinctrl: remove __dev* attributes") from the driver-core.current tree and
commit f7ae849b80de ("pinctrl/nomadik: adopt pinctrl sleep mode
management") from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index c68ec40,8e4720f..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -1846,7 -2111,29 +2111,29 @@@ static const struct of_device_id nmk_pi
  	{},
  };
  
+ static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state)
+ {
+ 	struct nmk_pinctrl *npct;
+ 
+ 	npct = platform_get_drvdata(pdev);
+ 	if (!npct)
+ 		return -EINVAL;
+ 
+ 	return pinctrl_force_sleep(npct->pctl);
+ }
+ 
+ static int nmk_pinctrl_resume(struct platform_device *pdev)
+ {
+ 	struct nmk_pinctrl *npct;
+ 
+ 	npct = platform_get_drvdata(pdev);
+ 	if (!npct)
+ 		return -EINVAL;
+ 
+ 	return pinctrl_force_default(npct->pctl);
+ }
+ 
 -static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
 +static int nmk_pinctrl_probe(struct platform_device *pdev)
  {
  	const struct platform_device_id *platid = platform_get_device_id(pdev);
  	struct device_node *np = pdev->dev.of_node;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-03  1:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-24  1:47 linux-next: manual merge of the pinctrl tree with the driver-core.current tree Stephen Rothwell
2013-01-03  1:35 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®