diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 17:15:16 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 17:15:17 +0300 |
| commit | 56f0fafd5b7771cbf5ca417e18a7e2011d57dd7a (patch) | |
| tree | 4e1c8ed5b6cba2923aadcf0fb1f92a91b9886017 /arch/arm | |
| parent | 9cfb800b263176c681529b5d8420c18d356483e9 (diff) | |
| parent | a22f00c0167f459a19a4828d3c24943ae4694418 (diff) | |
| download | linux-56f0fafd5b7771cbf5ca417e18a7e2011d57dd7a.tar.xz | |
Merge tag 'zynq-soc-for-6.9' of https://github.com/Xilinx/linux-xlnx into soc/arm
ARM: Zynq SoC changes for 6.9
- Fix kernel-doc
- Removed one useless header
* tag 'zynq-soc-for-6.9' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: Remove clk/zynq.h header
ARM: zynq: slcr: fix function prototype kernel-doc warnings
Link: https://lore.kernel.org/r/CAHTX3dJpawPhgVxSsXuSvG20JY9r4EkJu2NrrH1OKRjKxTpNAA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-zynq/slcr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 9765b3f4c2fc..6aae14b0736c 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -10,7 +10,6 @@ #include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/regmap.h> -#include <linux/clk/zynq.h> #include "common.h" /* register offsets */ @@ -146,7 +145,7 @@ void zynq_slcr_cpu_stop(int cpu) } /** - * zynq_slcr_cpu_state - Read/write cpu state + * zynq_slcr_cpu_state_read - Read cpu state * @cpu: cpu number * * SLCR_REBOOT_STATUS save upper 2 bits (31/30 cpu states for cpu0 and cpu1) @@ -165,7 +164,7 @@ bool zynq_slcr_cpu_state_read(int cpu) } /** - * zynq_slcr_cpu_state - Read/write cpu state + * zynq_slcr_cpu_state_write - Write cpu state * @cpu: cpu number * @die: cpu state - true if cpu is going to die * |