diff --git a/config/kernel/linux-rockchip64-default.config b/config/kernel/linux-rockchip64-default.config index c1c9b6a683..981ecc52bb 100644 --- a/config/kernel/linux-rockchip64-default.config +++ b/config/kernel/linux-rockchip64-default.config @@ -3371,7 +3371,7 @@ CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_DIBUSB_MB=m # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_DIBUSB_MC=m -# CONFIG_DVB_USB_DIB0700 is not set +CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_CXUSB=m CONFIG_DVB_USB_M920X=m diff --git a/patch/kernel/rockchip64-default/media-usb-dvb-dib0700.patch b/patch/kernel/rockchip64-default/media-usb-dvb-dib0700.patch new file mode 100644 index 0000000000..89c5679091 --- /dev/null +++ b/patch/kernel/rockchip64-default/media-usb-dvb-dib0700.patch @@ -0,0 +1,336 @@ +--- a/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:04:06.615412788 +0200 ++++ b/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:05:04.005761125 +0200 +@@ -519,7 +519,7 @@ + static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d) + { + u8 key[4]; +- enum rc_type protocol; ++ enum rc_proto protocol; + u32 scancode; + u8 toggle; + int i; +@@ -548,7 +548,7 @@ + dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */ + + switch (d->props.rc.core.protocol) { +- case RC_BIT_NEC: ++ case RC_PROTO_BIT_NEC: + /* NEC protocol sends repeat code as 0 0 0 FF */ + if ((key[3-2] == 0x00) && (key[3-3] == 0x00) && + (key[3] == 0xff)) { +@@ -556,14 +556,14 @@ + return 0; + } + +- protocol = RC_TYPE_NEC; ++ protocol = RC_PROTO_NEC; + scancode = RC_SCANCODE_NEC(key[3-2], key[3-3]); + toggle = 0; + break; + + default: + /* RC-5 protocol changes toggle bit on new keypress */ +- protocol = RC_TYPE_RC5; ++ protocol = RC_PROTO_RC5; + scancode = RC_SCANCODE_RC5(key[3-2], key[3-3]); + toggle = key[3-1]; + break; +@@ -3887,9 +3887,9 @@ + .rc_interval = DEFAULT_RC_INTERVAL, + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -3927,9 +3927,9 @@ + .rc_interval = DEFAULT_RC_INTERVAL, + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -3992,9 +3992,9 @@ + .rc_interval = DEFAULT_RC_INTERVAL, + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4037,9 +4037,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4118,9 +4118,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4163,9 +4163,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4220,9 +4220,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4286,9 +4286,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4335,9 +4335,9 @@ + .rc_codes = RC_MAP_DIB0700_NEC_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4404,9 +4404,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4440,9 +4440,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4516,9 +4516,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4560,9 +4560,9 @@ + .rc_codes = RC_MAP_DIB0700_NEC_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4609,9 +4609,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4646,9 +4646,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4683,9 +4683,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4720,9 +4720,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4757,9 +4757,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4794,9 +4794,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4845,9 +4845,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4880,9 +4880,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4917,9 +4917,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, +@@ -4955,9 +4955,9 @@ + .rc_codes = RC_MAP_DIB0700_RC5_TABLE, + .module_name = "dib0700", + .rc_query = dib0700_rc_query_old_firmware, +- .allowed_protos = RC_BIT_RC5 | +- RC_BIT_RC6_MCE | +- RC_BIT_NEC, ++ .allowed_protos = RC_PROTO_BIT_RC5 | ++ RC_PROTO_BIT_RC6_MCE | ++ RC_PROTO_BIT_NEC, + .change_protocol = dib0700_change_protocol, + }, + },