From: Linus Walleij <linus.walleij@linaro.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, arnd@arndb.de,
linux-i2c@vger.kernel.org, Wolfram Sang <w.sang@pengutronix.de>
Subject: Re: [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree
Date: Mon, 10 Sep 2012 04:42:36 -0700 [thread overview]
Message-ID: <CACRpkdaCrus9SOpxyK+kV2gKr3sEZJsHCn6ivn2gA3ri0rcvHw@mail.gmail.com> (raw)
In-Reply-To: <1347016499-29354-13-git-send-email-lee.jones@linaro.org>
On Fri, Sep 7, 2012 at 1:14 PM, Lee Jones <lee.jones@linaro.org> wrote:
> Each I2C device can be correctly probed already using Device Tree,
> but the sub-devices still have to be registered by calls to
> i2c_register_board_info(). After this patch, each sub-device can
> be registered directly from Device Tree instead, removing the
> requirement for the aforementioned calls from platform code.
>
> CC: linux-i2c@vger.kernel.org
> CC: Wolfram Sang <w.sang@pengutronix.de>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
The patch as such is fine.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
...but there will be merge issues (of the type I'm
discussing with Arnd in another thread).
> ---
> drivers/i2c/busses/i2c-nomadik.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
> index 5d1a970..01231c2 100644
> --- a/drivers/i2c/busses/i2c-nomadik.c
> +++ b/drivers/i2c/busses/i2c-nomadik.c
> @@ -26,6 +26,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/platform_data/i2c-nomadik.h>
> #include <linux/of.h>
> +#include <linux/of_i2c.h>
This is clearly dependent on the other patches to I2C to
be merged first (the include above is not yet there in
linux-next even), so this patch should go into Wolfram's
tree right? Else we have to rip out all the patches to the
I2C driver from his tree and funnel it all through ARM SoC.
With the changes to the device tree itself being dependent
on this, they should thus also go through the I2C tree.
But they may be heavily dependent on the other DT
changes you've done, so they cannot be applied to
Wolfram's tree...
And thus you may need to hold this change off
until the I2C changes are upstream, or start creating
cross-tree dependencies.
Maybe I shouldn't worry about these things and just
ACK stuff, but I have such problems with cross-tree
merges myself so just trying to be helpful :-/
Yours,
Linus Walleij
next prev parent reply other threads:[~2012-09-10 11:42 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 11:14 [PATCH 00/19] First HREF Device Tree enablement patch-set Lee Jones
2012-09-07 11:14 ` [PATCH 01/19] ARM: ux500: Add skeleton Device Tree for the HREF reference board Lee Jones
2012-09-10 8:47 ` Linus Walleij
2012-09-14 9:37 ` Lee Jones
2012-09-14 14:01 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 02/19] ARM: ux500: Add UART support to the HREF Device Tree Lee Jones
2012-09-10 8:49 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 03/19] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI Lee Jones
2012-09-10 8:50 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 04/19] ARM: ux500: Add SDI (MMC) support to the HREF Device Tree Lee Jones
2012-09-07 12:29 ` Arnd Bergmann
2012-09-07 12:39 ` Lee Jones
2012-09-10 9:51 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 05/19] ARM: ux500: Stop registering HREF's SDI devices from platform data Lee Jones
2012-09-07 12:30 ` Arnd Bergmann
2012-09-07 11:14 ` [PATCH 06/19] ARM: ux500: Add nodes for the MSP into the HREF Device Tree Lee Jones
2012-09-10 9:53 ` Linus Walleij
2012-09-14 9:23 ` Lee Jones
2012-09-14 14:00 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 07/19] ARM: ux500: Add all encompassing sound node to " Lee Jones
2012-09-10 9:56 ` Linus Walleij
2012-09-14 9:20 ` Lee Jones
2012-09-07 11:14 ` [PATCH 08/19] ARM: ux500: Stop registering Audio devices for HREF when DT is enabled Lee Jones
2012-09-10 9:57 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 09/19] ARM: ux500: Enable SSP (SPI) for HREF when booting Device Tree Lee Jones
2012-09-10 11:11 ` Linus Walleij
2012-09-14 9:18 ` Lee Jones
2012-09-17 17:03 ` Roland Stigge
2012-09-18 12:08 ` Linus Walleij
2012-09-18 12:13 ` Roland Stigge
2012-09-07 11:14 ` [PATCH 10/19] ARM: ux500: Remove redundant #gpio-cell properties from HREF and Snowball DT Lee Jones
2012-09-10 11:12 ` Linus Walleij
2012-09-14 9:10 ` Lee Jones
2012-09-14 13:58 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 11/19] ARM: ux500: Add all known I2C sub-device nodes to the HREF DT Lee Jones
2012-09-10 11:34 ` Linus Walleij
2012-09-14 8:47 ` Lee Jones
2012-09-20 6:51 ` Linus Walleij
2012-09-18 15:49 ` Lee Jones
2012-09-07 11:14 ` [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree Lee Jones
2012-09-10 11:42 ` Linus Walleij [this message]
2012-09-12 10:52 ` Wolfram Sang
2012-09-14 8:27 ` Lee Jones
2012-09-14 8:41 ` Wolfram Sang
2012-09-14 9:02 ` Lee Jones
2012-09-14 9:39 ` Wolfram Sang
2012-09-14 10:15 ` Lee Jones
2012-09-14 11:32 ` Wolfram Sang
2012-09-19 20:12 ` Lee Jones
2012-10-06 11:25 ` Wolfram Sang
2012-09-14 8:22 ` Lee Jones
2012-09-07 11:14 ` [PATCH 13/19] ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled Lee Jones
2012-09-10 12:56 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 14/19] ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT Lee Jones
2012-09-10 12:58 ` Linus Walleij
2012-09-14 8:33 ` Lee Jones
2012-09-07 11:14 ` [PATCH 15/19] mfd: Don't convert just one IRQ using irqdomain if a range is provided Lee Jones
2012-09-07 12:35 ` Arnd Bergmann
2012-09-07 12:46 ` Lee Jones
2012-09-07 13:37 ` Arnd Bergmann
2012-09-07 13:43 ` Lee Jones
2012-09-07 13:57 ` Arnd Bergmann
2012-09-17 13:45 ` Samuel Ortiz
2012-09-17 14:11 ` Lee Jones
2012-09-21 22:20 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 16/19] mfd: Provide the tc3589x with its own IRQ domain Lee Jones
2012-09-10 13:05 ` Linus Walleij
2012-09-16 23:45 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 17/19] mfd: Enable the tc3589x for Device Tree Lee Jones
2012-09-10 13:08 ` Linus Walleij
2012-09-16 23:45 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 18/19] gpio: Provide the tc3589x GPIO expander driver with an IRQ domain Lee Jones
2012-09-10 13:10 ` Linus Walleij
2012-09-12 13:04 ` Linus Walleij
2012-09-14 8:14 ` Lee Jones
2012-09-12 21:21 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 19/19] gpio: Enable the tc3298x GPIO expander driver for Device Tree Lee Jones
2012-09-10 13:20 ` Linus Walleij
2012-09-12 21:21 ` Linus Walleij
2012-09-07 12:41 ` [PATCH 00/19] First HREF Device Tree enablement patch-set Arnd Bergmann
2012-09-07 13:01 ` Lee Jones
2012-09-07 13:58 ` Arnd Bergmann
2012-09-07 14:22 ` Lee Jones
2012-09-10 8:41 ` Linus Walleij
2012-09-10 10:13 ` Arnd Bergmann
2012-09-10 11:29 ` Linus Walleij
2012-09-10 13:49 ` Arnd Bergmann
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=CACRpkdaCrus9SOpxyK+kV2gKr3sEZJsHCn6ivn2gA3ri0rcvHw@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=w.sang@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).