From b4d14bc81ad580000277deae5d51e3e3ef09875f Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 17 Jun 2020 18:19:18 +0200 Subject: Convert CONFIG_ARMV7_PSCI_1_0 and CONFIG_ARMV7_PSCI_0_2 to Kconfig This converts the following to Kconfig: CONFIG_ARMV7_PSCI_1_0 CONFIG_ARMV7_PSCI_0_2 Signed-off-by: Patrick Delaunay --- arch/arm/cpu/armv7/Kconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch/arm/cpu/armv7') diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig index 14569e560b..8eee801dce 100644 --- a/arch/arm/cpu/armv7/Kconfig +++ b/arch/arm/cpu/armv7/Kconfig @@ -41,6 +41,20 @@ config ARMV7_PSCI help Say Y here to enable PSCI support. +choice + prompt "Supported PSCI version" + depends on ARMV7_PSCI + default ARMV7_PSCI_1_0 + help + Select the supported PSCI version. + +config ARMV7_PSCI_1_0 + bool "PSCI V1.0" + +config ARMV7_PSCI_0_2 + bool "PSCI V0.2" +endchoice + config ARMV7_PSCI_NR_CPUS int "Maximum supported CPUs for PSCI" depends on ARMV7_NONSEC -- cgit From b75d8dc5642b71eb029e7cd38031a32029e736cc Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 26 Jun 2020 15:13:33 +0900 Subject: treewide: convert bd_t to struct bd_info by coccinelle The Linux coding style guide (Documentation/process/coding-style.rst) clearly says: It's a **mistake** to use typedef for structures and pointers. Besides, using typedef for structures is annoying when you try to make headers self-contained. Let's say you have the following function declaration in a header: void foo(bd_t *bd); This is not self-contained since bd_t is not defined. To tell the compiler what 'bd_t' is, you need to include #include void foo(bd_t *bd); Then, the include direcective pulls in more bloat needlessly. If you use 'struct bd_info' instead, it is enough to put a forward declaration as follows: struct bd_info; void foo(struct bd_info *bd); Right, typedef'ing bd_t is a mistake. I used coccinelle to generate this commit. The semantic patch that makes this change is as follows: @@ typedef bd_t; @@ -bd_t +struct bd_info Signed-off-by: Masahiro Yamada --- arch/arm/cpu/armv7/ls102xa/cpu.c | 4 ++-- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/vf610/generic.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/arm/cpu/armv7') diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 91e988217a..ce472aa9bd 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -293,13 +293,13 @@ int print_cpuinfo(void) #endif #ifdef CONFIG_FSL_ESDHC -int cpu_mmc_init(bd_t *bis) +int cpu_mmc_init(struct bd_info *bis) { return fsl_esdhc_mmc_init(bis); } #endif -int cpu_eth_init(bd_t *bis) +int cpu_eth_init(struct bd_info *bis) { #if defined(CONFIG_TSEC_ENET) && !defined(CONFIG_DM_ETH) tsec_standard_init(bis); diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 56ca7b0164..d8cb78ecc6 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -82,7 +82,7 @@ void ft_fixup_enet_phy_connect_type(void *fdt) } } -void ft_cpu_setup(void *blob, bd_t *bd) +void ft_cpu_setup(void *blob, struct bd_info *bd) { int off; int val; diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index fd2ab37a8f..743bfced64 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -341,7 +341,7 @@ int arch_misc_init(void) } #endif -int cpu_eth_init(bd_t *bis) +int cpu_eth_init(struct bd_info *bis) { int rc = -ENODEV; @@ -353,7 +353,7 @@ int cpu_eth_init(bd_t *bis) } #ifdef CONFIG_FSL_ESDHC_IMX -int cpu_mmc_init(bd_t *bis) +int cpu_mmc_init(struct bd_info *bis) { return fsl_esdhc_mmc_init(bis); } -- cgit