Unverified Commit 09427e19 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-soc-for-v6.7' of... 

Merge tag 'riscv-soc-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into soc/drivers

RISC-V SoC drivers for v6.7

Minor changes here only. There's the treewide remove callback work from
Uwe, some of my own gradual conversion of SOC_ Kconfig options and a
selection of the ARM AMBA protocol required for the crypto driver on
StarFive JH7110 SoCs. The latter was supposed to be in v6.6, but I
forgot to send a PR.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>

* tag 'riscv-soc-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  soc/microchip: mpfs-sys-controller: Convert to platform remove callback returning void
  soc: sifive: replace SOC_FOO with ARCH_FOO
  riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE

Link: https://lore.kernel.org/r/20231016-predator-affiliate-e8affd3a7be9@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 15c46d85 22dedf8f

arch/riscv/Kconfig.socs

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config SOC_STARFIVE 
	bool "StarFive SoCs"

	select PINCTRL

	select RESET_CONTROLLER

	select ARM_AMBA

	help

	  This enables support for StarFive SoC platform hardware.

drivers/soc/microchip/mpfs-sys-controller.c

+2 −4
Original line number Diff line number Diff line
@@ -149,13 +149,11 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev) 
	return 0;

}



static int mpfs_sys_controller_remove(struct platform_device *pdev)

static void mpfs_sys_controller_remove(struct platform_device *pdev)

{

	struct mpfs_sys_controller *sys_controller = platform_get_drvdata(pdev);



	mpfs_sys_controller_put(sys_controller);



	return 0;

}



static const struct of_device_id mpfs_sys_controller_of_match[] = {
@@ -207,7 +205,7 @@ static struct platform_driver mpfs_sys_controller_driver = { 
		.of_match_table = mpfs_sys_controller_of_match,

	},

	.probe = mpfs_sys_controller_probe,

	.remove = mpfs_sys_controller_remove,

	.remove_new = mpfs_sys_controller_remove,

};

module_platform_driver(mpfs_sys_controller_driver);

drivers/soc/sifive/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



if SOC_SIFIVE || SOC_STARFIVE

if ARCH_SIFIVE || ARCH_STARFIVE



config SIFIVE_CCACHE

	bool "Sifive Composable Cache controller"