mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-20 09:59:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'zynq-soc-for-6.9' of https://github.com/Xilinx/linux-xlnx into soc/arm

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2024-03-04 15:15:16 +01:00
parent 9cfb800b26 a22f00c016
commit 56f0fafd5b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-zynq/slcr.c
View File

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