Patchwork [GIT,00/19,v2] Renesas ARM based SoC pinmux updates for v3.12

login
register
mail settings
Submitter Simon Horman
Date July 24, 2013, 12:32 a.m.
Message ID <cover.1374625203.git.horms+renesas@verge.net.au>
Download mbox
Permalink /patch/261244/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.12

Comments

Simon Horman - July 24, 2013, 12:32 a.m.
Hi Olof, Hi Arnd,

please consider the following pinmux updates for v3.12.

Difference with v1 of this pull-request:
* Remove bogus i2c portions of the first patch of the series.
* Correct addressing mode used in dts of the first patch of the series.
* Removal of egg from face: wip

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 1469273960de45275f33276c7254456edcba9da2:

  ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree (2013-07-22 10:12:41 +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                     |  7 ++
 .../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, 437 insertions(+), 94 deletions(-)
Guennadi Liakhovetski - July 24, 2013, 6:11 a.m.
Hi Simon

On Wed, 24 Jul 2013, Simon Horman wrote:

> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> Add a pfc node to the r8a73a4 device tree.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> [g.liakhovetski+renesas@gmail.com use 2 nodes for address and size]

it's actually "cells," not "nodes."

Thanks
Guennadi

> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/arm/boot/dts/r8a73a4.dtsi | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
> index 4ff2019..b886afd 100644
> --- a/arch/arm/boot/dts/r8a73a4.dtsi
> +++ b/arch/arm/boot/dts/r8a73a4.dtsi
> @@ -85,4 +85,11 @@
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 69 4>;
>  	};
> +
> +	pfc: pfc@e6050000 {
> +		compatible = "renesas,pfc-r8a73a4";
> +		reg = <0 0xe6050000 0 0x9000>;
> +		gpio-controller;
> +		#gpio-cells = <2>;
> +	};
>  };
> -- 
> 1.8.2.1
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Simon Horman - July 24, 2013, 7:23 a.m.
On Wed, Jul 24, 2013 at 08:11:33AM +0200, Guennadi Liakhovetski wrote:
> Hi Simon
> 
> On Wed, 24 Jul 2013, Simon Horman wrote:
> 
> > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Add a pfc node to the r8a73a4 device tree.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > [g.liakhovetski+renesas@gmail.com use 2 nodes for address and size]
> 
> it's actually "cells," not "nodes."

Thanks. I'd like to leave the comment as is unless there
is a more compelling reason to re-base the pull-request.

> Thanks
> Guennadi
> 
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  arch/arm/boot/dts/r8a73a4.dtsi | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
> > index 4ff2019..b886afd 100644
> > --- a/arch/arm/boot/dts/r8a73a4.dtsi
> > +++ b/arch/arm/boot/dts/r8a73a4.dtsi
> > @@ -85,4 +85,11 @@
> >  		interrupt-parent = <&gic>;
> >  		interrupts = <0 69 4>;
> >  	};
> > +
> > +	pfc: pfc@e6050000 {
> > +		compatible = "renesas,pfc-r8a73a4";
> > +		reg = <0 0xe6050000 0 0x9000>;
> > +		gpio-controller;
> > +		#gpio-cells = <2>;
> > +	};
> >  };
> > -- 
> > 1.8.2.1
> > 
> 
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Simon Horman - July 24, 2013, 8:05 a.m.
On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following pinmux updates for v3.12.
> 
> Difference with v1 of this pull-request:
> * Remove bogus i2c portions of the first patch of the series.
> * Correct addressing mode used in dts of the first patch of the series.
> * Removal of egg from face: wip

This pull request has conflicts with renesas-soc-for-v3.12, which I also
sent a pull request for earlier today. I have a provided an example
resolution as part of the renesas-devel-20130724v2 tag in the renesas tree.

In words: take both sides.

The conflicting files are:
	arch/arm/boot/dts/r8a73a4.dtsi
	arch/arm/boot/dts/r8a7790.dtsi

> 
> 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 1469273960de45275f33276c7254456edcba9da2:
> 
>   ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree (2013-07-22 10:12:41 +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                     |  7 ++
>  .../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, 437 insertions(+), 94 deletions(-)
>
Olof Johansson - Aug. 14, 2013, 7:23 a.m.
On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following pinmux updates for v3.12.
> 
> Difference with v1 of this pull-request:
> * Remove bogus i2c portions of the first patch of the series.
> * Correct addressing mode used in dts of the first patch of the series.
> * Removal of egg from face: wip
> 
> 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

Pulled, but I noticed this. Can you please follow up with bindings revisit in
time for 3.12 final (i.e. if we need to take it after merge window that's
probably OK):

        pfc: pfc@e6060000 {                                                     
                compatible = "renesas,pfc-r8a7790";                             
                reg = <0 0xe6060000 0 0x250>;                                   
                #gpio-range-cells = <3>;                                        
        };                                                                      
                                                                                                               
        sdhi0: sdhi@ee100000 {                                                  
                compatible = "renesas,r8a7790-sdhi"; 


I.e. different ordering on the compatible values looks a bit uncoordinated.

I resolved the conflicts by inserting the entries alphabetically; most
DTS files are ordered by address instead of alphabetically, but I stuck
to the current norm per-file.


-Olof
Simon Horman - Aug. 18, 2013, 3:55 a.m.
On Wed, Aug 14, 2013 at 12:23:28AM -0700, Olof Johansson wrote:
> On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Arnd,
> > 
> > please consider the following pinmux updates for v3.12.
> > 
> > Difference with v1 of this pull-request:
> > * Remove bogus i2c portions of the first patch of the series.
> > * Correct addressing mode used in dts of the first patch of the series.
> > * Removal of egg from face: wip
> > 
> > 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
> 
> Pulled, but I noticed this. Can you please follow up with bindings revisit in
> time for 3.12 final (i.e. if we need to take it after merge window that's
> probably OK):
> 
>         pfc: pfc@e6060000 {                                                     
>                 compatible = "renesas,pfc-r8a7790";                             
>                 reg = <0 0xe6060000 0 0x250>;                                   
>                 #gpio-range-cells = <3>;                                        
>         };                                                                      
>                                                                                                                
>         sdhi0: sdhi@ee100000 {                                                  
>                 compatible = "renesas,r8a7790-sdhi"; 
> 
> 
> I.e. different ordering on the compatible values looks a bit uncoordinated.

Can I confirm that you are referring to the fact that
assume you mean that "-sdhi" follows "r8a7790" whereas "pfc-" precedes
"r8a7790"?

If so, I'll work with Laurent and Guennadi (both CCed, both on vacation),
and Magnus to resolve this inconsistency.

> I resolved the conflicts by inserting the entries alphabetically; most
> DTS files are ordered by address instead of alphabetically, but I stuck
> to the current norm per-file.

Thanks.
Olof Johansson - Aug. 22, 2013, 5:03 a.m.
On Sun, Aug 18, 2013 at 01:55:57PM +1000, Simon Horman wrote:
> On Wed, Aug 14, 2013 at 12:23:28AM -0700, Olof Johansson wrote:
> > On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> > > Hi Olof, Hi Arnd,
> > > 
> > > please consider the following pinmux updates for v3.12.
> > > 
> > > Difference with v1 of this pull-request:
> > > * Remove bogus i2c portions of the first patch of the series.
> > > * Correct addressing mode used in dts of the first patch of the series.
> > > * Removal of egg from face: wip
> > > 
> > > 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
> > 
> > Pulled, but I noticed this. Can you please follow up with bindings revisit in
> > time for 3.12 final (i.e. if we need to take it after merge window that's
> > probably OK):
> > 
> >         pfc: pfc@e6060000 {                                                     
> >                 compatible = "renesas,pfc-r8a7790";                             
> >                 reg = <0 0xe6060000 0 0x250>;                                   
> >                 #gpio-range-cells = <3>;                                        
> >         };                                                                      
> >                                                                                                                
> >         sdhi0: sdhi@ee100000 {                                                  
> >                 compatible = "renesas,r8a7790-sdhi"; 
> > 
> > 
> > I.e. different ordering on the compatible values looks a bit uncoordinated.
> 
> Can I confirm that you are referring to the fact that
> assume you mean that "-sdhi" follows "r8a7790" whereas "pfc-" precedes
> "r8a7790"?
> 
> If so, I'll work with Laurent and Guennadi (both CCed, both on vacation),
> and Magnus to resolve this inconsistency.

Yes, exactly. Some platforms use <vendor>,<soc>-<ip>, others
<vendor>,<ip>-<soc>. I don't care which way is used, but it would be good if
everybody used the same convention to make it easier for developers.

Preference for direction is something I leave up to the device tree maintainers
to declare. ;-)


-Olof
Simon Horman - Aug. 22, 2013, 5:32 a.m.
On Wed, Aug 21, 2013 at 10:03:15PM -0700, Olof Johansson wrote:
> On Sun, Aug 18, 2013 at 01:55:57PM +1000, Simon Horman wrote:
> > On Wed, Aug 14, 2013 at 12:23:28AM -0700, Olof Johansson wrote:
> > > On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> > > > Hi Olof, Hi Arnd,
> > > > 
> > > > please consider the following pinmux updates for v3.12.
> > > > 
> > > > Difference with v1 of this pull-request:
> > > > * Remove bogus i2c portions of the first patch of the series.
> > > > * Correct addressing mode used in dts of the first patch of the series.
> > > > * Removal of egg from face: wip
> > > > 
> > > > 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
> > > 
> > > Pulled, but I noticed this. Can you please follow up with bindings revisit in
> > > time for 3.12 final (i.e. if we need to take it after merge window that's
> > > probably OK):
> > > 
> > >         pfc: pfc@e6060000 {                                                     
> > >                 compatible = "renesas,pfc-r8a7790";                             
> > >                 reg = <0 0xe6060000 0 0x250>;                                   
> > >                 #gpio-range-cells = <3>;                                        
> > >         };                                                                      
> > >                                                                                                                
> > >         sdhi0: sdhi@ee100000 {                                                  
> > >                 compatible = "renesas,r8a7790-sdhi"; 
> > > 
> > > 
> > > I.e. different ordering on the compatible values looks a bit uncoordinated.
> > 
> > Can I confirm that you are referring to the fact that
> > assume you mean that "-sdhi" follows "r8a7790" whereas "pfc-" precedes
> > "r8a7790"?
> > 
> > If so, I'll work with Laurent and Guennadi (both CCed, both on vacation),
> > and Magnus to resolve this inconsistency.
> 
> Yes, exactly. Some platforms use <vendor>,<soc>-<ip>, others
> <vendor>,<ip>-<soc>. I don't care which way is used, but it would be good if
> everybody used the same convention to make it easier for developers.
> 
> Preference for direction is something I leave up to the device tree maintainers
> to declare. ;-)

Thanks, got it. I'll get this sorted out.