| Message ID | CAEPRUYpCVpV7HwuO6c95ybk3yp1teJgW-9qwyHnjKbs03C9bgQ@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
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
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>
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