Message ID | cover.1374208262.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
Hello. On 19-07-2013 8:36, Simon Horman wrote: > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Add a pfc node to the r8a73a4 device tree. This patch looks strange... > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/r8a73a4.dtsi | 88 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi > index 4ff2019..f1a35d5 100644 > --- a/arch/arm/boot/dts/r8a73a4.dtsi > +++ b/arch/arm/boot/dts/r8a73a4.dtsi > @@ -85,4 +85,92 @@ > interrupt-parent = <&gic>; > interrupts = <0 69 4>; > }; > + > + i2c0: i2c@e6500000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,rmobile-iic"; > + reg = <0 0xe6500000 0 0x428>; > + interrupt-parent = <&gic>; > + interrupts = <0 174 0x4>; > + }; [...] > + i2c8: i2c@e6570000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,rmobile-iic"; > + reg = <0 0xe6570000 0 0x428>; > + interrupt-parent = <&gic>; > + interrupts = <0 173 0x4>; > + }; > + Hm, this also adds a bunch of I2C controllers which is not mentioned in the changelog at all. WBR, Sergei
On Friday 19 July 2013 16:32:42 Sergei Shtylyov wrote: > Hello. > > On 19-07-2013 8:36, Simon Horman wrote: > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > Add a pfc node to the r8a73a4 device tree. > > This patch looks strange... > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > > > arch/arm/boot/dts/r8a73a4.dtsi | 88 > > ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 > > insertions(+) > > > > diff --git a/arch/arm/boot/dts/r8a73a4.dtsi > > b/arch/arm/boot/dts/r8a73a4.dtsi index 4ff2019..f1a35d5 100644 > > --- a/arch/arm/boot/dts/r8a73a4.dtsi > > +++ b/arch/arm/boot/dts/r8a73a4.dtsi > > @@ -85,4 +85,92 @@ > > > > interrupt-parent = <&gic>; > > interrupts = <0 69 4>; > > > > }; > > > > + > > + i2c0: i2c@e6500000 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + compatible = "renesas,rmobile-iic"; > > + reg = <0 0xe6500000 0 0x428>; > > + interrupt-parent = <&gic>; > > + interrupts = <0 174 0x4>; > > + }; > > [...] > > > + i2c8: i2c@e6570000 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + compatible = "renesas,rmobile-iic"; > > + reg = <0 0xe6570000 0 0x428>; > > + interrupt-parent = <&gic>; > > + interrupts = <0 173 0x4>; > > + }; > > + > > Hm, this also adds a bunch of I2C controllers which is not mentioned in the > changelog at all. Rebase error ? They were not included in my original patch.
On Fri, Jul 19, 2013 at 02:42:14PM +0200, Laurent Pinchart wrote: > On Friday 19 July 2013 16:32:42 Sergei Shtylyov wrote: > > Hello. > > > > On 19-07-2013 8:36, Simon Horman wrote: > > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > > > Add a pfc node to the r8a73a4 device tree. > > > > This patch looks strange... > > > > > Signed-off-by: Laurent Pinchart > > > <laurent.pinchart+renesas@ideasonboard.com> > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > --- > > > > > > arch/arm/boot/dts/r8a73a4.dtsi | 88 > > > ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 > > > insertions(+) > > > > > > diff --git a/arch/arm/boot/dts/r8a73a4.dtsi > > > b/arch/arm/boot/dts/r8a73a4.dtsi index 4ff2019..f1a35d5 100644 > > > --- a/arch/arm/boot/dts/r8a73a4.dtsi > > > +++ b/arch/arm/boot/dts/r8a73a4.dtsi > > > @@ -85,4 +85,92 @@ > > > > > > interrupt-parent = <&gic>; > > > interrupts = <0 69 4>; > > > > > > }; > > > > > > + > > > + i2c0: i2c@e6500000 { > > > + #address-cells = <1>; > > > + #size-cells = <0>; > > > + compatible = "renesas,rmobile-iic"; > > > + reg = <0 0xe6500000 0 0x428>; > > > + interrupt-parent = <&gic>; > > > + interrupts = <0 174 0x4>; > > > + }; > > > > [...] > > > > > + i2c8: i2c@e6570000 { > > > + #address-cells = <1>; > > > + #size-cells = <0>; > > > + compatible = "renesas,rmobile-iic"; > > > + reg = <0 0xe6570000 0 0x428>; > > > + interrupt-parent = <&gic>; > > > + interrupts = <0 173 0x4>; > > > + }; > > > + > > > > Hm, this also adds a bunch of I2C controllers which is not mentioned in the > > changelog at all. > > Rebase error ? They were not included in my original patch. Sorry, I will correct that and repost.
Hi, please hold off on this. It appears that there is a problem with one of the patches. On Fri, Jul 19, 2013 at 01:36:29PM +0900, Simon Horman wrote: > The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: > > Linux 3.11-rc1 (2013-07-14 15:18:27 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.12 > > for you to fetch changes up to 838a7070ce8bfff11e19ed434edd9a4423b478bd: > > ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree (2013-07-16 12:55:04 +0900) > > ---------------------------------------------------------------- > Renesas ARM based SoC pinmux updates for v3.12 > > SH Mobile pinctrl DT support > > ---------------------------------------------------------------- > Laurent Pinchart (19): > ARM: shmobile: r8a73a4: Add pin control device to device tree > ARM: shmobile: r8a7740: Add pin control device to device tree > ARM: shmobile: r8a7778: Add pin control device to device tree > ARM: shmobile: r8a7778: Add GPIO controller devices to device tree > ARM: shmobile: r8a7779: Add pin control device to device tree > ARM: shmobile: r8a7779: Add GPIO controller devices to device tree > ARM: shmobile: r8a7790: Add pin control device to device tree > ARM: shmobile: r8a7790: Add GPIO controller devices to device tree > ARM: shmobile: sh7372: Add pin control device to device tree > ARM: shmobile: sh73a0: Add pin control device to device tree > ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree > ARM: shmobile: armadillo-reference: Add st1232 pin mappings > ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT > ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree > ARM: shmobile: marzen-reference: Move pinctrl mappings to device tree > ARM: shmobile: marzen-reference: Add LED2-LED4 to the device tree > ARM: shmobile: kzm9g-reference: Move pinctrl mappings to device tree > ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT > ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree > > arch/arm/boot/dts/r8a73a4.dtsi | 88 +++++++++++++++++++ > .../boot/dts/r8a7740-armadillo800eva-reference.dts | 34 ++++++++ > arch/arm/boot/dts/r8a7740.dtsi | 8 ++ > arch/arm/boot/dts/r8a7778.dtsi | 66 ++++++++++++++ > arch/arm/boot/dts/r8a7779-marzen-reference.dts | 49 +++++++++++ > arch/arm/boot/dts/r8a7779.dtsi | 90 ++++++++++++++++++++ > arch/arm/boot/dts/r8a7790.dtsi | 78 +++++++++++++++++ > arch/arm/boot/dts/sh7372.dtsi | 8 ++ > arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 90 +++++++++++++++++++- > arch/arm/boot/dts/sh73a0.dtsi | 8 ++ > .../board-armadillo800eva-reference.c | 18 +--- > arch/arm/mach-shmobile/board-kzm9g-reference.c | 47 ---------- > arch/arm/mach-shmobile/board-marzen-reference.c | 28 ------ > 13 files changed, 518 insertions(+), 94 deletions(-) >