mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Barry Song <Baohua.Song@csr.com>
Subject: linux-next: manual merge of the pinctrl tree with the driver-core.current tree
Date: Mon, 24 Dec 2012 12:47:08 +1100	[thread overview]
Message-ID: <20121224124708.b0fb53a402f2a4bfdfece9c2@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2012-12-24  1:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-24  1:47 Stephen Rothwell [this message]
2013-01-03  1:35 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121224124708.b0fb53a402f2a4bfdfece9c2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Baohua.Song@csr.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®