mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
bc2da26599
While moving all the reset code in the PolarFire SoC clock driver to the
reset subsystem, I removed an `#if IS_ENABLED(RESET_CONTROLLER)` from
the driver and moved it to the header, however this was not the correct
thing to do. In the driver such a condition over-eagerly provided a
complete implementation for mpfs_reset_{read,write}() when the reset
subsystem was enabled without the PolarFire SoC reset driver, but in the
header it meant that when the subsystem was enabled and the driver was
not, no implementation for mpfs_reset_controller_register() was
provided. Fix the condition so that the stub implementation of
mpfs_reset_controller_register() is used when the reset driver is
disabled.
Fixes: 098c290a49 ("clock, reset: microchip: move all mpfs reset code to the reset subsystem")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202405082259.44DzHvaN-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202405082200.tBrEs5CZ-lkp@intel.com/
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240508-unabashed-cheese-8f645b4f69ba@spud
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
54 lines
1.3 KiB
C
54 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
*
|
|
* Microchip PolarFire SoC (MPFS)
|
|
*
|
|
* Copyright (c) 2020 Microchip Corporation. All rights reserved.
|
|
*
|
|
* Author: Conor Dooley <conor.dooley@microchip.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef __SOC_MPFS_H__
|
|
#define __SOC_MPFS_H__
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/of_device.h>
|
|
|
|
struct mpfs_sys_controller;
|
|
|
|
struct mpfs_mss_msg {
|
|
u8 cmd_opcode;
|
|
u16 cmd_data_size;
|
|
struct mpfs_mss_response *response;
|
|
u8 *cmd_data;
|
|
u16 mbox_offset;
|
|
u16 resp_offset;
|
|
};
|
|
|
|
struct mpfs_mss_response {
|
|
u32 resp_status;
|
|
u32 *resp_msg;
|
|
u16 resp_size;
|
|
};
|
|
|
|
#if IS_ENABLED(CONFIG_POLARFIRE_SOC_SYS_CTRL)
|
|
|
|
int mpfs_blocking_transaction(struct mpfs_sys_controller *mpfs_client, struct mpfs_mss_msg *msg);
|
|
|
|
struct mpfs_sys_controller *mpfs_sys_controller_get(struct device *dev);
|
|
|
|
struct mtd_info *mpfs_sys_controller_get_flash(struct mpfs_sys_controller *mpfs_client);
|
|
|
|
#endif /* if IS_ENABLED(CONFIG_POLARFIRE_SOC_SYS_CTRL) */
|
|
|
|
#if IS_ENABLED(CONFIG_MCHP_CLK_MPFS)
|
|
#if IS_ENABLED(CONFIG_RESET_POLARFIRE_SOC)
|
|
int mpfs_reset_controller_register(struct device *clk_dev, void __iomem *base);
|
|
#else
|
|
static inline int mpfs_reset_controller_register(struct device *clk_dev, void __iomem *base) { return 0; }
|
|
#endif /* if IS_ENABLED(CONFIG_RESET_POLARFIRE_SOC) */
|
|
#endif /* if IS_ENABLED(CONFIG_MCHP_CLK_MPFS) */
|
|
|
|
#endif /* __SOC_MPFS_H__ */
|