[GIT PULL] bcm pinctrl rename

[GIT PULL] bcm pinctrl rename

[Christian Daudt]

The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:

  Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)

are available in the git repository at:

  git://github.com/broadcom/bcm11351.git tags/bcm-for-3.14-pinctrl-rename

for you to fetch changes up to f5310a1712b68c7f83539fce6ebbfb6f0f510f5b:

  Update dtsi with new pinctrl compatible string (2014-02-12 09:06:53 -0800)

----------------------------------------------------------------
Renaming pinctrl code to keep in line with rest of bcm mobile

Given that this driver has been in the works for a while, it
was written prior to the code standardizing on bcm-based naming.
this patchset brings it in line with the remainder of the code.

----------------------------------------------------------------
Sherman Yin (4):
      pinctrl: Rename Broadcom Capri pinctrl binding
      pinctrl: Rename Broadcom Capri pinctrl driver
      Update bcm_defconfig with new pinctrl CONFIG
      Update dtsi with new pinctrl compatible string

 .../bindings/pinctrl/{brcm,capri-pinctrl.txt =>
brcm,bcm11351-pinctrl.txt}        |    8 +-
 arch/arm/boot/dts/bcm11351.dtsi
            |    2 +-
 arch/arm/configs/bcm_defconfig
            |    2 +-
 drivers/pinctrl/Kconfig
            |    8 +-
 drivers/pinctrl/Makefile
            |    2 +-
 drivers/pinctrl/pinctrl-bcm281xx.c
            | 1461 ++++++++++++++++++++++++++++++++++++++
 drivers/pinctrl/pinctrl-capri.c
            | 1454 -------------------------------------
 7 files changed, 1472 insertions(+), 1465 deletions(-)
 rename Documentation/devicetree/bindings/pinctrl/{brcm,capri-pinctrl.txt
=> brcm,bcm11351-pinctrl.txt} (98%)
 create mode 100644 drivers/pinctrl/pinctrl-bcm281xx.c
 delete mode 100644 drivers/pinctrl/pinctrl-capri.c

[GIT PULL] bcm pinctrl rename

[Olof Johansson]

On Wed, Feb 12, 2014 at 09:20:13AM -0800, Christian Daudt wrote:
> The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:
> 
>   Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)
> 
> are available in the git repository at:
> 
>   git://github.com/broadcom/bcm11351.git tags/bcm-for-3.14-pinctrl-rename
> 
> for you to fetch changes up to f5310a1712b68c7f83539fce6ebbfb6f0f510f5b:
> 
>   Update dtsi with new pinctrl compatible string (2014-02-12 09:06:53 -0800)
> 
> ----------------------------------------------------------------
> Renaming pinctrl code to keep in line with rest of bcm mobile
> 
> Given that this driver has been in the works for a while, it
> was written prior to the code standardizing on bcm-based naming.
> this patchset brings it in line with the remainder of the code.
> 
> ----------------------------------------------------------------
> Sherman Yin (4):
>       pinctrl: Rename Broadcom Capri pinctrl binding
>       pinctrl: Rename Broadcom Capri pinctrl driver
>       Update bcm_defconfig with new pinctrl CONFIG
>       Update dtsi with new pinctrl compatible string

Hi,

(As per irc discussion). The rename isn't the right thing to do at this
time in the release, but the binding needs to be tweaked before it ships
in a full release, or we'll always need to live with it.

So, I'll be happy to take the bindings piece and the dtsi piece (and the
small edit to the driver to change the compatible string match table),
but the file rename and Kconfig entry edit is 3.15 material.

Please send new pull request with just that (or, if you prefer, just send the
patches and we can apply them too).


-Olof

[GIT PULL] bcm pinctrl rename

[Christian Daudt]

On Fri, Feb 21, 2014 at 2:29 PM, Olof Johansson <olof@lixom.net> wrote:
> On Wed, Feb 12, 2014 at 09:20:13AM -0800, Christian Daudt wrote:
>> The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:
>>
>>   Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)
>>
>> are available in the git repository at:
>>
>>   git://github.com/broadcom/bcm11351.git tags/bcm-for-3.14-pinctrl-rename
>>
>> for you to fetch changes up to f5310a1712b68c7f83539fce6ebbfb6f0f510f5b:
>>
>>   Update dtsi with new pinctrl compatible string (2014-02-12 09:06:53 -0800)
>>
>> ----------------------------------------------------------------
>> Renaming pinctrl code to keep in line with rest of bcm mobile
>>
>> Given that this driver has been in the works for a while, it
>> was written prior to the code standardizing on bcm-based naming.
>> this patchset brings it in line with the remainder of the code.
>>
>> ----------------------------------------------------------------
>> Sherman Yin (4):
>>       pinctrl: Rename Broadcom Capri pinctrl binding
>>       pinctrl: Rename Broadcom Capri pinctrl driver
>>       Update bcm_defconfig with new pinctrl CONFIG
>>       Update dtsi with new pinctrl compatible string
>
> Hi,
>
> (As per irc discussion). The rename isn't the right thing to do at this
> time in the release, but the binding needs to be tweaked before it ships
> in a full release, or we'll always need to live with it.
>
> So, I'll be happy to take the bindings piece and the dtsi piece (and the
> small edit to the driver to change the compatible string match table),
> but the file rename and Kconfig entry edit is 3.15 material.
>
> Please send new pull request with just that (or, if you prefer, just send the
> patches and we can apply them too).
>
>
> -Olof

Ok, I have this ready to go, just need an ack for this patch (which
will replace "pinctrl: Rename Broadcom Capri pinctrl driver"):
Subject: [PATCH] pinctrl: refer to updated dt binding string.

Bring the driver in line with the bcm-based dt name for pinctrl.
This is being done to keep consistency with other Broadcom mobile
SoC drivers.

Signed-off-by: Christian Daudt <bcm@fixthebug.org>

diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c
index 4669c53..eb25002 100644
--- a/drivers/pinctrl/pinctrl-capri.c
+++ b/drivers/pinctrl/pinctrl-capri.c
@@ -1435,7 +1435,7 @@ int __init capri_pinctrl_probe(struct
platform_device *pdev)
 }

 static struct of_device_id capri_pinctrl_of_match[] = {
-       { .compatible = "brcm,capri-pinctrl", },
+       { .compatible = "brcm,bcm11351-pinctrl", },
        { },
 };

-- 
1.8.3.2


Thanks,
   csd

[GIT PULL] bcm pinctrl rename

[Matt Porter]

On Mon, Feb 24, 2014 at 09:32:47AM -0800, Christian Daudt wrote:
> On Fri, Feb 21, 2014 at 2:29 PM, Olof Johansson <olof@lixom.net> wrote:
> > On Wed, Feb 12, 2014 at 09:20:13AM -0800, Christian Daudt wrote:
> >> The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:
> >>
> >>   Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)
> >>
> >> are available in the git repository at:
> >>
> >>   git://github.com/broadcom/bcm11351.git tags/bcm-for-3.14-pinctrl-rename
> >>
> >> for you to fetch changes up to f5310a1712b68c7f83539fce6ebbfb6f0f510f5b:
> >>
> >>   Update dtsi with new pinctrl compatible string (2014-02-12 09:06:53 -0800)
> >>
> >> ----------------------------------------------------------------
> >> Renaming pinctrl code to keep in line with rest of bcm mobile
> >>
> >> Given that this driver has been in the works for a while, it
> >> was written prior to the code standardizing on bcm-based naming.
> >> this patchset brings it in line with the remainder of the code.
> >>
> >> ----------------------------------------------------------------
> >> Sherman Yin (4):
> >>       pinctrl: Rename Broadcom Capri pinctrl binding
> >>       pinctrl: Rename Broadcom Capri pinctrl driver
> >>       Update bcm_defconfig with new pinctrl CONFIG
> >>       Update dtsi with new pinctrl compatible string
> >
> > Hi,
> >
> > (As per irc discussion). The rename isn't the right thing to do at this
> > time in the release, but the binding needs to be tweaked before it ships
> > in a full release, or we'll always need to live with it.
> >
> > So, I'll be happy to take the bindings piece and the dtsi piece (and the
> > small edit to the driver to change the compatible string match table),
> > but the file rename and Kconfig entry edit is 3.15 material.
> >
> > Please send new pull request with just that (or, if you prefer, just send the
> > patches and we can apply them too).
> >
> >
> > -Olof
> 
> Ok, I have this ready to go, just need an ack for this patch (which
> will replace "pinctrl: Rename Broadcom Capri pinctrl driver"):
> Subject: [PATCH] pinctrl: refer to updated dt binding string.
> 
> Bring the driver in line with the bcm-based dt name for pinctrl.
> This is being done to keep consistency with other Broadcom mobile
> SoC drivers.
> 
> Signed-off-by: Christian Daudt <bcm@fixthebug.org>
> 
> diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c
> index 4669c53..eb25002 100644
> --- a/drivers/pinctrl/pinctrl-capri.c
> +++ b/drivers/pinctrl/pinctrl-capri.c
> @@ -1435,7 +1435,7 @@ int __init capri_pinctrl_probe(struct
> platform_device *pdev)
>  }
> 
>  static struct of_device_id capri_pinctrl_of_match[] = {
> -       { .compatible = "brcm,capri-pinctrl", },
> +       { .compatible = "brcm,bcm11351-pinctrl", },
>         { },
>  };


Looks good. Does the binding rename patch stay as is?

Reviewed-by: Matt Porter <mporter@linaro.org>

[GIT PULL] bcm pinctrl rename

[Christian Daudt]

On Fri, Feb 21, 2014 at 2:29 PM, Olof Johansson <olof@lixom.net> wrote:
> (As per irc discussion). The rename isn't the right thing to do at this
> time in the release, but the binding needs to be tweaked before it ships
> in a full release, or we'll always need to live with it.
>
> So, I'll be happy to take the bindings piece and the dtsi piece (and the
> small edit to the driver to change the compatible string match table),
> but the file rename and Kconfig entry edit is 3.15 material.
>
> Please send new pull request with just that (or, if you prefer, just send the
> patches and we can apply them too).
>

Can you please pull the patches below. Note that if you wanto to
absolutely reduce this to the bone, you can drop the last patch in the
series titled "pinctrl: Rename Broadcom Capri pinctrl binding". That
is the documentation fixup, so the binding doc will be wrong until
3.15. But that will reduce the change to just 2 lines :)
 thanks,
   csd


The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:

  Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)

are available in the git repository at:

  git://github.com/broadcom/bcm11351.git
tags/bcm-for-3.14-pinctrl-reduced-rename

for you to fetch changes up to 735ea23c4868bf3123a4c79184e9206e0cc60211:

  pinctrl: Rename Broadcom Capri pinctrl binding (2014-02-24 20:25:54 -0800)

----------------------------------------------------------------
Rename pinctrl dt binding to restore consistency with
other bcm mobile bindings.

----------------------------------------------------------------
Christian Daudt (1):
      pinctrl: refer to updated dt binding string.

Sherman Yin (2):
      Update dtsi with new pinctrl compatible string
      pinctrl: Rename Broadcom Capri pinctrl binding

 Documentation/devicetree/bindings/pinctrl/{brcm,capri-pinctrl.txt =>
brcm,bcm11351-pinctrl.txt} | 8 ++++----
 arch/arm/boot/dts/bcm11351.dtsi
                          | 2 +-
 drivers/pinctrl/pinctrl-capri.c
                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename Documentation/devicetree/bindings/pinctrl/{brcm,capri-pinctrl.txt
=> brcm,bcm11351-pinctrl.txt} (98%)

[GIT PULL] bcm pinctrl rename

[Arnd Bergmann]

On Tuesday 25 February 2014, Christian Daudt wrote:
> Can you please pull the patches below. Note that if you wanto to
> absolutely reduce this to the bone, you can drop the last patch in the
> series titled "pinctrl: Rename Broadcom Capri pinctrl binding". That
> is the documentation fixup, so the binding doc will be wrong until
> 3.15. But that will reduce the change to just 2 lines :)

I've gone through the remaining pull requests today but didn't touch
this one. Since Olof asked for the changes, I'm expecting him to
look at the new version first. I don't have an opinion on the contents
myself.

	Arnd

[GIT PULL] bcm pinctrl rename

[Olof Johansson]

On Tue, Feb 25, 2014 at 08:18:33PM +0100, Arnd Bergmann wrote:
> On Tuesday 25 February 2014, Christian Daudt wrote:
> > Can you please pull the patches below. Note that if you wanto to
> > absolutely reduce this to the bone, you can drop the last patch in the
> > series titled "pinctrl: Rename Broadcom Capri pinctrl binding". That
> > is the documentation fixup, so the binding doc will be wrong until
> > 3.15. But that will reduce the change to just 2 lines :)
> 
> I've gone through the remaining pull requests today but didn't touch
> this one. Since Olof asked for the changes, I'm expecting him to
> look at the new version first. I don't have an opinion on the contents
> myself.

Yep, pulled now.

I noticed a typo in one of the binding file examples that you might want
to fix, but it's not urgent for 3.14:


@@ -119,7 +119,7 @@ Optional Properties (for HDMI pins):
 Example:
  // pin controller node
pinctrl at 35004800 {
-       compatible = "brcm,capri-pinctrl";
+       compatible = "brcmbcm11351-pinctrl";
	reg = <0x35004800 0x430>;


-Olof