Advertisement
Guest User

Untitled

a guest
Jun 22nd, 2017
59
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.86 KB | None | 0 0
  1. diff -uNr linux-2.6.35/drivers/hid/hid-apple.c linux-2.6.35-MacbookAir/drivers/hid/hid-apple.c
  2. --- linux-2.6.35/drivers/hid/hid-apple.c 2010-08-02 00:11:14.000000000 +0200
  3. +++ linux-2.6.35-MacbookAir/drivers/hid/hid-apple.c 2010-10-24 07:35:23.437176002 +0200
  4. @@ -439,6 +439,18 @@
  5. .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
  6. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
  7. .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
  8. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
  9. + .driver_data = APPLE_HAS_FN },
  10. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
  11. + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
  12. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
  13. + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
  14. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
  15. + .driver_data = APPLE_HAS_FN },
  16. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
  17. + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
  18. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
  19. + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
  20. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
  21. .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
  22. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
  23. diff -uNr linux-2.6.35/drivers/hid/hid-core.c linux-2.6.35-MacbookAir/drivers/hid/hid-core.c
  24. --- linux-2.6.35/drivers/hid/hid-core.c 2010-10-23 06:59:31.000000000 +0200
  25. +++ linux-2.6.35-MacbookAir/drivers/hid/hid-core.c 2010-10-24 07:40:57.055679001 +0200
  26. @@ -1276,6 +1276,12 @@
  27. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
  28. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
  29. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
  30. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI) },
  31. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO) },
  32. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS) },
  33. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
  34. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
  35. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
  36. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
  37. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
  38. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
  39. @@ -1736,6 +1742,12 @@
  40. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
  41. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
  42. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
  43. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI) },
  44. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO) },
  45. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS) },
  46. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
  47. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
  48. + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
  49. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
  50. { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
  51. { }
  52. diff -uNr linux-2.6.35/drivers/hid/hid-ids.h linux-2.6.35-MacbookAir/drivers/hid/hid-ids.h
  53. --- linux-2.6.35/drivers/hid/hid-ids.h 2010-10-23 06:59:31.000000000 +0200
  54. +++ linux-2.6.35-MacbookAir/drivers/hid/hid-ids.h 2010-10-24 07:34:52.632586002 +0200
  55. @@ -94,6 +94,12 @@
  56. #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
  57. #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
  58. #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
  59. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x0242
  60. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0243
  61. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0244
  62. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x023f
  63. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0240
  64. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0241
  65. #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
  66. #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
  67. #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
  68. diff -uNr linux-2.6.35/drivers/hwmon/applesmc.c linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c
  69. --- linux-2.6.35/drivers/hwmon/applesmc.c 2010-08-02 00:11:14.000000000 +0200
  70. +++ linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c 2010-10-24 07:45:02.085679002 +0200
  71. @@ -162,6 +162,8 @@
  72. /* Set 22: MacBook Pro 7,1 */
  73. { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S",
  74. "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL },
  75. +/* Set 23: MacBook Air 3,1 */
  76. + { "TB0T", "TB1T", "TB2T", "TC0D", "TN0D", "Tp0P", "Ts0P", "Ts0S", NULL },
  77. };
  78.  
  79. /* List of keys used to read/write fan speeds */
  80. @@ -1524,11 +1526,21 @@
  81. { .accelerometer = 1, .light = 1, .temperature_set = 21 },
  82. /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
  83. { .accelerometer = 1, .light = 1, .temperature_set = 22 },
  84. +/* MacBook Air 3,1: accelerometer, backlight and temperature set 15 */
  85. + { .accelerometer = 0, .light = 0, .temperature_set = 23 },
  86. };
  87.  
  88. /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
  89. * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
  90. static __initdata struct dmi_system_id applesmc_whitelist[] = {
  91. + { applesmc_dmi_match, "Apple MacBook Air 3", {
  92. + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
  93. + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2") },
  94. + &applesmc_dmi_data[23]},
  95. + { applesmc_dmi_match, "Apple MacBook Air 3", {
  96. + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
  97. + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1") },
  98. + &applesmc_dmi_data[23]},
  99. { applesmc_dmi_match, "Apple MacBook Air 2", {
  100. DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
  101. DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") },
  102. diff -uNr linux-2.6.35/drivers/hwmon/Module.symvers linux-2.6.35-MacbookAir/drivers/hwmon/Module.symvers
  103. --- linux-2.6.35/drivers/hwmon/Module.symvers 1970-01-01 01:00:00.000000000 +0100
  104. +++ linux-2.6.35-MacbookAir/drivers/hwmon/Module.symvers 2010-10-23 07:23:13.500291002 +0200
  105. @@ -0,0 +1,9 @@
  106. +0x6c33e494 lis3lv02d_joystick_disable drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  107. +0x3c313751 lis3_dev drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  108. +0x3bfe0261 lis3lv02d_init_device drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  109. +0xe6af28c8 lis3lv02d_joystick_enable drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  110. +0xbf3e2036 lis3lv02d_poweron drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  111. +0x7f2fdb99 lis3lv02d_poweroff drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  112. +0x0903c239 vid_from_reg drivers/hwmon/hwmon-vid EXPORT_SYMBOL
  113. +0xef1c781c vid_which_vrm drivers/hwmon/hwmon-vid EXPORT_SYMBOL
  114. +0x8af65828 lis3lv02d_remove_fs drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
  115. diff -uNr linux-2.6.35/drivers/input/mouse/bcm5974.c linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c
  116. --- linux-2.6.35/drivers/input/mouse/bcm5974.c 2010-10-23 06:59:31.000000000 +0200
  117. +++ linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c 2010-10-24 07:38:15.795679002 +0200
  118. @@ -55,6 +55,14 @@
  119. #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
  120. #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
  121. #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
  122. +/* MacbookAir3,1 (unibody), aka wellspring4 */
  123. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x0242
  124. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0243
  125. +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0244
  126. +/* MacbookAir3,2 (unibody), aka wellspring5 */
  127. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x023f
  128. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0240
  129. +#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0241
  130.  
  131. #define BCM5974_DEVICE(prod) { \
  132. .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
  133. @@ -80,6 +88,14 @@
  134. BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
  135. BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
  136. BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
  137. + /* MacbookAir3,1 */
  138. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
  139. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
  140. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
  141. + /* MacbookAir3,2 */
  142. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
  143. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
  144. + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
  145. /* Terminating entry */
  146. {}
  147. };
  148. @@ -229,6 +245,30 @@
  149. HAS_INTEGRATED_BUTTON,
  150. 0x84, sizeof(struct bt_data),
  151. 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
  152. + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
  153. + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
  154. + { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
  155. + { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
  156. + },
  157. + {
  158. + USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI,
  159. + USB_DEVICE_ID_APPLE_WELLSPRING4_ISO,
  160. + USB_DEVICE_ID_APPLE_WELLSPRING4_JIS,
  161. + HAS_INTEGRATED_BUTTON,
  162. + 0x84, sizeof(struct bt_data),
  163. + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
  164. + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
  165. + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
  166. + { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
  167. + { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
  168. + },
  169. + {
  170. + USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI,
  171. + USB_DEVICE_ID_APPLE_WELLSPRING5_ISO,
  172. + USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,
  173. + HAS_INTEGRATED_BUTTON,
  174. + 0x84, sizeof(struct bt_data),
  175. + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
  176. { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
  177. { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
  178. { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement