Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Zynq SoC changes for 6.9

Browse Source 
- Fix kernel-doc
 - Removed one useless header
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQbPNTMvXmYlBPRwx7KSWXLKUoMIQUCZdx+AwAKCRDKSWXLKUoM
 Id/MAJsFX4ebOn60dtvZPFnNJbs7ROGPNQCfQ3BrNcfLMhIEwjDdxkBHjtfkCVY=
 =uy9J
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXl13UACgkQYKtH/8kJ
 UiclZQ/7BKUCwj9sP+YaDr0XWLkk9xxRuyyXDUQfD2DRwko9I51IxtaogtRrhRbI
 VPYRhYCgypCfOgkCoe/wRk87qz69Olde0TXrtxqC1Bo0C7T1ZsMSlC5kUnWfNtnl
 U2gypPAl6cm09LIeWr1r8ocUcaetKpJ4cDAVS5ORtw1Re93hwQzhGz53gyZJlmlG
 jZu5+sBiQdRdijXTadUenLUwXuhZIw2r/TlRqaR15mas4av6bb0zoW8zr6268qsn
 IdxiaGH+JdMGfrxPXwY4tvh+9c4vLg3HSoo+6aa/6aJW6xzKyOXMUV6FmjyY//pk
 3b1LsUSO6Elhnl0KVvKHyiNiW7Btml28L2uDF1TrQ+qgkIQxyLDxjYhuhwWZq3GB
 KZzv2wfff3Pgy5bh5GesykH3NGSPZV23pYGrp8ipQseEuQ8cF3dK8OD6qIuySa2X
 xYzGQYCj5/0vIpftrWT/E1CYekPkDrT2OXpUSTpO5Yt8UVl9kS0jJGs79a2zlsjD
 YcWCy5jrSm9nC3d2cYaZTikYBoiz/xZkWKz6SoTTRX3vnQIeq/0otxO4Gni0HFjZ
 uzHjqAUNIhwQ/uiJdjhvvfpfbeLr3ZMqknHx8UwnYDYuGx1L7Z+ljWhK6jjAU2Nx
 /YdtnjEZlp4uL213MHyNJd4JVV0niWCZoWSHD3rTTQIFkjdsPv0=
 =AVfV
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2024-03-04 15:15:16 +01:00
commit 56f0fafd5b
1 changed files with 2 additions and 3 deletions
Show Stats 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
*