| Message ID | 1389157195-20236-2-git-send-email-daniel.sangorrin@toshiba.co.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 08, 2014 at 01:59:55PM +0900, Daniel Sangorrin wrote: > This patch fixes the xilinx i2c build problem on LTSI 3.10. The > Makefile line dissapeared from the original patch during the merge. > Also the i2c-xilinx_ps.c references a header that was removed > by other backported patches. > > Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> > Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> > --- > drivers/i2c/busses/Makefile | 1 + > drivers/i2c/busses/i2c-xilinx_ps.c | 3 --- > 2 files changed, 1 insertion(+), 3 deletions(-) Which patch should I merge this with? I don't want there to be a place in the patch series that breaks the build, so merging it would be good. thanks, greg k-h
On 2014/01/11 7:45, Greg KH wrote: > On Wed, Jan 08, 2014 at 01:59:55PM +0900, Daniel Sangorrin wrote: >> This patch fixes the xilinx i2c build problem on LTSI 3.10. The >> Makefile line dissapeared from the original patch during the merge. >> Also the i2c-xilinx_ps.c references a header that was removed >> by other backported patches. >> >> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> >> Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> >> --- >> drivers/i2c/busses/Makefile | 1 + >> drivers/i2c/busses/i2c-xilinx_ps.c | 3 --- >> 2 files changed, 1 insertion(+), 3 deletions(-) > > Which patch should I merge this with? I don't want there to be a place > in the patch series that breaks the build, so merging it would be good. The most appropriate patch to merge it with is the following: patches.zynq/0001-i2c-xilinx-merge-i2c-driver-from-Xilinx-repository-i.patch Thanks,
On Tue, Jan 14, 2014 at 09:40:54AM +0900, Daniel Sangorrin wrote: > > On 2014/01/11 7:45, Greg KH wrote: > > On Wed, Jan 08, 2014 at 01:59:55PM +0900, Daniel Sangorrin wrote: > >> This patch fixes the xilinx i2c build problem on LTSI 3.10. The > >> Makefile line dissapeared from the original patch during the merge. > >> Also the i2c-xilinx_ps.c references a header that was removed > >> by other backported patches. > >> > >> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> > >> Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> > >> --- > >> drivers/i2c/busses/Makefile | 1 + > >> drivers/i2c/busses/i2c-xilinx_ps.c | 3 --- > >> 2 files changed, 1 insertion(+), 3 deletions(-) > > > > Which patch should I merge this with? I don't want there to be a place > > in the patch series that breaks the build, so merging it would be good. > > The most appropriate patch to merge it with is the following: > patches.zynq/0001-i2c-xilinx-merge-i2c-driver-from-Xilinx-repository-i.patch Wonderful, I've now done this and pushed out the changes, thanks. greg k-h
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 3ba94a9..f35b079 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -72,6 +72,7 @@ obj-$(CONFIG_I2C_STU300) += i2c-stu300.o obj-$(CONFIG_I2C_TEGRA) += i2c-tegra.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o +obj-$(CONFIG_I2C_XILINX_PS) += i2c-xilinx_ps.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o obj-$(CONFIG_I2C_XLR) += i2c-xlr.o diff --git a/drivers/i2c/busses/i2c-xilinx_ps.c b/drivers/i2c/busses/i2c-xilinx_ps.c index 67a1001..3b98c32 100644 --- a/drivers/i2c/busses/i2c-xilinx_ps.c +++ b/drivers/i2c/busses/i2c-xilinx_ps.c @@ -40,7 +40,6 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_i2c.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -909,8 +908,6 @@ static int xi2cps_probe(struct platform_device *pdev) goto err_clk_dis; } - of_i2c_register_devices(&id->adap); - dev_info(&pdev->dev, "%d kHz mmio %08lx irq %d\n", id->i2c_clk/1000, (unsigned long)r_mem->start, id->irq);