mbox

[GIT,PULL] bcm pinctrl rename

Message ID CAEPRUYqUNxOT=KnhSmbXbL2e2tCs=jAhQqKLiVVc13okpBxHnw@mail.gmail.com
State New
Headers show

Pull-request

git://github.com/broadcom/bcm11351.git

Message

Christian Daudt Feb. 25, 2014, 5:01 a.m. UTC 
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%)

Comments

Arnd Bergmann Feb. 25, 2014, 7:18 p.m. UTC | #1 
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
Olof Johansson March 9, 2014, 6:14 a.m. UTC | #2 
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@35004800 {
-       compatible = "brcm,capri-pinctrl";
+       compatible = "brcmbcm11351-pinctrl";
	reg = <0x35004800 0x430>;


-Olof