| Message ID | tencent_6D10A9C63E3E0F412EED33477B5CDB98C207@qq.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Conor Dooley |
| Headers | show |
| Series | riscv: add initial support for Canaan Kendryte K230 | expand |
On Sat, Mar 23, 2024 at 1:13 PM Yangyu Chen <cyy@cyyself.name> wrote: > Since SOC_FOO should be deprecated from patch [1], and cleanup for other > SoCs is already on the mailing list [2,3,4], we remove the use of > SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, > > Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select > when it has the symbol SOC_CANAAN_K210. > > [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ > [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ > [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ > [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ > > Signed-off-by: Yangyu Chen <cyy@cyyself.name> Acked-by: Linus Walleij <linus.walleij@linaro.org> Is this patch something I can just apply to the pinctrl tree? Yours, Linus Walleij
On Tue, Apr 02, 2024 at 02:31:36PM +0200, Linus Walleij wrote: > On Sat, Mar 23, 2024 at 1:13 PM Yangyu Chen <cyy@cyyself.name> wrote: > > > Since SOC_FOO should be deprecated from patch [1], and cleanup for other > > SoCs is already on the mailing list [2,3,4], we remove the use of > > SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, > > > > Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select > > when it has the symbol SOC_CANAAN_K210. > > > > [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ > > [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ > > [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ > > [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ > > > > Signed-off-by: Yangyu Chen <cyy@cyyself.name> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Is this patch something I can just apply to the pinctrl tree? The new symbol doesn't exist in the pinctrl tree, so the driver will cease to be compilable. Yangyu sent a standalone version of these symbol changes: https://lore.kernel.org/all/tencent_DB11214C8D0D7C48829ADA128E7BB8F13108@qq.com/ That whole series needs to go through one tree though, for the same reason. If your ack transfers to that (identical patch) I can take the whole lot via the soc tree for v6.10.
> On Apr 2, 2024, at 20:31, Linus Walleij <linus.walleij@linaro.org> wrote: > > On Sat, Mar 23, 2024 at 1:13 PM Yangyu Chen <cyy@cyyself.name> wrote: > >> Since SOC_FOO should be deprecated from patch [1], and cleanup for other >> SoCs is already on the mailing list [2,3,4], we remove the use of >> SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, >> >> Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select >> when it has the symbol SOC_CANAAN_K210. >> >> [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ >> [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ >> [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ >> [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ >> >> Signed-off-by: Yangyu Chen <cyy@cyyself.name> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Please add Acked-by to this email [1]. I will separate them in the next revision. [1] https://lore.kernel.org/linux-riscv/tencent_DB11214C8D0D7C48829ADA128E7BB8F13108@qq.com/ Thanks. > Is this patch something I can just apply to the pinctrl tree? > I think not. As Conor said. > Yours, > Linus Walleij
On Tue, Apr 2, 2024 at 2:58 PM Conor Dooley <conor.dooley@microchip.com> wrote: > On Tue, Apr 02, 2024 at 02:31:36PM +0200, Linus Walleij wrote: > > On Sat, Mar 23, 2024 at 1:13 PM Yangyu Chen <cyy@cyyself.name> wrote: > > Is this patch something I can just apply to the pinctrl tree? > > The new symbol doesn't exist in the pinctrl tree, so the driver will > cease to be compilable. Yangyu sent a standalone version of these symbol > changes: > https://lore.kernel.org/all/tencent_DB11214C8D0D7C48829ADA128E7BB8F13108@qq.com/ > That whole series needs to go through one tree though, for the same reason. OK > If your ack transfers to that (identical patch) I can take the whole lot > via the soc tree for v6.10. Yeah that's fine, go ahead. Yours, Linus Walleij
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index d45657aa986a..1be05efccc29 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -235,13 +235,13 @@ config PINCTRL_INGENIC config PINCTRL_K210 bool "Pinctrl driver for the Canaan Kendryte K210 SoC" - depends on RISCV && SOC_CANAAN && OF + depends on RISCV && SOC_CANAAN_K210 && OF select GENERIC_PINMUX_FUNCTIONS select GENERIC_PINCONF select GPIOLIB select OF_GPIO select REGMAP_MMIO - default SOC_CANAAN + default SOC_CANAAN_K210 help Add support for the Canaan Kendryte K210 RISC-V SOC Field Programmable IO Array (FPIOA) controller.
Since SOC_FOO should be deprecated from patch [1], and cleanup for other SoCs is already on the mailing list [2,3,4], we remove the use of SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select when it has the symbol SOC_CANAAN_K210. [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ Signed-off-by: Yangyu Chen <cyy@cyyself.name> --- drivers/pinctrl/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)