SUPERH platform development
 help / color / mirror / Atom feed
* [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
@ 2013-03-13 22:59 Laurent Pinchart
  2013-03-14  9:20 ` Simon Horman
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-13 22:59 UTC (permalink / raw)
  To: linux-sh

Hello,

The fourth version of the functions patch set defines pinctrl groups and
functions for even more devices on sh7372, sh73a0, r8a7740 and r8a7779.

Patches 01/88 to 21/88 define the groups and functions, patches 22/88 to 49/88
replace function GPIOs by proper pinctrl mappings in board files, patches 50/88
to 68/88 remove the corresponding function GPIOs from the PFC driver and
patches 69/88 to 88/88 remove them from platform headers.

The major difference compared to v3, beside adding more groups and functions,
is the bias pinconf support implementation for sh73a0 (02/88). I would
appreciate if that patch could be carefully reviewed.

The patches are based on top of "[PATCH 00/25] sh-pfc: pinconf implementation"
and are available from my git tree at

        git://linuxtv.org/pinchartl/fbdev.git pinmux/3.9/functions

With this patch set the AG5 EVM, Kota2 and Marzen boards are fully ported from
function GPIOs to the pinctrl API, and only one last function GPIO need to be
removed for the KZM9G board. The next step will be to follow the same path for
all other boards. Volunteers are welcome.

I consider this set as v3.10 material. As with the previous PFC patch sets
there are dependencies between board code changes and sh-pfc changes, so it
would be easier to merge everything through the ARM tree.

Simon, could you please replace the PFC patches in your tree with my pinmux/3.9
pinctrl, pinconf and functions branches ? I'm sorry for the inconvienence
caused by the rebase. I plan to now build incrementally on top of the functions
branch.

Guennadi Liakhovetski (3):
  sh-pfc: sh7372: Add SDHCI and MMCIF pin groups and functions
  sh-pfc: sh73a0: Add SDHI and MMCIF pin groups and functions
  sh-pfc: r8a7740: Add SDHI and MMCIF pin groups and functions

Laurent Pinchart (85):
  sh-pfc: sh73a0: Add bias (pull-up/down) pinconf support
  sh-pfc: sh73a0: Add LCD and LCD2 pin groups and functions
  sh-pfc: sh73a0: Add SCIFA and SCIFB pin groups and functions
  sh-pfc: sh73a0: Add I2C2 and I2C3 pin groups and functions
  sh-pfc: sh73a0: Add FSI pin groups and functions
  sh-pfc: sh73a0: Add KEYSC pin groups and functions
  sh-pfc: sh73a0: Add BSC pin groups and functions
  sh-pfc: sh73a0: Add USB pin groups and functions
  sh-pfc: sh73a0: Add IrDA pin groups and functions
  sh-pfc: r8a7740: Add LCDC0 and LCDC1 pin groups and functions
  sh-pfc: r8a7779: Add DU pin groups and functions
  sh-pfc: r8a7779: Add SDHI and MMCIF pin groups and functions
  sh-pfc: r8a7779: Add SCIF pin groups and functions
  sh-pfc: r8a7779: Add HSPI pin groups and functions
  sh-pfc: r8a7779: Add USB0 and USB1 PENC pinmux support
  sh-pfc: r8a7779: Add USB pin groups and functions
  sh-pfc: r8a7779: Add LBSC pin groups and functions
  sh-pfc: r8a7779: Add INTC pin groups and functions
  ARM: shmobile: ag5evm: Register pinctrl mappings for SCIF
  ARM: shmobile: ag5evm: Register pinctrl mappings for I2C
  ARM: shmobile: ag5evm: Register pinctrl mappings for FSI
  ARM: shmobile: ag5evm: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: ag5evm: Register pinctrl mappings for KEYSC
  ARM: shmobile: ag5evm: Register pinctrl mappings for IrDA
  ARM: shmobile: ap4evb: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: armadillo800eva: Register pinctrl mappings for LCDC0
  ARM: shmobile: armadillo800eva: Register pinctrl mappings for SDHI and
    MMCIF
  ARM: shmobile: bonito: Register pinctrl mappings for LCDC0
  ARM: shmobile: kota2: Register pinctrl mappings for SCIF
  ARM: shmobile: kota2: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: kota2: Register pinctrl mappings for KEYSC
  ARM: shmobile: kota2: Register pinctrl mappings for BSC
  ARM: shmobile: kzm9g: Register pinctrl mappings for LCD
  ARM: shmobile: kzm9g: Register pinctrl mappings for SCIF
  ARM: shmobile: kzm9g: Register pinctrl mappings for I2C
  ARM: shmobile: kzm9g: Register pinctrl mappings for FSI
  ARM: shmobile: kzm9g: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: kzm9g: Register pinctrl mappings for BSC
  ARM: shmobile: kzm9g: Register pinctrl mappings for USB
  ARM: shmobile: mackerel: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: marzen: Register pinctrl mappings for SDHI and MMCIF
  ARM: shmobile: marzen: Register pinctrl mappings for SCIF
  ARM: shmobile: marzen: Register pinctrl mappings for HSPI
  ARM: shmobile: marzen: Register pinctrl mappings for USB
  ARM: shmobile: marzen: Register pinctrl mappings for LBSC
  ARM: shmobile: marzen: Register pinctrl mappings for INTC
  sh-pfc: sh7372: Remove SDHI and MMCIF function GPIOS
  sh-pfc: sh73a0: Remove LCD and LCD2 function GPIOS
  sh-pfc: sh73a0: Remove SCIFA and SCIFB function GPIOS
  sh-pfc: sh73a0: Remove I2C function GPIOS
  sh-pfc: sh73a0: Remove FSI function GPIOS
  sh-pfc: sh73a0: Remove pull-up function GPIOS
  sh-pfc: sh73a0: Remove KEYSC function GPIOS
  sh-pfc: sh73a0: Remove BSC function GPIOS
  sh-pfc: sh73a0: Remove USB function GPIOS
  sh-pfc: sh73a0: Remove IrDA function GPIOS
  sh-pfc: r8a7740: Remove LCD0 and LCD1 function GPIOS
  sh-pfc: r8a7740: Remove SDHI and MMCIF function GPIOS
  sh-pfc: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
  sh-pfc: r8a7779: Remove SDHI and MMCIF function GPIOS
  sh-pfc: r8a7779: Remove SCIF function GPIOS
  sh-pfc: r8a7779: Remove HSPI function GPIOS
  sh-pfc: r8a7779: Remove USB function GPIOS
  sh-pfc: r8a7779: Remove LBSC function GPIOS
  sh-pfc: r8a7779: Remove INTC function GPIOS
  ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs
  ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs
  ARM: shmobile: sh73a0: Remove I2C function GPIOs
  ARM: shmobile: sh73a0: Remove FSI function GPIOs
  ARM: shmobile: sh73a0: Remove pull-up function GPIOS
  ARM: shmobile: sh73a0: Remove KEYSC function GPIOs
  ARM: shmobile: sh73a0: Remove BSC function GPIOs
  ARM: shmobile: sh73a0: Remove USB function GPIOs
  ARM: shmobile: sh73a0: Remove IrDA function GPIOs
  ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs
  ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
  ARM: shmobile: r8a7779: Remove DU function GPIOs
  ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7779: Remove SCIF function GPIOs
  ARM: shmobile: r8a7779: Remove HSPI function GPIOs
  ARM: shmobile: r8a7779: Remove USB function GPIOs
  ARM: shmobile: r8a7779: Remove LBSC function GPIOs
  ARM: shmobile: r8a7779: Remove INTC function GPIOs

 arch/arm/mach-shmobile/board-ag5evm.c          |  146 +-
 arch/arm/mach-shmobile/board-ap4evb.c          |   55 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c |  100 +-
 arch/arm/mach-shmobile/board-bonito.c          |   44 +-
 arch/arm/mach-shmobile/board-kota2.c           |  166 +-
 arch/arm/mach-shmobile/board-kzm9g.c           |  138 +-
 arch/arm/mach-shmobile/board-mackerel.c        |   68 +-
 arch/arm/mach-shmobile/board-marzen.c          |   75 +-
 arch/arm/mach-shmobile/include/mach/r8a7740.h  |   74 -
 arch/arm/mach-shmobile/include/mach/r8a7779.h  |  324 ++-
 arch/arm/mach-shmobile/include/mach/sh7372.h   |   29 -
 arch/arm/mach-shmobile/include/mach/sh73a0.h   |  363 ++--
 drivers/pinctrl/sh-pfc/pfc-r8a7740.c           |  596 +++++-
 drivers/pinctrl/sh-pfc/pfc-r8a7779.c           | 1589 +++++++++++++--
 drivers/pinctrl/sh-pfc/pfc-sh7372.c            |  231 ++-
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c            | 2545 +++++++++++++++++-------
 16 files changed, 4646 insertions(+), 1897 deletions(-)

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
@ 2013-03-14  9:20 ` Simon Horman
  2013-03-14  9:46 ` Simon Horman
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-03-14  9:20 UTC (permalink / raw)
  To: linux-sh

On Wed, Mar 13, 2013 at 11:59:05PM +0100, Laurent Pinchart wrote:
> Hello,
> 
> The fourth version of the functions patch set defines pinctrl groups and
> functions for even more devices on sh7372, sh73a0, r8a7740 and r8a7779.
> 
> Patches 01/88 to 21/88 define the groups and functions, patches 22/88 to 49/88
> replace function GPIOs by proper pinctrl mappings in board files, patches 50/88
> to 68/88 remove the corresponding function GPIOs from the PFC driver and
> patches 69/88 to 88/88 remove them from platform headers.
> 
> The major difference compared to v3, beside adding more groups and functions,
> is the bias pinconf support implementation for sh73a0 (02/88). I would
> appreciate if that patch could be carefully reviewed.
> 
> The patches are based on top of "[PATCH 00/25] sh-pfc: pinconf implementation"
> and are available from my git tree at
> 
>         git://linuxtv.org/pinchartl/fbdev.git pinmux/3.9/functions
> 
> With this patch set the AG5 EVM, Kota2 and Marzen boards are fully ported from
> function GPIOs to the pinctrl API, and only one last function GPIO need to be
> removed for the KZM9G board. The next step will be to follow the same path for
> all other boards. Volunteers are welcome.
> 
> I consider this set as v3.10 material. As with the previous PFC patch sets
> there are dependencies between board code changes and sh-pfc changes, so it
> would be easier to merge everything through the ARM tree.
> 
> Simon, could you please replace the PFC patches in your tree with my pinmux/3.9
> pinctrl, pinconf and functions branches ? I'm sorry for the inconvienence
> caused by the rebase. I plan to now build incrementally on top of the functions

Sure, I will rebase and push the result to the renesas tree on kernel.org.
I will also include this and the other branches I announced yesterday in
a new next branch which will appear in linux-next in the not to distant
future. From there it should be possible to request branches to be pulled
into arm-soc and thus enqueued one step closer to v3.10.

> branch.
> 
> Guennadi Liakhovetski (3):
>   sh-pfc: sh7372: Add SDHCI and MMCIF pin groups and functions
>   sh-pfc: sh73a0: Add SDHI and MMCIF pin groups and functions
>   sh-pfc: r8a7740: Add SDHI and MMCIF pin groups and functions
> 
> Laurent Pinchart (85):
>   sh-pfc: sh73a0: Add bias (pull-up/down) pinconf support
>   sh-pfc: sh73a0: Add LCD and LCD2 pin groups and functions
>   sh-pfc: sh73a0: Add SCIFA and SCIFB pin groups and functions
>   sh-pfc: sh73a0: Add I2C2 and I2C3 pin groups and functions
>   sh-pfc: sh73a0: Add FSI pin groups and functions
>   sh-pfc: sh73a0: Add KEYSC pin groups and functions
>   sh-pfc: sh73a0: Add BSC pin groups and functions
>   sh-pfc: sh73a0: Add USB pin groups and functions
>   sh-pfc: sh73a0: Add IrDA pin groups and functions
>   sh-pfc: r8a7740: Add LCDC0 and LCDC1 pin groups and functions
>   sh-pfc: r8a7779: Add DU pin groups and functions
>   sh-pfc: r8a7779: Add SDHI and MMCIF pin groups and functions
>   sh-pfc: r8a7779: Add SCIF pin groups and functions
>   sh-pfc: r8a7779: Add HSPI pin groups and functions
>   sh-pfc: r8a7779: Add USB0 and USB1 PENC pinmux support
>   sh-pfc: r8a7779: Add USB pin groups and functions
>   sh-pfc: r8a7779: Add LBSC pin groups and functions
>   sh-pfc: r8a7779: Add INTC pin groups and functions
>   ARM: shmobile: ag5evm: Register pinctrl mappings for SCIF
>   ARM: shmobile: ag5evm: Register pinctrl mappings for I2C
>   ARM: shmobile: ag5evm: Register pinctrl mappings for FSI
>   ARM: shmobile: ag5evm: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: ag5evm: Register pinctrl mappings for KEYSC
>   ARM: shmobile: ag5evm: Register pinctrl mappings for IrDA
>   ARM: shmobile: ap4evb: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: armadillo800eva: Register pinctrl mappings for LCDC0
>   ARM: shmobile: armadillo800eva: Register pinctrl mappings for SDHI and
>     MMCIF
>   ARM: shmobile: bonito: Register pinctrl mappings for LCDC0
>   ARM: shmobile: kota2: Register pinctrl mappings for SCIF
>   ARM: shmobile: kota2: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: kota2: Register pinctrl mappings for KEYSC
>   ARM: shmobile: kota2: Register pinctrl mappings for BSC
>   ARM: shmobile: kzm9g: Register pinctrl mappings for LCD
>   ARM: shmobile: kzm9g: Register pinctrl mappings for SCIF
>   ARM: shmobile: kzm9g: Register pinctrl mappings for I2C
>   ARM: shmobile: kzm9g: Register pinctrl mappings for FSI
>   ARM: shmobile: kzm9g: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: kzm9g: Register pinctrl mappings for BSC
>   ARM: shmobile: kzm9g: Register pinctrl mappings for USB
>   ARM: shmobile: mackerel: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: marzen: Register pinctrl mappings for SDHI and MMCIF
>   ARM: shmobile: marzen: Register pinctrl mappings for SCIF
>   ARM: shmobile: marzen: Register pinctrl mappings for HSPI
>   ARM: shmobile: marzen: Register pinctrl mappings for USB
>   ARM: shmobile: marzen: Register pinctrl mappings for LBSC
>   ARM: shmobile: marzen: Register pinctrl mappings for INTC
>   sh-pfc: sh7372: Remove SDHI and MMCIF function GPIOS
>   sh-pfc: sh73a0: Remove LCD and LCD2 function GPIOS
>   sh-pfc: sh73a0: Remove SCIFA and SCIFB function GPIOS
>   sh-pfc: sh73a0: Remove I2C function GPIOS
>   sh-pfc: sh73a0: Remove FSI function GPIOS
>   sh-pfc: sh73a0: Remove pull-up function GPIOS
>   sh-pfc: sh73a0: Remove KEYSC function GPIOS
>   sh-pfc: sh73a0: Remove BSC function GPIOS
>   sh-pfc: sh73a0: Remove USB function GPIOS
>   sh-pfc: sh73a0: Remove IrDA function GPIOS
>   sh-pfc: r8a7740: Remove LCD0 and LCD1 function GPIOS
>   sh-pfc: r8a7740: Remove SDHI and MMCIF function GPIOS
>   sh-pfc: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
>   sh-pfc: r8a7779: Remove SDHI and MMCIF function GPIOS
>   sh-pfc: r8a7779: Remove SCIF function GPIOS
>   sh-pfc: r8a7779: Remove HSPI function GPIOS
>   sh-pfc: r8a7779: Remove USB function GPIOS
>   sh-pfc: r8a7779: Remove LBSC function GPIOS
>   sh-pfc: r8a7779: Remove INTC function GPIOS
>   ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs
>   ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs
>   ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs
>   ARM: shmobile: sh73a0: Remove I2C function GPIOs
>   ARM: shmobile: sh73a0: Remove FSI function GPIOs
>   ARM: shmobile: sh73a0: Remove pull-up function GPIOS
>   ARM: shmobile: sh73a0: Remove KEYSC function GPIOs
>   ARM: shmobile: sh73a0: Remove BSC function GPIOs
>   ARM: shmobile: sh73a0: Remove USB function GPIOs
>   ARM: shmobile: sh73a0: Remove IrDA function GPIOs
>   ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs
>   ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs
>   ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
>   ARM: shmobile: r8a7779: Remove DU function GPIOs
>   ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs
>   ARM: shmobile: r8a7779: Remove SCIF function GPIOs
>   ARM: shmobile: r8a7779: Remove HSPI function GPIOs
>   ARM: shmobile: r8a7779: Remove USB function GPIOs
>   ARM: shmobile: r8a7779: Remove LBSC function GPIOs
>   ARM: shmobile: r8a7779: Remove INTC function GPIOs
> 
>  arch/arm/mach-shmobile/board-ag5evm.c          |  146 +-
>  arch/arm/mach-shmobile/board-ap4evb.c          |   55 +-
>  arch/arm/mach-shmobile/board-armadillo800eva.c |  100 +-
>  arch/arm/mach-shmobile/board-bonito.c          |   44 +-
>  arch/arm/mach-shmobile/board-kota2.c           |  166 +-
>  arch/arm/mach-shmobile/board-kzm9g.c           |  138 +-
>  arch/arm/mach-shmobile/board-mackerel.c        |   68 +-
>  arch/arm/mach-shmobile/board-marzen.c          |   75 +-
>  arch/arm/mach-shmobile/include/mach/r8a7740.h  |   74 -
>  arch/arm/mach-shmobile/include/mach/r8a7779.h  |  324 ++-
>  arch/arm/mach-shmobile/include/mach/sh7372.h   |   29 -
>  arch/arm/mach-shmobile/include/mach/sh73a0.h   |  363 ++--
>  drivers/pinctrl/sh-pfc/pfc-r8a7740.c           |  596 +++++-
>  drivers/pinctrl/sh-pfc/pfc-r8a7779.c           | 1589 +++++++++++++--
>  drivers/pinctrl/sh-pfc/pfc-sh7372.c            |  231 ++-
>  drivers/pinctrl/sh-pfc/pfc-sh73a0.c            | 2545 +++++++++++++++++-------
>  16 files changed, 4646 insertions(+), 1897 deletions(-)
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
  2013-03-14  9:20 ` Simon Horman
@ 2013-03-14  9:46 ` Simon Horman
  2013-03-14 12:54 ` Laurent Pinchart
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-03-14  9:46 UTC (permalink / raw)
  To: linux-sh

On Thu, Mar 14, 2013 at 10:20:00AM +0100, Simon Horman wrote:
> On Wed, Mar 13, 2013 at 11:59:05PM +0100, Laurent Pinchart wrote:
> > Hello,
> > 
> > The fourth version of the functions patch set defines pinctrl groups and
> > functions for even more devices on sh7372, sh73a0, r8a7740 and r8a7779.
> > 
> > Patches 01/88 to 21/88 define the groups and functions, patches 22/88 to 49/88
> > replace function GPIOs by proper pinctrl mappings in board files, patches 50/88
> > to 68/88 remove the corresponding function GPIOs from the PFC driver and
> > patches 69/88 to 88/88 remove them from platform headers.
> > 
> > The major difference compared to v3, beside adding more groups and functions,
> > is the bias pinconf support implementation for sh73a0 (02/88). I would
> > appreciate if that patch could be carefully reviewed.
> > 
> > The patches are based on top of "[PATCH 00/25] sh-pfc: pinconf implementation"
> > and are available from my git tree at
> > 
> >         git://linuxtv.org/pinchartl/fbdev.git pinmux/3.9/functions
> > 
> > With this patch set the AG5 EVM, Kota2 and Marzen boards are fully ported from
> > function GPIOs to the pinctrl API, and only one last function GPIO need to be
> > removed for the KZM9G board. The next step will be to follow the same path for
> > all other boards. Volunteers are welcome.
> > 
> > I consider this set as v3.10 material. As with the previous PFC patch sets
> > there are dependencies between board code changes and sh-pfc changes, so it
> > would be easier to merge everything through the ARM tree.
> > 
> > Simon, could you please replace the PFC patches in your tree with my pinmux/3.9
> > pinctrl, pinconf and functions branches ? I'm sorry for the inconvienence
> > caused by the rebase. I plan to now build incrementally on top of the functions
> 
> Sure, I will rebase and push the result to the renesas tree on kernel.org.
> I will also include this and the other branches I announced yesterday in
> a new next branch which will appear in linux-next in the not to distant
> future. From there it should be possible to request branches to be pulled
> into arm-soc and thus enqueued one step closer to v3.10.

I am seeing (a hopefully minor) problem which is using the defconfigs for
the armadillo800eva I see:

fbdev-laurent

I believe this applies at least to all the other arm-based boards too.

drivers/built-in.o:(.rodata+0xa4): undefined reference to `pinconf_generic_dump_config'

It seems like some Kconfig updates might be in order.


> > branch.
> > 
> > Guennadi Liakhovetski (3):
> >   sh-pfc: sh7372: Add SDHCI and MMCIF pin groups and functions
> >   sh-pfc: sh73a0: Add SDHI and MMCIF pin groups and functions
> >   sh-pfc: r8a7740: Add SDHI and MMCIF pin groups and functions
> > 
> > Laurent Pinchart (85):
> >   sh-pfc: sh73a0: Add bias (pull-up/down) pinconf support
> >   sh-pfc: sh73a0: Add LCD and LCD2 pin groups and functions
> >   sh-pfc: sh73a0: Add SCIFA and SCIFB pin groups and functions
> >   sh-pfc: sh73a0: Add I2C2 and I2C3 pin groups and functions
> >   sh-pfc: sh73a0: Add FSI pin groups and functions
> >   sh-pfc: sh73a0: Add KEYSC pin groups and functions
> >   sh-pfc: sh73a0: Add BSC pin groups and functions
> >   sh-pfc: sh73a0: Add USB pin groups and functions
> >   sh-pfc: sh73a0: Add IrDA pin groups and functions
> >   sh-pfc: r8a7740: Add LCDC0 and LCDC1 pin groups and functions
> >   sh-pfc: r8a7779: Add DU pin groups and functions
> >   sh-pfc: r8a7779: Add SDHI and MMCIF pin groups and functions
> >   sh-pfc: r8a7779: Add SCIF pin groups and functions
> >   sh-pfc: r8a7779: Add HSPI pin groups and functions
> >   sh-pfc: r8a7779: Add USB0 and USB1 PENC pinmux support
> >   sh-pfc: r8a7779: Add USB pin groups and functions
> >   sh-pfc: r8a7779: Add LBSC pin groups and functions
> >   sh-pfc: r8a7779: Add INTC pin groups and functions
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for SCIF
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for I2C
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for FSI
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for KEYSC
> >   ARM: shmobile: ag5evm: Register pinctrl mappings for IrDA
> >   ARM: shmobile: ap4evb: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: armadillo800eva: Register pinctrl mappings for LCDC0
> >   ARM: shmobile: armadillo800eva: Register pinctrl mappings for SDHI and
> >     MMCIF
> >   ARM: shmobile: bonito: Register pinctrl mappings for LCDC0
> >   ARM: shmobile: kota2: Register pinctrl mappings for SCIF
> >   ARM: shmobile: kota2: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: kota2: Register pinctrl mappings for KEYSC
> >   ARM: shmobile: kota2: Register pinctrl mappings for BSC
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for LCD
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for SCIF
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for I2C
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for FSI
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for BSC
> >   ARM: shmobile: kzm9g: Register pinctrl mappings for USB
> >   ARM: shmobile: mackerel: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: marzen: Register pinctrl mappings for SDHI and MMCIF
> >   ARM: shmobile: marzen: Register pinctrl mappings for SCIF
> >   ARM: shmobile: marzen: Register pinctrl mappings for HSPI
> >   ARM: shmobile: marzen: Register pinctrl mappings for USB
> >   ARM: shmobile: marzen: Register pinctrl mappings for LBSC
> >   ARM: shmobile: marzen: Register pinctrl mappings for INTC
> >   sh-pfc: sh7372: Remove SDHI and MMCIF function GPIOS
> >   sh-pfc: sh73a0: Remove LCD and LCD2 function GPIOS
> >   sh-pfc: sh73a0: Remove SCIFA and SCIFB function GPIOS
> >   sh-pfc: sh73a0: Remove I2C function GPIOS
> >   sh-pfc: sh73a0: Remove FSI function GPIOS
> >   sh-pfc: sh73a0: Remove pull-up function GPIOS
> >   sh-pfc: sh73a0: Remove KEYSC function GPIOS
> >   sh-pfc: sh73a0: Remove BSC function GPIOS
> >   sh-pfc: sh73a0: Remove USB function GPIOS
> >   sh-pfc: sh73a0: Remove IrDA function GPIOS
> >   sh-pfc: r8a7740: Remove LCD0 and LCD1 function GPIOS
> >   sh-pfc: r8a7740: Remove SDHI and MMCIF function GPIOS
> >   sh-pfc: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
> >   sh-pfc: r8a7779: Remove SDHI and MMCIF function GPIOS
> >   sh-pfc: r8a7779: Remove SCIF function GPIOS
> >   sh-pfc: r8a7779: Remove HSPI function GPIOS
> >   sh-pfc: r8a7779: Remove USB function GPIOS
> >   sh-pfc: r8a7779: Remove LBSC function GPIOS
> >   sh-pfc: r8a7779: Remove INTC function GPIOS
> >   ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs
> >   ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs
> >   ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs
> >   ARM: shmobile: sh73a0: Remove I2C function GPIOs
> >   ARM: shmobile: sh73a0: Remove FSI function GPIOs
> >   ARM: shmobile: sh73a0: Remove pull-up function GPIOS
> >   ARM: shmobile: sh73a0: Remove KEYSC function GPIOs
> >   ARM: shmobile: sh73a0: Remove BSC function GPIOs
> >   ARM: shmobile: sh73a0: Remove USB function GPIOs
> >   ARM: shmobile: sh73a0: Remove IrDA function GPIOs
> >   ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs
> >   ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs
> >   ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
> >   ARM: shmobile: r8a7779: Remove DU function GPIOs
> >   ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs
> >   ARM: shmobile: r8a7779: Remove SCIF function GPIOs
> >   ARM: shmobile: r8a7779: Remove HSPI function GPIOs
> >   ARM: shmobile: r8a7779: Remove USB function GPIOs
> >   ARM: shmobile: r8a7779: Remove LBSC function GPIOs
> >   ARM: shmobile: r8a7779: Remove INTC function GPIOs
> > 
> >  arch/arm/mach-shmobile/board-ag5evm.c          |  146 +-
> >  arch/arm/mach-shmobile/board-ap4evb.c          |   55 +-
> >  arch/arm/mach-shmobile/board-armadillo800eva.c |  100 +-
> >  arch/arm/mach-shmobile/board-bonito.c          |   44 +-
> >  arch/arm/mach-shmobile/board-kota2.c           |  166 +-
> >  arch/arm/mach-shmobile/board-kzm9g.c           |  138 +-
> >  arch/arm/mach-shmobile/board-mackerel.c        |   68 +-
> >  arch/arm/mach-shmobile/board-marzen.c          |   75 +-
> >  arch/arm/mach-shmobile/include/mach/r8a7740.h  |   74 -
> >  arch/arm/mach-shmobile/include/mach/r8a7779.h  |  324 ++-
> >  arch/arm/mach-shmobile/include/mach/sh7372.h   |   29 -
> >  arch/arm/mach-shmobile/include/mach/sh73a0.h   |  363 ++--
> >  drivers/pinctrl/sh-pfc/pfc-r8a7740.c           |  596 +++++-
> >  drivers/pinctrl/sh-pfc/pfc-r8a7779.c           | 1589 +++++++++++++--
> >  drivers/pinctrl/sh-pfc/pfc-sh7372.c            |  231 ++-
> >  drivers/pinctrl/sh-pfc/pfc-sh73a0.c            | 2545 +++++++++++++++++-------
> >  16 files changed, 4646 insertions(+), 1897 deletions(-)
> > 
> > -- 
> > Regards,
> > 
> > Laurent Pinchart
> > 
> --
> 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
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
  2013-03-14  9:20 ` Simon Horman
  2013-03-14  9:46 ` Simon Horman
@ 2013-03-14 12:54 ` Laurent Pinchart
  2013-03-14 13:31 ` Linus Walleij
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-14 12:54 UTC (permalink / raw)
  To: linux-sh

Hi Simon,

On Thursday 14 March 2013 10:46:55 Simon Horman wrote:

[snip]

> I am seeing (a hopefully minor) problem which is using the defconfigs for
> the armadillo800eva I see:
> 
> fbdev-laurent
> 
> I believe this applies at least to all the other arm-based boards too.
> 
> drivers/built-in.o:(.rodata+0xa4): undefined reference to
> `pinconf_generic_dump_config'
> 
> It seems like some Kconfig updates might be in order.

I see two ways to fix this but I'm not sure which one is best. The first one
handles the issue in the pinctrl core:

diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 1f7113e..971636d 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -90,7 +90,7 @@ static inline void pinconf_init_device_debugfs(struct dentry *devroot,
  * pin config.
  */
 
-#ifdef CONFIG_GENERIC_PINCONF
+#if defined(CONFIG_GENERIC_PINCONF) && defined (CONFIG_DEBUG_FS)
 
 void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
 			      struct seq_file *s, unsigned pin);

And the second one in the PFC driver:

diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index aef268b..b5ec109 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = {
 	.pin_config_get			= sh_pfc_pinconf_get,
 	.pin_config_set			= sh_pfc_pinconf_set,
 	.pin_config_group_set		= sh_pfc_pinconf_group_set,
+#ifdef CONFIG_DEBUG_FS
 	.pin_config_config_dbg_show	= pinconf_generic_dump_config,
+#endif
 };
 
 /* PFC ranges -> pinctrl pin descs */

Linus, what's your opinion?

-- 
Regards,

Laurent Pinchart


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (2 preceding siblings ...)
  2013-03-14 12:54 ` Laurent Pinchart
@ 2013-03-14 13:31 ` Linus Walleij
  2013-03-14 13:39 ` Laurent Pinchart
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-03-14 13:31 UTC (permalink / raw)
  To: linux-sh

On Thu, Mar 14, 2013 at 1:54 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:

>> It seems like some Kconfig updates might be in order.
>
> I see two ways to fix this but I'm not sure which one is best. The first one
> handles the issue in the pinctrl core:

And that is what we want to do.

> -#ifdef CONFIG_GENERIC_PINCONF
> +#if defined(CONFIG_GENERIC_PINCONF) && defined (CONFIG_DEBUG_FS)

I merged a patch like this only yesterday to my fixes branch.

commit bf4d7be57ba9040347065f48a60f895a254f6e28
Author: Sachin Kamat <sachin.kamat@linaro.org>
Date:   Wed Mar 13 17:13:46 2013 +0530
pinctrl: generic: Fix compilation error

> @@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = {
>         .pin_config_get                 = sh_pfc_pinconf_get,
>         .pin_config_set                 = sh_pfc_pinconf_set,
>         .pin_config_group_set           = sh_pfc_pinconf_group_set,
> +#ifdef CONFIG_DEBUG_FS
>         .pin_config_config_dbg_show     = pinconf_generic_dump_config,
> +#endif
>  };

Is that necessary? Well it makes it harder to do the wrong thing...

Can you send a separate patch like this?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (3 preceding siblings ...)
  2013-03-14 13:31 ` Linus Walleij
@ 2013-03-14 13:39 ` Laurent Pinchart
  2013-03-14 13:55 ` Linus Walleij
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-14 13:39 UTC (permalink / raw)
  To: linux-sh

Hi Linus,

On Thursday 14 March 2013 14:31:09 Linus Walleij wrote:
> On Thu, Mar 14, 2013 at 1:54 PM, Laurent Pinchart wrote:
> >> It seems like some Kconfig updates might be in order.
> > 
> > I see two ways to fix this but I'm not sure which one is best. The first
> > one handles the issue in the pinctrl core:
>
> And that is what we want to do.
> 
> > -#ifdef CONFIG_GENERIC_PINCONF
> > +#if defined(CONFIG_GENERIC_PINCONF) && defined (CONFIG_DEBUG_FS)
> 
> I merged a patch like this only yesterday to my fixes branch.
> 
> commit bf4d7be57ba9040347065f48a60f895a254f6e28
> Author: Sachin Kamat <sachin.kamat@linaro.org>
> Date:   Wed Mar 13 17:13:46 2013 +0530
> pinctrl: generic: Fix compilation error

Great, thank you. Is that patch present in a stable branch that Simon could 
merge ?

> > @@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = {
> >         .pin_config_get                 = sh_pfc_pinconf_get,
> >         .pin_config_set                 = sh_pfc_pinconf_set,
> >         .pin_config_group_set           = sh_pfc_pinconf_group_set,
> > +#ifdef CONFIG_DEBUG_FS
> >         .pin_config_config_dbg_show     = pinconf_generic_dump_config,
> > +#endif
> > 
> >  };
> 
> Is that necessary? Well it makes it harder to do the wrong thing...
> 
> Can you send a separate patch like this?

With the above patch merged in your tree no modification to sh-pfc is needed 
anymore.

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (4 preceding siblings ...)
  2013-03-14 13:39 ` Laurent Pinchart
@ 2013-03-14 13:55 ` Linus Walleij
  2013-03-14 14:01 ` Laurent Pinchart
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-03-14 13:55 UTC (permalink / raw)
  To: linux-sh

On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> [Me]
>> I merged a patch like this only yesterday to my fixes branch.
>>
>> commit bf4d7be57ba9040347065f48a60f895a254f6e28
>> Author: Sachin Kamat <sachin.kamat@linaro.org>
>> Date:   Wed Mar 13 17:13:46 2013 +0530
>> pinctrl: generic: Fix compilation error
>
> Great, thank you. Is that patch present in a stable branch that Simon could
> merge ?

Yes the fixes branch in the pinctrl tree.

>> > @@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = {
>> >         .pin_config_get                 = sh_pfc_pinconf_get,
>> >         .pin_config_set                 = sh_pfc_pinconf_set,
>> >         .pin_config_group_set           = sh_pfc_pinconf_group_set,
>> > +#ifdef CONFIG_DEBUG_FS
>> >         .pin_config_config_dbg_show     = pinconf_generic_dump_config,
>> > +#endif
>> >
>> >  };
>>
>> Is that necessary? Well it makes it harder to do the wrong thing...
>>
>> Can you send a separate patch like this?
>
> With the above patch merged in your tree no modification to sh-pfc is needed
> anymore.

Which one? The one I already merge or the snippet right here
#ifdef:ing around the dbg_show thing?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (5 preceding siblings ...)
  2013-03-14 13:55 ` Linus Walleij
@ 2013-03-14 14:01 ` Laurent Pinchart
  2013-03-14 15:09 ` Linus Walleij
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-14 14:01 UTC (permalink / raw)
  To: linux-sh

On Thursday 14 March 2013 14:55:00 Linus Walleij wrote:
> On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart wrote:
> > [Me]
> > 
> >> I merged a patch like this only yesterday to my fixes branch.
> >> 
> >> commit bf4d7be57ba9040347065f48a60f895a254f6e28
> >> Author: Sachin Kamat <sachin.kamat@linaro.org>
> >> Date:   Wed Mar 13 17:13:46 2013 +0530
> >> pinctrl: generic: Fix compilation error
> > 
> > Great, thank you. Is that patch present in a stable branch that Simon
> > could merge ?
> 
> Yes the fixes branch in the pinctrl tree.

Thank you. Simon, it looks like we'll need another rebase :-/ Could you please 
merge that branch into your tree and give me the name of the resulting branch 
on which I'll rebase the PFC patches ?

> >> > @@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops
> >> > = {
> >> > 
> >> >         .pin_config_get                 = sh_pfc_pinconf_get,
> >> >         .pin_config_set                 = sh_pfc_pinconf_set,
> >> >         .pin_config_group_set           = sh_pfc_pinconf_group_set,
> >> > 
> >> > +#ifdef CONFIG_DEBUG_FS
> >> > 
> >> >         .pin_config_config_dbg_show     = pinconf_generic_dump_config,
> >> > 
> >> > +#endif
> >> > 
> >> >  };
> >> 
> >> Is that necessary? Well it makes it harder to do the wrong thing...
> >> 
> >> Can you send a separate patch like this?
> > 
> > With the above patch merged in your tree no modification to sh-pfc is
> > needed anymore.
> 
> Which one? The one I already merge or the snippet right here
> #ifdef:ing around the dbg_show thing?

The one you have already merged, sorry.

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (6 preceding siblings ...)
  2013-03-14 14:01 ` Laurent Pinchart
@ 2013-03-14 15:09 ` Linus Walleij
  2013-03-14 15:13 ` Laurent Pinchart
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-03-14 15:09 UTC (permalink / raw)
  To: linux-sh

On Wed, Mar 13, 2013 at 11:59 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:

> The fourth version of the functions patch set defines pinctrl groups and
> functions for even more devices on sh7372, sh73a0, r8a7740 and r8a7779.

It tried to look over it and ACK the parts hitting drivers/pinctrl/*
I probably missed something or added one ack too much.

Anyway it looks good and I trust you on this, so please add
my ACK to any patches needing it.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (7 preceding siblings ...)
  2013-03-14 15:09 ` Linus Walleij
@ 2013-03-14 15:13 ` Laurent Pinchart
  2013-03-15  6:25 ` Simon Horman
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-14 15:13 UTC (permalink / raw)
  To: linux-sh

Hi Linus,

On Thursday 14 March 2013 16:09:18 Linus Walleij wrote:
> On Wed, Mar 13, 2013 at 11:59 PM, Laurent Pinchart wrote:
> > The fourth version of the functions patch set defines pinctrl groups and
> > functions for even more devices on sh7372, sh73a0, r8a7740 and r8a7779.
> 
> It tried to look over it and ACK the parts hitting drivers/pinctrl/*
> I probably missed something or added one ack too much.
> 
> Anyway it looks good and I trust you on this, so please add
> my ACK to any patches needing it.

Thank you. I think you actually caught them all :-)

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (8 preceding siblings ...)
  2013-03-14 15:13 ` Laurent Pinchart
@ 2013-03-15  6:25 ` Simon Horman
  2013-03-15 12:35 ` Laurent Pinchart
  2013-03-15 15:37 ` Simon Horman
  11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-03-15  6:25 UTC (permalink / raw)
  To: linux-sh

On Thu, Mar 14, 2013 at 03:01:48PM +0100, Laurent Pinchart wrote:
> On Thursday 14 March 2013 14:55:00 Linus Walleij wrote:
> > On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart wrote:
> > > [Me]
> > > 
> > >> I merged a patch like this only yesterday to my fixes branch.
> > >> 
> > >> commit bf4d7be57ba9040347065f48a60f895a254f6e28
> > >> Author: Sachin Kamat <sachin.kamat@linaro.org>
> > >> Date:   Wed Mar 13 17:13:46 2013 +0530
> > >> pinctrl: generic: Fix compilation error
> > > 
> > > Great, thank you. Is that patch present in a stable branch that Simon
> > > could merge ?
> > 
> > Yes the fixes branch in the pinctrl tree.
> 
> Thank you. Simon, it looks like we'll need another rebase :-/ Could you please 
> merge that branch into your tree and give me the name of the resulting branch 
> on which I'll rebase the PFC patches ?

Sure, I have merged Linus's fixes branch into pinmux-base in the renesas
tree and pushed it to kernel.org. It should be there in a few minutes.
For reference the head commit is:

commit 47f4e0c1c87f34bf1fc74b8935a37d229a147946
Merge: a9324f6 bf4d7be
Author: Simon Horman <horms+renesas@verge.net.au>
Date:   Fri Mar 15 07:16:28 2013 +0100

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into pinmux-base

> > >> > @@ -365,7 +365,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops
> > >> > = {
> > >> > 
> > >> >         .pin_config_get                 = sh_pfc_pinconf_get,
> > >> >         .pin_config_set                 = sh_pfc_pinconf_set,
> > >> >         .pin_config_group_set           = sh_pfc_pinconf_group_set,
> > >> > 
> > >> > +#ifdef CONFIG_DEBUG_FS
> > >> > 
> > >> >         .pin_config_config_dbg_show     = pinconf_generic_dump_config,
> > >> > 
> > >> > +#endif
> > >> > 
> > >> >  };
> > >> 
> > >> Is that necessary? Well it makes it harder to do the wrong thing...
> > >> 
> > >> Can you send a separate patch like this?
> > > 
> > > With the above patch merged in your tree no modification to sh-pfc is
> > > needed anymore.
> > 
> > Which one? The one I already merge or the snippet right here
> > #ifdef:ing around the dbg_show thing?
> 
> The one you have already merged, sorry.
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> 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
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (9 preceding siblings ...)
  2013-03-15  6:25 ` Simon Horman
@ 2013-03-15 12:35 ` Laurent Pinchart
  2013-03-15 15:37 ` Simon Horman
  11 siblings, 0 replies; 13+ messages in thread
From: Laurent Pinchart @ 2013-03-15 12:35 UTC (permalink / raw)
  To: linux-sh

Hi Simon,

On Friday 15 March 2013 07:25:28 Simon Horman wrote:
> On Thu, Mar 14, 2013 at 03:01:48PM +0100, Laurent Pinchart wrote:
> > On Thursday 14 March 2013 14:55:00 Linus Walleij wrote:
> > > On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart wrote:
> > > > [Me]
> > > > 
> > > >> I merged a patch like this only yesterday to my fixes branch.
> > > >> 
> > > >> commit bf4d7be57ba9040347065f48a60f895a254f6e28
> > > >> Author: Sachin Kamat <sachin.kamat@linaro.org>
> > > >> Date:   Wed Mar 13 17:13:46 2013 +0530
> > > >> pinctrl: generic: Fix compilation error
> > > > 
> > > > Great, thank you. Is that patch present in a stable branch that Simon
> > > > could merge ?
> > > 
> > > Yes the fixes branch in the pinctrl tree.
> > 
> > Thank you. Simon, it looks like we'll need another rebase :-/ Could you
> > please merge that branch into your tree and give me the name of the
> > resulting branch on which I'll rebase the PFC patches ?
> 
> Sure, I have merged Linus's fixes branch into pinmux-base in the renesas
> tree and pushed it to kernel.org. It should be there in a few minutes.
> For reference the head commit is:
> 
> commit 47f4e0c1c87f34bf1fc74b8935a37d229a147946
> Merge: a9324f6 bf4d7be
> Author: Simon Horman <horms+renesas@verge.net.au>
> Date:   Fri Mar 15 07:16:28 2013 +0100
> 
>     Merge branch 'fixes' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into
> pinmux-base

Thank you. I've rebased my branches on top of that and pushed the result to

	git://linuxtv.org/pinchartl/fbdev.git

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779
  2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
                   ` (10 preceding siblings ...)
  2013-03-15 12:35 ` Laurent Pinchart
@ 2013-03-15 15:37 ` Simon Horman
  11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-03-15 15:37 UTC (permalink / raw)
  To: linux-sh

On Fri, Mar 15, 2013 at 01:35:47PM +0100, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 15 March 2013 07:25:28 Simon Horman wrote:
> > On Thu, Mar 14, 2013 at 03:01:48PM +0100, Laurent Pinchart wrote:
> > > On Thursday 14 March 2013 14:55:00 Linus Walleij wrote:
> > > > On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart wrote:
> > > > > [Me]
> > > > > 
> > > > >> I merged a patch like this only yesterday to my fixes branch.
> > > > >> 
> > > > >> commit bf4d7be57ba9040347065f48a60f895a254f6e28
> > > > >> Author: Sachin Kamat <sachin.kamat@linaro.org>
> > > > >> Date:   Wed Mar 13 17:13:46 2013 +0530
> > > > >> pinctrl: generic: Fix compilation error
> > > > > 
> > > > > Great, thank you. Is that patch present in a stable branch that Simon
> > > > > could merge ?
> > > > 
> > > > Yes the fixes branch in the pinctrl tree.
> > > 
> > > Thank you. Simon, it looks like we'll need another rebase :-/ Could you
> > > please merge that branch into your tree and give me the name of the
> > > resulting branch on which I'll rebase the PFC patches ?
> > 
> > Sure, I have merged Linus's fixes branch into pinmux-base in the renesas
> > tree and pushed it to kernel.org. It should be there in a few minutes.
> > For reference the head commit is:
> > 
> > commit 47f4e0c1c87f34bf1fc74b8935a37d229a147946
> > Merge: a9324f6 bf4d7be
> > Author: Simon Horman <horms+renesas@verge.net.au>
> > Date:   Fri Mar 15 07:16:28 2013 +0100
> > 
> >     Merge branch 'fixes' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into
> > pinmux-base
> 
> Thank you. I've rebased my branches on top of that and pushed the result to
> 
> 	git://linuxtv.org/pinchartl/fbdev.git

Thanks, that seems better.

I have pushed the pinmux/3.9/functions of your fbdev tree
as the pinmux branch of my renesas tree on kernel.org.

I have also rebased and pushed my boards-base, boards and next branches
accordingly.

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2013-03-15 15:37 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-13 22:59 [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Laurent Pinchart
2013-03-14  9:20 ` Simon Horman
2013-03-14  9:46 ` Simon Horman
2013-03-14 12:54 ` Laurent Pinchart
2013-03-14 13:31 ` Linus Walleij
2013-03-14 13:39 ` Laurent Pinchart
2013-03-14 13:55 ` Linus Walleij
2013-03-14 14:01 ` Laurent Pinchart
2013-03-14 15:09 ` Linus Walleij
2013-03-14 15:13 ` Laurent Pinchart
2013-03-15  6:25 ` Simon Horman
2013-03-15 12:35 ` Laurent Pinchart
2013-03-15 15:37 ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox