Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615AbaAVA7k (ORCPT ); Tue, 21 Jan 2014 19:59:40 -0500 Received: from mail-qc0-f180.google.com ([209.85.216.180]:60728 "EHLO mail-qc0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752677AbaAVA7g (ORCPT ); Tue, 21 Jan 2014 19:59:36 -0500 MIME-Version: 1.0 X-Originating-IP: [173.13.129.225] In-Reply-To: <1390343886-25852-1-git-send-email-syin@broadcom.com> References: <1390343886-25852-1-git-send-email-syin@broadcom.com> Date: Tue, 21 Jan 2014 16:59:35 -0800 Message-ID: Subject: Re: [PATCH] pinctrl: Rename Broadcom Capri pinctrl driver From: Olof Johansson To: Sherman Yin Cc: Mark Brown , =?ISO-8859-1?Q?Heiko_St=FCbner?= , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Rob Landley , Christian Daudt , Russell King , Linus Walleij , Grant Likely , Matt Porter , "devicetree@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , bcm-kernel-feedback-list@broadcom.com, "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Tue, Jan 21, 2014 at 2:38 PM, Sherman Yin 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 > Reviewed-by: Matt Porter > --- > ...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. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/