Unverified Commit 6865ed7d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.17-2' of... 

Merge tag 'imx-fixes-6.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.17, round 2:

- Fix mach-imx Kconfig to select the correct PIT timer option
  (Lukas Bulwahn)
- Correct thermal sensor index for i.MX8MP device tree (Peng Fan)
- Fix i.MX SCMI build error by adding stub API functions (Peng Fan)

* tag 'imx-fixes-6.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mp: Correct thermal sensor index
  ARM: imx: Kconfig: Adjust select after renamed config option
  firmware: imx: Add stub functions for SCMI CPU API
  firmware: imx: Add stub functions for SCMI LMM API
  firmware: imx: Add stub functions for SCMI MISC API

Link: https://lore.kernel.org/r/aMQs2zr4fYl2DYVr@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 32687c06 a50342f9

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ choice 


	config VF_USE_PIT_TIMER

		bool "Use PIT timer"

		select VF_PIT_TIMER

		select NXP_PIT_TIMER

		help

		  Use SoC Periodic Interrupt Timer (PIT) as clocksource

arch/arm64/boot/dts/freescale/imx8mp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ thermal-zones { 
		cpu-thermal {

			polling-delay-passive = <250>;

			polling-delay = <2000>;

			thermal-sensors = <&tmu 0>;

			thermal-sensors = <&tmu 1>;

			trips {

				cpu_alert0: trip0 {

					temperature = <85000>;
@@ -331,7 +331,7 @@ map0 { 
		soc-thermal {

			polling-delay-passive = <250>;

			polling-delay = <2000>;

			thermal-sensors = <&tmu 1>;

			thermal-sensors = <&tmu 0>;

			trips {

				soc_alert0: trip0 {

					temperature = <85000>;

include/linux/firmware/imx/sm.h

+47 −0
Original line number Diff line number Diff line
@@ -26,13 +26,43 @@ 
#define SCMI_IMX94_CTRL_SAI3_MCLK	5U	/*!< WAKE SAI3 MCLK */

#define SCMI_IMX94_CTRL_SAI4_MCLK	6U	/*!< WAKE SAI4 MCLK */



#if IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV)

int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val);

int scmi_imx_misc_ctrl_set(u32 id, u32 val);

#else

static inline int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_misc_ctrl_set(u32 id, u32 val)

{

	return -EOPNOTSUPP;

}

#endif



#if IS_ENABLED(CONFIG_IMX_SCMI_CPU_DRV)

int scmi_imx_cpu_start(u32 cpuid, bool start);

int scmi_imx_cpu_started(u32 cpuid, bool *started);

int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start, bool boot,

				  bool resume);

#else

static inline int scmi_imx_cpu_start(u32 cpuid, bool start)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_cpu_started(u32 cpuid, bool *started)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start,

						bool boot, bool resume)

{

	return -EOPNOTSUPP;

}

#endif



enum scmi_imx_lmm_op {

	SCMI_IMX_LMM_BOOT,
@@ -44,7 +74,24 @@ enum scmi_imx_lmm_op { 
#define SCMI_IMX_LMM_OP_FORCEFUL	0

#define SCMI_IMX_LMM_OP_GRACEFUL	BIT(0)



#if IS_ENABLED(CONFIG_IMX_SCMI_LMM_DRV)

int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags);

int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info);

int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector);

#else

static inline int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector)

{

	return -EOPNOTSUPP;

}

#endif

#endif