On Tue, Feb 22, 2011 at 5:31 PM, Thomas Chou <thomas@xxxxxxxxxxxxx> wrote: > On 02/23/2011 08:12 AM, Ben Dooks wrote: >> >> On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote: >>> >>> This patch registers devices on the devicetree child nodes to the bus. >>> Also removes one trailing whitespace. >> >> Is this required as an urgent fix, or can it queue for next merge window? > > It is not urgent. An it is fine to queue it for next merge window. Yes, queue for .39 g. > > - Thomas > >> >>> Signed-off-by: Thomas Chou<thomas@xxxxxxxxxxxxx> >>> --- >>> drivers/i2c/busses/i2c-ocores.c | 6 +++++- >>> 1 files changed, 5 insertions(+), 1 deletions(-) >>> >>> diff --git a/drivers/i2c/busses/i2c-ocores.c >>> b/drivers/i2c/busses/i2c-ocores.c >>> index ef3bcb1..c63838f 100644 >>> --- a/drivers/i2c/busses/i2c-ocores.c >>> +++ b/drivers/i2c/busses/i2c-ocores.c >>> @@ -18,7 +18,7 @@ >>> * - interrupts : interrupt number >>> * - regstep : size of device registers in bytes >>> * - clock-frequency : frequency of bus clock in Hz >>> - * >>> + * >>> * Example: >>> * >>> * i2c0: ocores@a0000000 { >>> @@ -55,6 +55,7 @@ >>> #include<linux/i2c-ocores.h> >>> #include<linux/slab.h> >>> #include<linux/io.h> >>> +#include<linux/of_i2c.h> >>> >>> struct ocores_i2c { >>> void __iomem *base; >>> @@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct >>> platform_device *pdev) >>> i2c_new_device(&i2c->adap, pdata->devices + i); >>> } >>> >>> + /* Now register all the child nodes */ >>> + of_i2c_register_devices(&i2c->adap); >>> + >>> return 0; >>> } >>> >>> -- >>> 1.7.4 >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in >>> the body of a message to majordomo@xxxxxxxxxxxxxxx >>> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html