Cleanups of rc keymaps

PATCH In review Sean Young 3 participants 11 messages Jun 24 – Jun 30

Subsystems (3)

Device tree bindings Media (V4L/DVB) RC-core / lirc framework

lore

Share & tools

lore

Sean Young

author maintainer

2026-06-24 11:39 UTC #0 lore raw

cover Cleanups of rc keymaps

I've written a tool for media-ci which checks rc-keymap submissions. This tool found some trivial issues.

Sean Young (4):
media: keymaps: Remove obsolete RC_MAP_RC5_TV keymap define
media: keymaps: Remove obsolete RC_MAP_HAUPPAUGE_NEW keymap define
media: keymaps: Ensure module name matches RC_MAP_VIDEOMATE_K100
media: dt-bindings: rc: Sync keymap list with latest list

 Documentation/devicetree/bindings/media/rc.yaml               | 4 ++--
 drivers/media/rc/keymaps/Makefile                             | 2 +-
 .../rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c}    | 2 +-
 include/media/rc-map.h                                        | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename drivers/media/rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c} (97%)

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-24 11:39 UTC #1 lore raw

PATCH 1/1 media: rc-core: Ensure that keymaps are sorted

They are not longer sorted as they should be.

Signed-off-by Sean Young <[email protected]>

---
 include/media/rc-map.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

include/media/rc-map.h +14 ~~-14~~

index d90e4611b066..5494f795ea2e 100644
@@ -215,23 +215,23 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_ASUS_PS3_100              "rc-asus-ps3-100"
 #define RC_MAP_ATI_TV_WONDER_HD_600      "rc-ati-tv-wonder-hd-600"
 #define RC_MAP_ATI_X10                   "rc-ati-x10"
-#define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
 #define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
 #define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
 #define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
+#define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERMEDIA_RM_KS           "rc-avermedia-rm-ks"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
 #define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
 #define RC_MAP_BEELINK_GS1               "rc-beelink-gs1"
 #define RC_MAP_BEELINK_MXIII             "rc-beelink-mxiii"
-#define RC_MAP_BEHOLD                    "rc-behold"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
+#define RC_MAP_BEHOLD                    "rc-behold"
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
 #define RC_MAP_CEC                       "rc-cec"
-#define RC_MAP_CINERGY                   "rc-cinergy"
 #define RC_MAP_CINERGY_1400              "rc-cinergy-1400"
+#define RC_MAP_CINERGY                   "rc-cinergy"
 #define RC_MAP_CT_90405                  "rc-ct-90405"
 #define RC_MAP_D680_DMB                  "rc-d680-dmb"
 #define RC_MAP_DELOCK_61959              "rc-delock-61959"

@@ -240,8 +240,8 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_DIGITALNOW_TINYTWIN       "rc-digitalnow-tinytwin"
 #define RC_MAP_DIGITTRADE                "rc-digittrade"
 #define RC_MAP_DM1105_NEC                "rc-dm1105-nec"
-#define RC_MAP_DNTV_LIVE_DVB_T           "rc-dntv-live-dvb-t"
 #define RC_MAP_DNTV_LIVE_DVBT_PRO        "rc-dntv-live-dvbt-pro"
+#define RC_MAP_DNTV_LIVE_DVB_T           "rc-dntv-live-dvb-t"
 #define RC_MAP_DREAMBOX                  "rc-dreambox"
 #define RC_MAP_DTT200U                   "rc-dtt200u"
 #define RC_MAP_DVBSKY                    "rc-dvbsky"

@@ -249,9 +249,9 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_DVICO_PORTABLE		 "rc-dvico-portable"
 #define RC_MAP_EMPTY                     "rc-empty"
 #define RC_MAP_EM_TERRATEC               "rc-em-terratec"
-#define RC_MAP_ENCORE_ENLTV              "rc-encore-enltv"
 #define RC_MAP_ENCORE_ENLTV2             "rc-encore-enltv2"
 #define RC_MAP_ENCORE_ENLTV_FM53         "rc-encore-enltv-fm53"
+#define RC_MAP_ENCORE_ENLTV              "rc-encore-enltv"
 #define RC_MAP_EVGA_INDTUBE              "rc-evga-indtube"
 #define RC_MAP_EZTV                      "rc-eztv"
 #define RC_MAP_FLYDVB                    "rc-flydvb"

@@ -261,8 +261,8 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_GEEKBOX                   "rc-geekbox"
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
-#define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
 #define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge"
+#define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
 #define RC_MAP_HISI_POPLAR               "rc-hisi-poplar"
 #define RC_MAP_HISI_TV_DEMO              "rc-hisi-tv-demo"
 #define RC_MAP_IMON_MCE                  "rc-imon-mce"

@@ -274,22 +274,23 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_KAIOMY                    "rc-kaiomy"
 #define RC_MAP_KHADAS                    "rc-khadas"
 #define RC_MAP_KHAMSIN                   "rc-khamsin"
+#define RC_MAP_KII_PRO                   "rc-videostrong-kii-pro"
 #define RC_MAP_KWORLD_315U               "rc-kworld-315u"
 #define RC_MAP_KWORLD_PC150U             "rc-kworld-pc150u"
 #define RC_MAP_KWORLD_PLUS_TV_ANALOG     "rc-kworld-plus-tv-analog"
 #define RC_MAP_LEADTEK_Y04G0051          "rc-leadtek-y04g0051"
 #define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
-#define RC_MAP_MECOOL_KII_PRO            "rc-mecool-kii-pro"
 #define RC_MAP_MECOOL_KIII_PRO           "rc-mecool-kiii-pro"
-#define RC_MAP_MEDION_X10                "rc-medion-x10"
+#define RC_MAP_MECOOL_KII_PRO            "rc-mecool-kii-pro"
 #define RC_MAP_MEDION_X10_DIGITAINER     "rc-medion-x10-digitainer"
 #define RC_MAP_MEDION_X10_OR2X           "rc-medion-x10-or2x"
+#define RC_MAP_MEDION_X10                "rc-medion-x10"
 #define RC_MAP_MINIX_NEO                 "rc-minix-neo"
-#define RC_MAP_MSI_DIGIVOX_II            "rc-msi-digivox-ii"
 #define RC_MAP_MSI_DIGIVOX_III           "rc-msi-digivox-iii"
-#define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
+#define RC_MAP_MSI_DIGIVOX_II            "rc-msi-digivox-ii"
 #define RC_MAP_MSI_TVANYWHERE_PLUS       "rc-msi-tvanywhere-plus"
+#define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
 #define RC_MAP_MYGICA_UTV3               "rc-mygica-utv3"
 #define RC_MAP_NEBULA                    "rc-nebula"
 #define RC_MAP_NEC_TERRATEC_CINERGY_XS   "rc-nec-terratec-cinergy-xs"

@@ -301,10 +302,10 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_PINNACLE_COLOR            "rc-pinnacle-color"
 #define RC_MAP_PINNACLE_GREY             "rc-pinnacle-grey"
 #define RC_MAP_PINNACLE_PCTV_HD          "rc-pinnacle-pctv-hd"
-#define RC_MAP_PIXELVIEW                 "rc-pixelview"
 #define RC_MAP_PIXELVIEW_002T            "rc-pixelview-002t"
 #define RC_MAP_PIXELVIEW_MK12            "rc-pixelview-mk12"
 #define RC_MAP_PIXELVIEW_NEW             "rc-pixelview-new"
+#define RC_MAP_PIXELVIEW                 "rc-pixelview"
 #define RC_MAP_POWERCOLOR_REAL_ANGEL     "rc-powercolor-real-angel"
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
 #define RC_MAP_PURPLETV                  "rc-purpletv"

@@ -325,12 +326,12 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_TERRATEC_CINERGY_C_PCI    "rc-terratec-cinergy-c-pci"
 #define RC_MAP_TERRATEC_CINERGY_S2_HD    "rc-terratec-cinergy-s2-hd"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
-#define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
 #define RC_MAP_TERRATEC_SLIM_2           "rc-terratec-slim-2"
+#define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
 #define RC_MAP_TEVII_NEC                 "rc-tevii-nec"
 #define RC_MAP_TIVO                      "rc-tivo"
-#define RC_MAP_TOTAL_MEDIA_IN_HAND       "rc-total-media-in-hand"
 #define RC_MAP_TOTAL_MEDIA_IN_HAND_02    "rc-total-media-in-hand-02"
+#define RC_MAP_TOTAL_MEDIA_IN_HAND       "rc-total-media-in-hand"
 #define RC_MAP_TREKSTOR                  "rc-trekstor"
 #define RC_MAP_TT_1500                   "rc-tt-1500"
 #define RC_MAP_TWINHAN_DTV_CAB_CI        "rc-twinhan-dtv-cab-ci"

@@ -339,7 +340,6 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_VIDEOMATE_K100            "rc-videomate-k100"
 #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
 #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
-#define RC_MAP_KII_PRO                   "rc-videostrong-kii-pro"
 #define RC_MAP_WETEK_HUB                 "rc-wetek-hub"
 #define RC_MAP_WETEK_PLAY2               "rc-wetek-play2"
 #define RC_MAP_WINFAST                   "rc-winfast"

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-24 11:39 UTC #2 lore raw

PATCH 1/4 media: keymaps: Remove obsolete RC_MAP_RC5_TV keymap define

In reply to Sean Young

Since commit 206241069ecf ("[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap"), the rc-rc5-tv keymap is no longer in the tree.

Fixes 206241069ecf ("[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap")

Signed-off-by Sean Young <[email protected]>

---
 include/media/rc-map.h | 1 -
 1 file changed, 1 deletion(-)

include/media/rc-map.h +0 -1

index d90e4611b066..950d702aee3b 100644
@@ -309,7 +309,6 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
-#define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
 #define RC_MAP_REDDO                     "rc-reddo"

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-24 11:39 UTC #3 lore raw

PATCH 2/4 media: keymaps: Remove obsolete RC_MAP_HAUPPAUGE_NEW keymap define

In reply to Sean Young

Since commit af86ce79f020 ("[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map"), the RC_MAP_HAUPPAUGE_NEW define is no longer used.

Fixes af86ce79f020 ("[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map")

Signed-off-by Sean Young <[email protected]>

---
 include/media/rc-map.h | 1 -
 1 file changed, 1 deletion(-)

include/media/rc-map.h +0 -1

index 950d702aee3b..d95ed3e96de2 100644
@@ -262,7 +262,6 @@ struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
 #define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
-#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge"
 #define RC_MAP_HISI_POPLAR               "rc-hisi-poplar"
 #define RC_MAP_HISI_TV_DEMO              "rc-hisi-tv-demo"
 #define RC_MAP_IMON_MCE                  "rc-imon-mce"

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-24 11:39 UTC #4 lore raw

PATCH 3/4 media: keymaps: Ensure module name matches RC_MAP_VIDEOMATE_K100

In reply to Sean Young

When loading a rc keymap, rc_map_get() attempts to load the kernel module using the keymap name.

The rc_map RC_MAP_VIDEOMATE_K100 is defined to "rc-videomate-k100" but the module is called rc-videomate-m1f.ko, so therefore automagic loading the keymap will fail.

Rename the module to match.

Signed-off-by Sean Young <[email protected]>

---
 drivers/media/rc/keymaps/Makefile                               | 2 +-
 .../rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/media/rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c} (97%)

drivers/media/rc/keymaps/Makefile +1 -1

index d04572627cdd..38b84e34b225 100644
@@ -129,7 +129,7 @@ obj-$(CONFIG_RC_MAP) += \
 			rc-twinhan1027.o \
 			rc-twinhan-dtv-cab-ci.o \
 			rc-vega-s9x.o \
-			rc-videomate-m1f.o \
+			rc-videomate-k100.o \
 			rc-videomate-s350.o \
 			rc-videomate-tv-pvr.o \
 			rc-videostrong-kii-pro.o \

drivers/media/rc/keymaps/rc-videomate-k100.c renamed from drivers/media/rc/keymaps/rc-videomate-m1f.c +1 -1

similarity index 97%
rename from drivers/media/rc/keymaps/rc-videomate-m1f.c
rename to drivers/media/rc/keymaps/rc-videomate-k100.c
index 1f9be84ff27b..6664cfd0b7f3 100644
@@ -87,4 +87,4 @@ module_exit(exit_rc_map_videomate_k100)
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Pavel Osnova <[email protected]>");
-MODULE_DESCRIPTION("videomate-m1f remote controller keytable");
+MODULE_DESCRIPTION("videomate-k100 remote controller keytable");

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-24 11:39 UTC #5 lore raw

PATCH 4/4 media: dt-bindings: rc: Sync keymap list with latest list

In reply to Sean Young

The list is out of sync, so add missing entries, remove obsolete entries and sort.

Signed-off-by Sean Young <[email protected]>

---
 Documentation/devicetree/bindings/media/rc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/rc.yaml +2 -2

index dedc5a4b81ec..43d84296e70d 100644
@@ -122,10 +122,10 @@ properties:
       - rc-proteus-2309
       - rc-purpletv
       - rc-pv951
-      - rc-rc5-tv
       - rc-rc6-mce
       - rc-real-audio-220-32-keys
       - rc-reddo
+      - rc-siemens-gigaset-rc20
       - rc-snapstream-firefly
       - rc-streamzap
       - rc-su3000

@@ -147,11 +147,11 @@ properties:
       - rc-tt-1500
       - rc-twinhan-dtv-cab-ci
       - rc-twinhan1027
+      - rc-vega-s9x
       - rc-videomate-k100
       - rc-videomate-s350
       - rc-videomate-tv-pvr
       - rc-videostrong-kii-pro
-      - rc-vega-s9x
       - rc-wetek-hub
       - rc-wetek-play2
       - rc-winfast

Signature · 1 line

2.54.0

Sean Young

author maintainer

2026-06-30 13:06 UTC #6 lore raw

Re: [PATCH 4/4] media: dt-bindings: rc: Sync keymap list with latest list

Hi Rob, Krzysztof,

Could I have an Acked-by: please?

Much appreciated,

Sean

Quoted 39 lines · Sean Young

The list is out of sync, so add missing entries, remove obsolete entries and sort.

Signed-off-by Sean Young <[email protected]>

---
 Documentation/devicetree/bindings/media/rc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/rc.yaml +2 -2

index dedc5a4b81ec..43d84296e70d 100644
@@ -122,10 +122,10 @@ properties:
       - rc-proteus-2309
       - rc-purpletv
       - rc-pv951
-      - rc-rc5-tv
       - rc-rc6-mce
       - rc-real-audio-220-32-keys
       - rc-reddo
+      - rc-siemens-gigaset-rc20
       - rc-snapstream-firefly
       - rc-streamzap
       - rc-su3000

@@ -147,11 +147,11 @@ properties:
       - rc-tt-1500
       - rc-twinhan-dtv-cab-ci
       - rc-twinhan1027
+      - rc-vega-s9x
       - rc-videomate-k100
       - rc-videomate-s350
       - rc-videomate-tv-pvr
       - rc-videostrong-kii-pro
-      - rc-vega-s9x
       - rc-wetek-hub
       - rc-wetek-play2
       - rc-winfast

Signature · 1 line

2.54.0

Rob Herring

maintainer

2026-06-30 16:17 UTC #7 lore raw

Re: [PATCH 4/4] media: dt-bindings: rc: Sync keymap list with latest list

Quoted 3 lines · Sean Young

Hi Rob, Krzysztof,
Could I have an Acked-by: please?

You can look at patchwork and see where you are in the queue. No need to ping us. Plus, don't expect quick reviews during the merge window.

Rob

Sean Young

author maintainer

2026-06-30 16:39 UTC #8 lore raw

Re: [PATCH 4/4] media: dt-bindings: rc: Sync keymap list with latest list

Quoted 8 lines · Rob Herring

Quoted 3 lines · Sean Young
Hi Rob, Krzysztof,
Could I have an Acked-by: please?
You can look at patchwork and see where you are in the queue. No need to ping us. Plus, don't expect quick reviews during the merge window.

Ok, understood. Will do next time.

Thanks,

Sean

Rob Herring (Arm)

maintainer Acked-by on v1 4/4

2026-06-30 16:18 UTC #9 lore raw

Re: [PATCH 4/4] media: dt-bindings: rc: Sync keymap list with latest list

In reply to Sean Young

Quoted 8 lines · Sean Young

The list is out of sync, so add missing entries, remove obsolete entries and sort.
Signed-off-by Sean Young <[email protected]>
---
 Documentation/devicetree/bindings/media/rc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by Rob Herring (Arm) <[email protected]>

Mauro Carvalho Chehab

Acked-by on the v1 series

2026-06-25 13:33 UTC #10 lore raw

In reply to Sean Young

Quoted 9 lines · On Wed, 24 Jun 2026 12:39:16 +0100 Sean Young <[email protected]> wrote:

I've written a tool for media-ci which checks rc-keymap submissions. This tool found some trivial issues.
Sean Young (4):
media: keymaps: Remove obsolete RC_MAP_RC5_TV keymap define
media: keymaps: Remove obsolete RC_MAP_HAUPPAUGE_NEW keymap define
media: keymaps: Ensure module name matches RC_MAP_VIDEOMATE_K100
media: dt-bindings: rc: Sync keymap list with latest list

Quoted 7 lines

 Documentation/devicetree/bindings/media/rc.yaml               | 4 ++--
 drivers/media/rc/keymaps/Makefile                             | 2 +-
 .../rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c}    | 2 +-
 include/media/rc-map.h                                        | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename drivers/media/rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c} (97%)

Makes sense to me. For the entire series:

Acked-by Mauro Carvalho Chehab <[email protected]>

Signature · 2 lines

Thanks,
Mauro