Merge branch 'for-6.17/battery-timer-fixes' into for-linus

- avoid setting up battery timer for Apple and Magicmouse devices without
  battery (Aditya Garg)

diff --cc drivers/hid/hid-apple.c
index 601cfcb79ee364d057c8c30a81278d70582e8972,321475843fe7a0c3cdde4691b644dd0ad8e72c6f..61404d7a43ee1eaafb09c4b48c122428bd3a95f4
--- 1/drivers/hid/hid-apple.c
--- 2/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@@ -42,13 -42,11 +42,13 @@@
  #define APPLE_BACKLIGHT_CTL   BIT(10)
  #define APPLE_IS_NON_APPLE    BIT(11)
  #define APPLE_MAGIC_BACKLIGHT BIT(12)
 +#define APPLE_DISABLE_FKEYS   BIT(13)
  
 -#define APPLE_FLAG_FKEY               0x01
 +#define APPLE_FLAG_FKEY               BIT(0)
 +#define APPLE_FLAG_TB_FKEY    BIT(1)
  
  #define HID_COUNTRY_INTERNATIONAL_ISO 13
- #define APPLE_BATTERY_TIMEOUT_MS      60000
+ #define APPLE_BATTERY_TIMEOUT_SEC     60
  
  #define HID_USAGE_MAGIC_BL                    0xff00000f
  #define APPLE_MAGIC_REPORT_ID_POWER           3