tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 6865ed7d 32687c06

+50 -3
+1 -1
arch/arm/mach-imx/Kconfig
··· 242 242 243 243 config VF_USE_PIT_TIMER 244 244 bool "Use PIT timer" 245 - select VF_PIT_TIMER 245 + select NXP_PIT_TIMER 246 246 help 247 247 Use SoC Periodic Interrupt Timer (PIT) as clocksource 248 248
+2 -2
arch/arm64/boot/dts/freescale/imx8mp.dtsi
··· 298 298 cpu-thermal { 299 299 polling-delay-passive = <250>; 300 300 polling-delay = <2000>; 301 - thermal-sensors = <&tmu 0>; 301 + thermal-sensors = <&tmu 1>; 302 302 trips { 303 303 cpu_alert0: trip0 { 304 304 temperature = <85000>; ··· 331 331 soc-thermal { 332 332 polling-delay-passive = <250>; 333 333 polling-delay = <2000>; 334 - thermal-sensors = <&tmu 1>; 334 + thermal-sensors = <&tmu 0>; 335 335 trips { 336 336 soc_alert0: trip0 { 337 337 temperature = <85000>;
+47
include/linux/firmware/imx/sm.h
··· 26 26 #define SCMI_IMX94_CTRL_SAI3_MCLK 5U /*!< WAKE SAI3 MCLK */ 27 27 #define SCMI_IMX94_CTRL_SAI4_MCLK 6U /*!< WAKE SAI4 MCLK */ 28 28 29 + #if IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) 29 30 int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val); 30 31 int scmi_imx_misc_ctrl_set(u32 id, u32 val); 32 + #else 33 + static inline int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val) 34 + { 35 + return -EOPNOTSUPP; 36 + } 31 37 38 + static inline int scmi_imx_misc_ctrl_set(u32 id, u32 val) 39 + { 40 + return -EOPNOTSUPP; 41 + } 42 + #endif 43 + 44 + #if IS_ENABLED(CONFIG_IMX_SCMI_CPU_DRV) 32 45 int scmi_imx_cpu_start(u32 cpuid, bool start); 33 46 int scmi_imx_cpu_started(u32 cpuid, bool *started); 34 47 int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start, bool boot, 35 48 bool resume); 49 + #else 50 + static inline int scmi_imx_cpu_start(u32 cpuid, bool start) 51 + { 52 + return -EOPNOTSUPP; 53 + } 54 + 55 + static inline int scmi_imx_cpu_started(u32 cpuid, bool *started) 56 + { 57 + return -EOPNOTSUPP; 58 + } 59 + 60 + static inline int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start, 61 + bool boot, bool resume) 62 + { 63 + return -EOPNOTSUPP; 64 + } 65 + #endif 36 66 37 67 enum scmi_imx_lmm_op { 38 68 SCMI_IMX_LMM_BOOT, ··· 74 44 #define SCMI_IMX_LMM_OP_FORCEFUL 0 75 45 #define SCMI_IMX_LMM_OP_GRACEFUL BIT(0) 76 46 47 + #if IS_ENABLED(CONFIG_IMX_SCMI_LMM_DRV) 77 48 int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags); 78 49 int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info); 79 50 int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector); 51 + #else 52 + static inline int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags) 53 + { 54 + return -EOPNOTSUPP; 55 + } 56 + 57 + static inline int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info) 58 + { 59 + return -EOPNOTSUPP; 60 + } 61 + 62 + static inline int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector) 63 + { 64 + return -EOPNOTSUPP; 65 + } 66 + #endif 80 67 #endif