From: Jiri Kosina <jkosina@suse.com>
Date: Thu, 31 Jul 2025 20:42:08 +0000 (+0200)
Subject: Merge branch 'for-6.17/battery-timer-fixes' into for-linus
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=069e79a08103c684d31b638cbed82fcc3ac0fad3;p=thirdparty%2Flinux.git

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)
---

069e79a08103c684d31b638cbed82fcc3ac0fad3
diff --cc drivers/hid/hid-apple.c
index 601cfcb79ee36,321475843fe7a..61404d7a43ee1
--- a/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