On Tue, Jan 21, 2014 at 04:59:35PM -0800, Olof Johansson wrote: > Hi, > > > On Tue, Jan 21, 2014 at 2:38 PM, Sherman Yin <syin@xxxxxxxxxxxx> wrote: > > To be consistent with other Broadcom drivers, the Broadcom Capri pinctrl > > driver and its related CONFIG option are renamed to bcm281xx. > > > > Devicetree compatible string and binding documentation use > > "brcm,bcm11351-pinctrl" to match the machine binding here: > > Documentation/devicetree/bindings/arm/bcm/bcm11351.txt > > > > This driver supports pinctrl on BCM11130, BCM11140, BCM11351, BCM28145 > > and BCM28155 SoCs. > > > > Signed-off-by: Sherman Yin <syin@xxxxxxxxxxxx> > > Reviewed-by: Matt Porter <mporter@xxxxxxxxxx> > > --- > > ...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 +- > > .../{pinctrl-capri.c => pinctrl-bcm281xx.c} | 1521 ++++++++++---------- > > 6 files changed, 775 insertions(+), 768 deletions(-) > > rename Documentation/devicetree/bindings/pinctrl/{brcm,capri-pinctrl.txt => brcm,bcm11351-pinctrl.txt} (98%) > > rename drivers/pinctrl/{pinctrl-capri.c => pinctrl-bcm281xx.c} (25%) > > > > diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,capri-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt > > similarity index 98% > > rename from Documentation/devicetree/bindings/pinctrl/brcm,capri-pinctrl.txt > > rename to Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt > > index 9e9e9ef..c119deb 100644 > > --- a/Documentation/devicetree/bindings/pinctrl/brcm,capri-pinctrl.txt > > +++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt > > @@ -1,4 +1,4 @@ > > -Broadcom Capri Pin Controller > > +Broadcom BCM281xx Pin Controller > > > > This is a pin controller for the Broadcom BCM281xx SoC family, which includes > > BCM11130, BCM11140, BCM11351, BCM28145, and BCM28155 SoCs. > > @@ -7,14 +7,14 @@ BCM11130, BCM11140, BCM11351, BCM28145, and BCM28155 SoCs. > > > > Required Properties: > > > > -- compatible: Must be "brcm,capri-pinctrl". > > +- compatible: Must be "brcm,bcm11351-pinctrl" > > Since the original binding is queued for 3.14 (I believe?), if this > rename isn't merged for 3.14 then you will still need to accept the > old compatible string (binding). You can document it as deprecated, > but the driver needs to still probe with it. Linus had mentioned that he could take a rename in 3.14-rc for this driver which is really what we had in mind here. Since the binding doesn't become stable until 3.14 is actually released I was under the impression that this is ok without keeping a deprecated compatible string. I notice that Tomasz had comments about this type of situation in http://www.spinics.net/lists/devicetree/msg18010.html -Matt -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html