From: Lee Jones <lee.jones@linaro.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: [GIT PULL] sound branch of STMPE cleanups
Date: Fri, 23 May 2014 09:32:08 +0100 [thread overview]
Message-ID: <20140523083208.GM19747@lee--X1> (raw)
In-Reply-To: <CACRpkdZTez-OJgjNV8jKxgFEXhyXdsnv5bwSdLH_dRfok1u24g@mail.gmail.com>
> as seen in linux-next something is screwed up on the immutable
> branch for STMPE cleanups, can you pull this instead, it is
> the known tested good version with no compilation regressions.
>
> I have no hurry to get this into the GPIO tree anymore, I will push
> additionall changes to the next merge window, simply.
Nope, this branch is broken too. I don't think this is a merge error,
I think it's programmer error (even the greats make mistakes =:-) ).
Take a look at the patch:
http://paste.ubuntu.com/7504677/
You remove all instances of irq_base except the one in stmpe_irq_init().
I'll fix this up for you and re-push/tag the branch. The references
will be the same, so you just need to re-fetch and re-merge. I'll
give you the node once it's ready.
In the mean time, it might be worth you looking at your build system,
as it seems to be overlooking drivers/mfd/stmpe.c.
> The following changes since commit 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd:
>
> Linux 3.15-rc4 (2014-05-04 18:14:42 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
> stmpe-for-lee
>
> for you to fetch changes up to decc1ca8b2e5ae947fd9679f8adbd056d3b47d30:
>
> mfd: stmpe: mask off unused blocks properly (2014-05-23 00:19:12 +0200)
>
> ----------------------------------------------------------------
> Linus Walleij (4):
> mfd: stmpe: root out static GPIO and IRQ assignments
> mfd: stmpe: add optional regulators
> mfd: stmpe: probe properly from the device tree
> mfd: stmpe: mask off unused blocks properly
>
> drivers/gpio/gpio-stmpe.c | 18 +++++-------------
> drivers/mfd/Kconfig | 1 +
> drivers/mfd/stmpe-i2c.c | 30 +++++++++++++++++++++++++++++-
> drivers/mfd/stmpe.c | 30 ++++++++++++++++++++++++++++--
> drivers/mfd/stmpe.h | 2 +-
> include/linux/mfd/stmpe.h | 19 +++++--------------
> 6 files changed, 69 insertions(+), 31 deletions(-)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2014-05-23 8:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 22:23 Linus Walleij
2014-05-23 8:32 ` Lee Jones [this message]
2014-05-23 8:59 ` Linus Walleij
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=20140523083208.GM19747@lee--X1 \
--to=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
/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®