mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

RISC-V SoC drivers for v6.7

Browse source 
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: Conor Dooley <conor.dooley@microchip.com>
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZS1TXAAKCRB4tDGHoIJi
 0itYAP9/F6ao6N728C9VEEcZ2Y+KAW2iiDWTEkJC6Ng/JWqOagD/X1Etz5m8s/eJ
 ZFhf7GQnszYcgP+KT7XtLcIjKI+EKQ4=
 =gwZH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUtpN4ACgkQYKtH/8kJ
 UidMgBAA3cgZgdUQaMnLC/rrx0B2DcO3NguMJXFT4XElNbYNKf4AG2jTPVTc7WtJ
 DEERy0hPH0xXPd/VDaCoz+eUcZDFjJKDcrd2DlNmISyVDOtBWsezdKrGz6v2xiCt
 nkn6Uii/QfG4joAw6vJIOYhtaT1EBbiHb176LOcaEY8psQnhWqL16ocwBrjc49GR
 2pkjC1jcqsQGtqEE1A2R7+hbrSHRdLI3JDYWztee2zrCXEgSVl/l3TqYdGqtUF/N
 A246nC6CuJdRBgtmVbBgxKswn3vv1FWoQRsLobBIhOAwf2jxEcaecO0h3LmFYx2G
 571VRMCtbvtUbrFKsxvroX43r+Jj3jygVd6rElHY5emn4FaGE4UiUNqziZGDBgq8
 iwtYLabPHdCakfXi8/cXlb+r+Box+TiXRSTT2Y4AZibmbIghMAv0ub2MuVr5b2r9
 1Til1y+gGZhqIoMD+Vb+LnECJhdAI27hz2oegtMvm4rkC6WhZcFrThWsWBE9Rx8y
 He+BxjRHNvWtKrv+8OhLW78LgnJ6EsIg6He5adjk43Q42OHZ6duBo5x28tjvFD4U
 Ul+0vsfPcapj8TSKZewAiznUTN3fkxR9WUIVOsJM6bTJqdNujDnd9kp7lSCP32ga
 t67kmP/ntm+99t47Dzo3yNrU7BPm/tbpf2WLI179uGlxuL6zcq8=
 =WaOH
 -----END PGP SIGNATURE-----

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: Conor 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-16 23:02:21 +02:00
commit 09427e1975
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/riscv/Kconfig.socs
View file

@ -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.

6
drivers/soc/microchip/mpfs-sys-controller.c
View file

@ -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);

2
drivers/soc/sifive/Kconfig
View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
if SOC_SIFIVE || SOC_STARFIVE
if ARCH_SIFIVE || ARCH_STARFIVE
config SIFIVE_CCACHE
bool "Sifive Composable Cache controller"