mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

A few Qualcomm driver fixes for v6.9 

This fixes a "defined but not used"-warning in SPM driver when kernel is
 built without regulator support, and corrects a couple of kernel-doc
 issues in aoss and geni-se drivers.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmXn4QEVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FU0oQAK85IzmIeso/NfydQUfdmE6EE+xM
 vlCCteYJG68Y38uxiQnyx7jCyj8czIt4oZ+t3GoduIiUFJ/6ACV2yNJMMRSWixIc
 fXMM0HU+zgfeRyCXx9diuobbahVNFPjkjKF7y9vog7fL5uQSirXD/MwFu7/o3SZf
 2UtDp2JTKexbo1/DNlIbB8OM0tzCFS55rodE7Rw6tZGaa8mt5D9lTS6wtnsyftM4
 IyRBk53R8yeDO1fnitW6si/RSDBeT7yauy1MfOR7Ofo5xkBhHHcyCGIfa3+6pUtz
 waDnXTd1nTcFvJTwoAgVw1XWVm60YAm76NZYyUOzntsBS5D03MQX+ao3AKvdjxIa
 OUdts6EWqJtdoY7Y/UJbPpO5cZ/10r1z+Mka+9tG6UjTUv2xnxUc6ND/7pFGwmLo
 2m7VS8eAcNw2OogrOjNtdR1jS/Fd57lXq8KPbSEgm+r8yw7GE2jJEsM1mbLTo+O+
 CABdHKnDmDWePuLOT1qP0cR72QwVI5ERaZjMdwbdgqMsWp/KmmETLtb5N5PoTXnQ
 vj70YBE2WYL/YNzc03BJe4rH1EvSSGzb5BKwEAYnnfx6HSsJHqyfQBJV6cGCFl3u
 sloRMClPG19CS+eQtHhLCC4SfiH5o7iRYmCZCeyKqmqlvevaBvbflmELgb8xpxry
 YiwXKkTOc5UcW1Ez
 =3ZwG
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXoEKIACgkQYKtH/8kJ
 Uifl6Q//YmyyNOucScttDSu/Nf2NlYo/FT7Rl8mrZgK1Aa6k35l+OfYn2qnJG6o6
 O4tsx6JTAWKqbJNa1pCfqeLR98LZRaKx05ZXmR7cAOa33BtZZt5q+oG7KayO9/Qu
 e7Pp26qOE4k89am+a10A3V3Qiy/QNjXGMx4Ihv1y+forbpWi6n/eiUn9i2IWcIkd
 HmCkkxkLmI7P/q1cN8g9m1FMnC+C6kw8M3jz3Ok7JEgwkJu91sRMOuQbLaHgwJiC
 OdEOdtNFLMzoBEJObTZkR1crgNd3uJ9zMrKoTsRu6QzSgovJ2LO0z8yqOfM613iY
 hj706gcWBSnK4eBnmMFFWYDQGzVmqqfJnCvuBzGi312uC2IDom762sx0Ha5I49PV
 p69IESO6R3aE7wp5AC9cwYlOxWF8PKhnd+FtOr+fM/xfyETJLcPJxvZk5VllIgUN
 MHXY3k9bsKNXOa0h2B8gxe+Sm5/YTKQd7ToIIM6pBVOqWXckzdq5L/wiFk4f3/hk
 2RoAwqGAdbzTMVKGoN5LMNcsOmZxSEXL7a1KO1EcXM9wq8o1tfXQUFdrqb6VpT3I
 tVxN0P7mJ3aQalo9K0fJB+R8ImgDAhuZ2HFEALpZ0ve/H00cOL+8bt3kS7g2GhGb
 mbkAUfiq3kfwUH1MCx9yfKdGyMBT/jD1jfTC9rsiblDWVbrl5wg=
 =+egw
 -----END PGP SIGNATURE-----

Merge tag 'qcom-drivers-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers

A few Qualcomm driver fixes for v6.9

This fixes a "defined but not used"-warning in SPM driver when kernel is
built without regulator support, and corrects a couple of kernel-doc
issues in aoss and geni-se drivers.

* tag 'qcom-drivers-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: aoss: add missing kerneldoc for qmp members
  soc: qcom: geni-se: drop unused kerneldoc struct geni_wrapper param
  soc: qcom: spm: fix building with CONFIG_REGULATOR=n

Link: https://lore.kernel.org/r/20240306032120.5036-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-03-06 07:43:46 +01:00
parent 469f6acd9a 9f378a6216
commit 049238d244
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/soc/qcom/qcom-geni-se.c
View File

@ -89,7 +89,6 @@
* @base: Base address of this instance of QUP wrapper core
* @clks: Handle to the primary & optional secondary AHB clocks
* @num_clks: Count of clocks
* @to_core: Core ICC path
*/
struct geni_wrapper {
struct device *dev;

2
drivers/soc/qcom/qcom_aoss.c
View File

@ -71,6 +71,8 @@ struct qmp_cooling_device {
* @tx_lock: provides synchronization between multiple callers of qmp_send()
* @qdss_clk: QDSS clock hw struct
* @cooling_devs: thermal cooling devices
* @debugfs_root: directory for the developer/tester interface
* @debugfs_files: array of individual debugfs entries under debugfs_root
*/
struct qmp {
void __iomem *msgram;

12
drivers/soc/qcom/spm.c
View File

@ -411,7 +411,6 @@ static int spm_get_cpu(struct device *dev)
return -EOPNOTSUPP;
}
#ifdef CONFIG_REGULATOR
static int spm_register_regulator(struct device *dev, struct spm_driver_data *drv)
{
struct regulator_config config = {
@ -474,12 +473,6 @@ static int spm_register_regulator(struct device *dev, struct spm_driver_data *dr
return 0;
}
#else
static int spm_register_regulator(struct device *dev, struct spm_driver_data *drv)
{
return 0;
}
#endif
static const struct of_device_id spm_match_table[] = {
{ .compatible = "qcom,sdm660-gold-saw2-v4.1-l2",
@ -559,7 +552,10 @@ static int spm_dev_probe(struct platform_device *pdev)
if (drv->reg_data->reg_offset[SPM_REG_SPM_CTL])
spm_set_low_power_mode(drv, PM_SLEEP_MODE_STBY);
return spm_register_regulator(&pdev->dev, drv);
if (IS_ENABLED(CONFIG_REGULATOR))
return spm_register_regulator(&pdev->dev, drv);
return 0;
}
static struct platform_driver spm_driver = {