| Message ID | 20220930061404.5418-1-hal.feng@linux.starfivetech.com |
|---|---|
| State | New |
| Headers | show |
| Series | Basic StarFive JH7110 RISC-V SoC support | expand |
On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > Add the SoC name to make it more clear. Also the next generation StarFive > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > No functional change. > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > --- > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > drivers/pinctrl/starfive/Kconfig | 2 +- > drivers/pinctrl/starfive/Makefile | 2 +- > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > 6 files changed, 8 insertions(+), 8 deletions(-) > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > Reviewed-by: Rob Herring <robh@kernel.org> Would be good to pull this out separately and apply for 6.1. It's kind of messy with cross tree dependencies.
On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > No functional change. > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > --- > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > drivers/pinctrl/starfive/Kconfig | 2 +- > > drivers/pinctrl/starfive/Makefile | 2 +- > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > 6 files changed, 8 insertions(+), 8 deletions(-) > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > Would be good to pull this out separately and apply for 6.1. It's kind > of messy with cross tree dependencies. OK I applied this for V6.1. Yours, Linus Walleij
On Tue, Oct 04, 2022 at 10:48:38AM +0200, Linus Walleij wrote: > On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > > No functional change. > > > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > > --- > > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > > drivers/pinctrl/starfive/Kconfig | 2 +- > > > drivers/pinctrl/starfive/Makefile | 2 +- > > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > > 6 files changed, 8 insertions(+), 8 deletions(-) > > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > Would be good to pull this out separately and apply for 6.1. It's kind > > of messy with cross tree dependencies. > > OK I applied this for V6.1. Will this need to be done immutably so it can be pulled into the riscv tree in case this gets applied as a late change for 6.1: https://lore.kernel.org/linux-riscv/c5169131-486e-9808-ba48-b7abe1be6a99@collabora.com/ Thanks, Conor.
On Tue, Oct 4, 2022 at 10:59 AM Conor Dooley <conor.dooley@microchip.com> wrote: > On Tue, Oct 04, 2022 at 10:48:38AM +0200, Linus Walleij wrote: > > On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > > > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > > > No functional change. > > > > > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > > > --- > > > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > > > drivers/pinctrl/starfive/Kconfig | 2 +- > > > > drivers/pinctrl/starfive/Makefile | 2 +- > > > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > > > 6 files changed, 8 insertions(+), 8 deletions(-) > > > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > > > > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > > > Would be good to pull this out separately and apply for 6.1. It's kind > > > of messy with cross tree dependencies. > > > > OK I applied this for V6.1. > > Will this need to be done immutably so it can be pulled into the riscv > tree in case this gets applied as a late change for 6.1: > https://lore.kernel.org/linux-riscv/c5169131-486e-9808-ba48-b7abe1be6a99@collabora.com/ Always one finger on the fast-forward button have we? ;) Rob's point was that I should apply this for v6.1 so that exactly that kind of cross-dependencies and immutable branches could be avoided for the v6.2 development cycle. The merge window is already open, it's a bit late for completely new stuff I think. Yours, Linus Walleij
On Tue, Oct 04, 2022 at 11:13:37AM +0200, Linus Walleij wrote: > On Tue, Oct 4, 2022 at 10:59 AM Conor Dooley <conor.dooley@microchip.com> wrote: > > On Tue, Oct 04, 2022 at 10:48:38AM +0200, Linus Walleij wrote: > > > On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > > > > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > > > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > > > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > > > > No functional change. > > > > > > > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > > > > --- > > > > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > > > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > > > > drivers/pinctrl/starfive/Kconfig | 2 +- > > > > > drivers/pinctrl/starfive/Makefile | 2 +- > > > > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > > > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > > > > 6 files changed, 8 insertions(+), 8 deletions(-) > > > > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > > > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > > > > > > > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > > > > > Would be good to pull this out separately and apply for 6.1. It's kind > > > > of messy with cross tree dependencies. > > > > > > OK I applied this for V6.1. > > > > Will this need to be done immutably so it can be pulled into the riscv > > tree in case this gets applied as a late change for 6.1: > > https://lore.kernel.org/linux-riscv/c5169131-486e-9808-ba48-b7abe1be6a99@collabora.com/ > > Always one finger on the fast-forward button have we? ;) Dunno what you mean by that mate, sorry! I just saw the mail wanted to have the decency to reply to that fellow & tell him to rebase after rc1 to avoid a conflict. > Rob's point was that I should apply this for v6.1 so that exactly > that kind of cross-dependencies and immutable branches could > be avoided for the v6.2 development cycle. > > The merge window is already open, it's a bit late for completely > new stuff I think. History suggests otherwise, but I'd be lying if I said I disagreed.
On Tue, Oct 04, 2022 at 10:21:24AM +0100, Conor Dooley wrote: > On Tue, Oct 04, 2022 at 11:13:37AM +0200, Linus Walleij wrote: > > On Tue, Oct 4, 2022 at 10:59 AM Conor Dooley <conor.dooley@microchip.com> wrote: > > > On Tue, Oct 04, 2022 at 10:48:38AM +0200, Linus Walleij wrote: > > > > On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > > > > > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > > > > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > > > > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > > > > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > > > > > No functional change. > > > > > > > > > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > > > > > --- > > > > > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > > > > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > > > > > drivers/pinctrl/starfive/Kconfig | 2 +- > > > > > > drivers/pinctrl/starfive/Makefile | 2 +- > > > > > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > > > > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > > > > > 6 files changed, 8 insertions(+), 8 deletions(-) > > > > > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > > > > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > > > > > > > > > > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > > > > > > > Would be good to pull this out separately and apply for 6.1. It's kind > > > > > of messy with cross tree dependencies. > > > > > > > > OK I applied this for V6.1. > > > > > > Will this need to be done immutably so it can be pulled into the riscv > > > tree in case this gets applied as a late change for 6.1: > > > https://lore.kernel.org/linux-riscv/c5169131-486e-9808-ba48-b7abe1be6a99@collabora.com/ > > > > Always one finger on the fast-forward button have we? ;) > > Dunno what you mean by that mate, sorry! > > I just saw the mail wanted to have the decency to reply to that fellow s/wanted/want > & tell him to rebase after rc1 to avoid a conflict. > > > Rob's point was that I should apply this for v6.1 so that exactly > > that kind of cross-dependencies and immutable branches could > > be avoided for the v6.2 development cycle. > > > > The merge window is already open, it's a bit late for completely > > new stuff I think. > > History suggests otherwise, but I'd be lying if I said I disagreed.
Hi Linus, On Tue, Oct 4, 2022 at 10:50 AM Linus Walleij <linus.walleij@linaro.org> wrote: > On Fri, Sep 30, 2022 at 11:28 PM Rob Herring <robh@kernel.org> wrote: > > On Fri, 30 Sep 2022 14:14:04 +0800, Hal Feng wrote: > > > From: Jianlong Huang <jianlong.huang@starfivetech.com> > > > > > > Add the SoC name to make it more clear. Also the next generation StarFive > > > SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. > > > No functional change. > > > > > > Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com> > > > Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com> > > > --- > > > .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- > > > arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- > > > drivers/pinctrl/starfive/Kconfig | 2 +- > > > drivers/pinctrl/starfive/Makefile | 2 +- > > > .../{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} | 2 +- > > > .../{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +++--- > > > 6 files changed, 8 insertions(+), 8 deletions(-) > > > rename drivers/pinctrl/starfive/{pinctrl-starfive.c => pinctrl-starfive-jh7100.c} (99%) > > > rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) > > > > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > Would be good to pull this out separately and apply for 6.1. It's kind > > of messy with cross tree dependencies. > > OK I applied this for V6.1. Isn't the name of the DT bindings header file part of the DT bindings, i.e. it cannot be changed afterwards? As of v5.17, it is in active use by arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml index 92963604422f..a6140dddd39a 100644 --- a/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml @@ -165,7 +165,7 @@ examples: - | #include <dt-bindings/clock/starfive-jh7100.h> #include <dt-bindings/reset/starfive-jh7100.h> - #include <dt-bindings/pinctrl/pinctrl-starfive.h> + #include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h> soc { #address-cells = <2>; diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts index c9af67f7a0d2..f7a230110512 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts +++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts @@ -8,7 +8,7 @@ #include "jh7100.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/leds/common.h> -#include <dt-bindings/pinctrl/pinctrl-starfive.h> +#include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h> / { model = "BeagleV Starlight Beta"; diff --git a/drivers/pinctrl/starfive/Kconfig b/drivers/pinctrl/starfive/Kconfig index ed8c6a920886..5cedb546f93d 100644 --- a/drivers/pinctrl/starfive/Kconfig +++ b/drivers/pinctrl/starfive/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -config PINCTRL_STARFIVE +config PINCTRL_STARFIVE_JH7100 tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC" depends on SOC_STARFIVE || COMPILE_TEST depends on OF diff --git a/drivers/pinctrl/starfive/Makefile b/drivers/pinctrl/starfive/Makefile index 4c96e2f86292..0293f26a0a99 100644 --- a/drivers/pinctrl/starfive/Makefile +++ b/drivers/pinctrl/starfive/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o +obj-$(CONFIG_PINCTRL_STARFIVE_JH7100) += pinctrl-starfive-jh7100.o diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c similarity index 99% rename from drivers/pinctrl/starfive/pinctrl-starfive.c rename to drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 74a084740e8c..5b544fb7f3d8 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -20,7 +20,7 @@ #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> -#include <dt-bindings/pinctrl/pinctrl-starfive.h> +#include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h> #include "../core.h" #include "../pinctrl-utils.h" diff --git a/include/dt-bindings/pinctrl/pinctrl-starfive.h b/include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h similarity index 98% rename from include/dt-bindings/pinctrl/pinctrl-starfive.h rename to include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h index de4f75c2c9e8..a200f546d078 100644 --- a/include/dt-bindings/pinctrl/pinctrl-starfive.h +++ b/include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h @@ -3,8 +3,8 @@ * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk> */ -#ifndef __DT_BINDINGS_PINCTRL_STARFIVE_H__ -#define __DT_BINDINGS_PINCTRL_STARFIVE_H__ +#ifndef __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__ +#define __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__ #define PAD_GPIO_OFFSET 0 #define PAD_FUNC_SHARE_OFFSET 64 @@ -272,4 +272,4 @@ #define GPI_NONE 0xff -#endif /* __DT_BINDINGS_PINCTRL_STARFIVE_H__ */ +#endif /* __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__ */