Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "linux-driver-addons: use rc built in kernel"
This reverts commit 32dd87c.
- Loading branch information
Showing
7 changed files
with
215 additions
and
92 deletions.
There are no files selected for viewing
44 changes: 1 addition & 43 deletions
44
...ns/dvb/crazycat_aml/patches/amlogic-3.14/driver.dvb.crazycat_aml-02-disable-modules.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,13 @@ | ||
| --- a/v4l/scripts/make_kconfig.pl | ||
| +++ b/v4l/scripts/make_kconfig.pl | ||
| @@ -626,6 +626,52 @@ ($$) | ||
| @@ -626,6 +626,10 @@ ($$) | ||
| close OUT; | ||
|
|
||
| # These options should default to off | ||
| +disable_config('MEDIA_ANALOG_TV_SUPPORT'); | ||
| +disable_config('MEDIA_CAMERA_SUPPORT'); | ||
| +disable_config('MEDIA_CEC_SUPPORT'); | ||
| +disable_config('SOC_CAMERA'); | ||
| +disable_config('VIDEO_SAA7146_VV'); | ||
| +disable_config('RC_CORE'); | ||
| +disable_config('IR_NEC_DECODER'); | ||
| +disable_config('IR_RC5_DECODER'); | ||
| +disable_config('IR_RC6_DECODER'); | ||
| +disable_config('IR_JVC_DECODER'); | ||
| +disable_config('IR_SONY_DECODER'); | ||
| +disable_config('IR_SANYO_DECODER'); | ||
| +disable_config('IR_SHARP_DECODER'); | ||
| +disable_config('IR_MCE_KBD_DECODER'); | ||
| +disable_config('IR_XMP_DECODER'); | ||
| +disable_config('IR_IMON_DECODER'); | ||
| +disable_config('RC_ATI_REMOTE'); | ||
| +disable_config('IR_HIX5HD2'); | ||
| +disable_config('IR_IMON'); | ||
| +disable_config('IR_IMON_RAW'); | ||
| +disable_config('IR_ITE_CIR'); | ||
| +disable_config('IR_MCEUSB'); | ||
| +disable_config('IR_FINTEK'); | ||
| +disable_config('IR_MESON'); | ||
| +disable_config('IR_NUVOTON'); | ||
| +disable_config('IR_ENE'); | ||
| +disable_config('IR_REDRAT3'); | ||
| +disable_config('IR_RX51'); | ||
| +disable_config('IR_SPI'); | ||
| +disable_config('IR_STREAMZAP'); | ||
| +disable_config('IR_WINBOND_CIR'); | ||
| +disable_config('RC_LOOPBACK'); | ||
| +disable_config('IR_GPIO_CIR'); | ||
| +disable_config('IR_GPIO_TX'); | ||
| +disable_config('IR_PWM_TX'); | ||
| +disable_config('IR_IGORPLUGUSB'); | ||
| +disable_config('IR_IGUANA'); | ||
| +disable_config('IR_TTUSBIR'); | ||
| +disable_config('RC_ST'); | ||
| +disable_config('IR_SUNXI'); | ||
| +disable_config('IR_IMG'); | ||
| +disable_config('IR_SERIAL'); | ||
| +disable_config('IR_SIR'); | ||
| +disable_config('IR_MTK'); | ||
| +disable_config('IR_ZX'); | ||
| +disable_config('IR_TANGO'); | ||
| disable_config('DVB_AV7110_FIRMWARE'); | ||
| disable_config('DVB_CINERGYT2_TUNING'); | ||
| disable_config('VIDEO_HELPER_CHIPS_AUTO'); |
54 changes: 54 additions & 0 deletions
54
...ons/dvb/crazycat_aml/patches/amlogic-4.9/driver.dvb.crazycat_aml-02-disable-modules.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| --- a/v4l/scripts/make_kconfig.pl | ||
| +++ b/v4l/scripts/make_kconfig.pl | ||
| @@ -626,6 +626,51 @@ ($$) | ||
| close OUT; | ||
|
|
||
| # These options should default to off | ||
| +disable_config('MEDIA_ANALOG_TV_SUPPORT'); | ||
| +disable_config('MEDIA_CAMERA_SUPPORT'); | ||
| +disable_config('MEDIA_CEC_SUPPORT'); | ||
| +disable_config('SOC_CAMERA'); | ||
| +disable_config('RC_CORE'); | ||
| +disable_config('IR_NEC_DECODER'); | ||
| +disable_config('IR_RC5_DECODER'); | ||
| +disable_config('IR_RC6_DECODER'); | ||
| +disable_config('IR_JVC_DECODER'); | ||
| +disable_config('IR_SONY_DECODER'); | ||
| +disable_config('IR_SANYO_DECODER'); | ||
| +disable_config('IR_SHARP_DECODER'); | ||
| +disable_config('IR_MCE_KBD_DECODER'); | ||
| +disable_config('IR_XMP_DECODER'); | ||
| +disable_config('IR_IMON_DECODER'); | ||
| +disable_config('RC_ATI_REMOTE'); | ||
| +disable_config('IR_HIX5HD2'); | ||
| +disable_config('IR_IMON'); | ||
| +disable_config('IR_IMON_RAW'); | ||
| +disable_config('IR_ITE_CIR'); | ||
| +disable_config('IR_MCEUSB'); | ||
| +disable_config('IR_FINTEK'); | ||
| +disable_config('IR_MESON'); | ||
| +disable_config('IR_NUVOTON'); | ||
| +disable_config('IR_ENE'); | ||
| +disable_config('IR_REDRAT3'); | ||
| +disable_config('IR_RX51'); | ||
| +disable_config('IR_SPI'); | ||
| +disable_config('IR_STREAMZAP'); | ||
| +disable_config('IR_WINBOND_CIR'); | ||
| +disable_config('RC_LOOPBACK'); | ||
| +disable_config('IR_GPIO_CIR'); | ||
| +disable_config('IR_GPIO_TX'); | ||
| +disable_config('IR_PWM_TX'); | ||
| +disable_config('IR_IGORPLUGUSB'); | ||
| +disable_config('IR_IGUANA'); | ||
| +disable_config('IR_TTUSBIR'); | ||
| +disable_config('RC_ST'); | ||
| +disable_config('IR_SUNXI'); | ||
| +disable_config('IR_IMG'); | ||
| +disable_config('IR_SERIAL'); | ||
| +disable_config('IR_SIR'); | ||
| +disable_config('IR_MTK'); | ||
| +disable_config('IR_ZX'); | ||
| +disable_config('IR_TANGO'); | ||
| disable_config('DVB_AV7110_FIRMWARE'); | ||
| disable_config('DVB_CINERGYT2_TUNING'); | ||
| disable_config('VIDEO_HELPER_CHIPS_AUTO'); |
12 changes: 12 additions & 0 deletions
12
...s/dvb/crazycat_aml/patches/amlogic-4.9/driver.dvb.crazycat_aml-03-config_mycompat_h.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- /dev/null | ||
| +++ b/v4l/config-mycompat.h | ||
| @@ -0,0 +1,8 @@ | ||
| +#undef smp_mb__after_atomic | ||
| +#define smp_mb__after_atomic() smp_mb() /*mb*/ | ||
| +#undef NEED_SMP_MB_AFTER_ATOMIC | ||
| +#undef writel_relaxed | ||
| +#define writel_relaxed(v,c) ((void)__raw_writel((__force u32)cpu_to_le32(v),(c))) | ||
| +#undef NEED_WRITEL_RELAXED | ||
| +#undef NEED_PM_RUNTIME_GET | ||
| +#undef NEED_OF_NODE_NAME_EQ | ||
| -- |
53 changes: 53 additions & 0 deletions
53
.../media_tree_cc_aml/patches/media_tree_cc_aml-02-linux-901-extend-rc6-toggle-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| From 3f1f8303b6e0be751d7a7c55031c8ab840ed5c1a Mon Sep 17 00:00:00 2001 | ||
| From: Matthias Reichl <hias@horus.com> | ||
| Date: Fri, 24 Aug 2018 23:31:51 +0200 | ||
| Subject: [PATCH] media: rc: ir-rc6-decoder: enable toggle bit for Kathrein | ||
| RCU-676 remote | ||
|
|
||
| The Kathrein RCU-676 remote uses the 32-bit rc6 protocol and toggles | ||
| bit 15 (0x8000) on repeated button presses, like MCE remotes. | ||
|
|
||
| Add it's customer code 0x80460000 to the 32-bit rc6 toggle | ||
| handling code to get proper scancodes and toggle reports. | ||
|
|
||
| Signed-off-by: Matthias Reichl <hias@horus.com> | ||
| --- | ||
| drivers/media/rc/ir-rc6-decoder.c | 9 +++++++-- | ||
| 1 file changed, 7 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c | ||
| index 68487ce9f79b..d96aed1343e4 100644 | ||
| --- a/drivers/media/rc/ir-rc6-decoder.c | ||
| +++ b/drivers/media/rc/ir-rc6-decoder.c | ||
| @@ -40,6 +40,7 @@ | ||
| #define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */ | ||
| #define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */ | ||
| #define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */ | ||
| +#define RC6_6A_KATHREIN_CC 0x80460000 /* Kathrein RCU-676 customer code */ | ||
| #ifndef CHAR_BIT | ||
| #define CHAR_BIT 8 /* Normally in <limits.h> */ | ||
| #endif | ||
| @@ -242,13 +243,17 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) | ||
| toggle = 0; | ||
| break; | ||
| case 32: | ||
| - if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { | ||
| + switch (scancode & RC6_6A_LCC_MASK) { | ||
| + case RC6_6A_MCE_CC: | ||
| + case RC6_6A_KATHREIN_CC: | ||
| protocol = RC_PROTO_RC6_MCE; | ||
| toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); | ||
| scancode &= ~RC6_6A_MCE_TOGGLE_MASK; | ||
| - } else { | ||
| + break; | ||
| + default: | ||
| protocol = RC_PROTO_RC6_6A_32; | ||
| toggle = 0; | ||
| + break; | ||
| } | ||
| break; | ||
| default: | ||
| -- | ||
| 2.11.0 | ||
|
|
||
|
|
41 changes: 41 additions & 0 deletions
41
...e_cc_aml/patches/media_tree_cc_aml-03-linux-902-extend-rc6-toggle-support-for-zotac.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| From ae1ccaa3587c0bd3d6d01841fa2e668cdf738f1e Mon Sep 17 00:00:00 2001 | ||
| From: Matthias Reichl <hias@horus.com> | ||
| Date: Sun, 3 Feb 2019 14:24:00 +0100 | ||
| Subject: [PATCH] media: rc: ir-rc6-decoder: enable toggle bit for Zotac | ||
| remotes | ||
|
|
||
| The Zotac RC2604323/01G and RC2604329/02BG remotes use the 32-bit | ||
| rc6 protocol and toggle bit 15 (0x8000) on repeated button presses, | ||
| like MCE remotes. | ||
|
|
||
| Add the customer code 0x80340000 to the 32-bit rc6 toggle | ||
| handling code to get proper scancodes and toggle reports. | ||
|
|
||
| Signed-off-by: Matthias Reichl <hias@horus.com> | ||
| --- | ||
| drivers/media/rc/ir-rc6-decoder.c | 2 ++ | ||
| 1 file changed, 2 insertions(+) | ||
|
|
||
| diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c | ||
| index d96aed1343e4..5cc302fa4daa 100644 | ||
| --- a/drivers/media/rc/ir-rc6-decoder.c | ||
| +++ b/drivers/media/rc/ir-rc6-decoder.c | ||
| @@ -40,6 +40,7 @@ | ||
| #define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */ | ||
| #define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */ | ||
| #define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */ | ||
| +#define RC6_6A_ZOTAC_CC 0x80340000 /* Zotac customer code */ | ||
| #define RC6_6A_KATHREIN_CC 0x80460000 /* Kathrein RCU-676 customer code */ | ||
| #ifndef CHAR_BIT | ||
| #define CHAR_BIT 8 /* Normally in <limits.h> */ | ||
| @@ -246,6 +247,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) | ||
| switch (scancode & RC6_6A_LCC_MASK) { | ||
| case RC6_6A_MCE_CC: | ||
| case RC6_6A_KATHREIN_CC: | ||
| + case RC6_6A_ZOTAC_CC: | ||
| protocol = RC_PROTO_RC6_MCE; | ||
| toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); | ||
| scancode &= ~RC6_6A_MCE_TOGGLE_MASK; | ||
| -- | ||
| 2.20.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters