repo diff project bionic/ diff --git a/libc/kernel/uapi/linux/input-event-codes.h b/libc/kernel/uapi/linux/input-event-codes.h index 732e9b7bc..4bb8c40b4 100644 --- a/libc/kernel/uapi/linux/input-event-codes.h +++ b/libc/kernel/uapi/linux/input-event-codes.h @@ -660,7 +660,7 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 #define KEY_MIN_INTERESTING KEY_MUTE -#define KEY_MAX 0x2ff +#define KEY_MAX 0x3ff #define KEY_CNT (KEY_MAX + 1) #define REL_X 0x00 #define REL_Y 0x01 project common/ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_eagle_3g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_eagle_3g.dts old mode 100644 new mode 100755 index 91dc68e4ea8a..c05ac2fbe03a --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_eagle_3g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_eagle_3g.dts @@ -1755,7 +1755,7 @@ REMOTE_KEY(0x6A,466) /*SA02 OTT Shortcut 1*/ REMOTE_KEY(0x6B,467) /*SA02 OTT Shortcut 2*/ REMOTE_KEY(0x75,468) /*SA02 OTT Shortcut 3*/ - REMOTE_KEY(0x6C,469) /*SA02 YouTube*/ + REMOTE_KEY(0x6C,1015) /*SA02 YouTube*/ // VaS, start add integrated power key of SKB RCU by Logan@20190412 // Vendor : 0xF1(yuwon), Version : 0x0 ~ 0xA, Total : 11 REMOTE_KEY(0x00F1,528) @@ -2129,7 +2129,7 @@ REMOTE_KEY(0x6A,466) /*SA02 OTT Shortcut 1*/ REMOTE_KEY(0x6B,467) /*SA02 OTT Shortcut 2*/ REMOTE_KEY(0x75,468) /*SA02 OTT Shortcut 3*/ - REMOTE_KEY(0x6C,469) /*SA02 YouTube*/ + REMOTE_KEY(0x6C,1015) /*SA02 YouTube*/ // VaS, start add integrated power key of SKB RCU by Logan@20190412 // Vendor : 0xF1(yuwon), Version : 0x0 ~ 0xA, Total : 11 REMOTE_KEY(0x00F1,528) diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index cb77e543ee8f..e21a8f3f48f8 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -656,7 +656,6 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_LOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index df841a72b804..7403bf8d0d3d 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -284,7 +284,7 @@ struct pcmcia_device_id { /* Input */ #define INPUT_DEVICE_ID_EV_MAX 0x1f #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING 0x71 -#define INPUT_DEVICE_ID_KEY_MAX 0x2ff +#define INPUT_DEVICE_ID_KEY_MAX 0x3ff #define INPUT_DEVICE_ID_REL_MAX 0x0f #define INPUT_DEVICE_ID_ABS_MAX 0x3f #define INPUT_DEVICE_ID_MSC_MAX 0x07 diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index b584868e1b26..b082ff735e83 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -686,7 +686,7 @@ /* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE -#define KEY_MAX 0x2ff +#define KEY_MAX 0x3ff #define KEY_CNT (KEY_MAX+1) /* project vendor/foxconn/ diff --git a/keyboards/Aml_keypad.kl b/keyboards/Aml_keypad.kl old mode 100644 new mode 100755 index ae217b4..d6ff332 --- a/keyboards/Aml_keypad.kl +++ b/keyboards/Aml_keypad.kl @@ -179,7 +179,7 @@ key 465 SKB_FUNC_56 # SA02 OTT key 466 SKB_FUNC_57 # SA02 OTT Shortcut 1 key 467 SKB_FUNC_58 # SA02 OTT Shortcut 2 key 468 SKB_FUNC_59 # SA02 OTT Shortcut 3 -key 469 SKB_FUNC_60 # SA02 YouTube +key 1015 SKB_FUNC_60 # SA02 YouTube # Gamepad buttons #key 256 SKB_FUNC_20 diff --git a/keyboards/Vendor_005d_Product_0007.kl b/keyboards/Vendor_005d_Product_0007.kl index f46977c..769f30c 100755 --- a/keyboards/Vendor_005d_Product_0007.kl +++ b/keyboards/Vendor_005d_Product_0007.kl @@ -176,7 +176,7 @@ key 465 SKB_FUNC_56 # SA02 OTT key 466 SKB_FUNC_57 # SA02 OTT Shortcut 1 key 467 SKB_FUNC_58 # SA02 OTT Shortcut 2 key 468 SKB_FUNC_59 # SA02 OTT Shortcut 3 -key 469 SKB_FUNC_60 # SA02 YouTube +key 1015 SKB_FUNC_60 # SA02 YouTube # Gamepad buttons diff --git a/prebuilts/module/gpio_keypad.ko b/prebuilts/module/gpio_keypad.ko index 3078af0..38aea7e 100644 Binary files a/prebuilts/module/gpio_keypad.ko and b/prebuilts/module/gpio_keypad.ko differ diff --git a/prebuilts/module/remote.ko b/prebuilts/module/remote.ko index 462bb5c..2b11cb7 100644 Binary files a/prebuilts/module/remote.ko and b/prebuilts/module/remote.ko differ project vendor/skb/prebuilts/boot_config/ diff --git a/version.txt b/version.txt index 9553f60a..5f670b71 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -15.543.17 +15.543.1702