Switch from external keymaps to internal (hwdb) keymaps

This commit imports the new internal keyboard handling from upstream.
This is a combination of many upstream commits, including those
that added code, removed old code, and updated the hwdb.
Some commits (hwdb ones specifically) were unrelated but brought
in anyways to keep the whole hwdb consistent.  Each upstream
commit included is as follows:

9d7d42bc406a2ac04639674281ce3ff6beeda790 - internal keymap support
0c959b39175b126fdb70ae00de37ca6d9c8ca3a1 - hwdb: keyboard -- add file
e8193554925a22b63bef0e77b8397b56d63a91ff - hwdb: keyboard -- update comments
c79d894d590fc9df4861738555cc43c477e33376 - hwdb: import data
aedc2eddd16e48d468e6ad0aea2caf00c7d37365 - hwdb: keyboard update
97a9313cafccf772ce03f5ebd36fe4d9d8412583 - hwdb: drop non-existant Samsung 900XC3 from keymap
ddc77f62244bb41d5c8261517e2e1ff1b763fc94 - switch from udev keymaps to hwdb
0c3815773331b263713f4f7b9d80bc1ca159338e - also remove keymaps-force-release directory
1b6bce89b3383904d0dab619dd38bff673f7286e - keymap: re-add Logitech USB corded/cordless models
bf89b99c5a39115112c2eda4c2103e2db54988d2 - 60-keyboard.hwdb: Fix syntax error
ce39bb6909578017aa10031638e724e038f0b859 - hwdb: data update, upstream
884c86812c51479496edd50b278383d7bb67baf0 - rules: keyboard - use builtin command

All code from each of the above commits is attributed to the original
authors.

There were some adjustments made in order to support the code differences
between upstream and eudev, which was done by myself.

Also of note is that the code can still be disabled via the --disable-keymaps
configure option, which was removed from upstream.

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>

66 files changed, 0 insertions, 630 deletions

diff --git a/keymaps/Makefile.README b/keymaps/Makefile.README
deleted file mode 100644
index 18bd334695..0000000000
--- a/keymaps/Makefile.README
+++ /dev/null
@@ -1,3 +0,0 @@
-Because of the parsing done by src/keymap/check-keymaps.sh,
-you should not put anything in this directory except for
-keymap files and files begining with Makefile.
diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am
deleted file mode 100644
index 10fcd72741..0000000000
--- a/keymaps/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-KEYMAPS = \
-	acer \
-	acer-aspire_5720 \
-	acer-aspire_8930 \
-	acer-aspire_5920g \
-	acer-aspire_6920 \
-	acer-travelmate_c300 \
-	asus \
-	compaq-e_evo \
-	dell \
-	dell-latitude-xt2 \
-	everex-xt5000 \
-	fujitsu-amilo_li_2732 \
-	fujitsu-amilo_pa_2548 \
-	fujitsu-amilo_pro_edition_v3505 \
-	fujitsu-amilo_pro_v3205 \
-	fujitsu-amilo_si_1520 \
-	fujitsu-esprimo_mobile_v5 \
-	fujitsu-esprimo_mobile_v6 \
-	genius-slimstar-320 \
-	hewlett-packard \
-	hewlett-packard-2510p_2530p \
-	hewlett-packard-compaq_elitebook \
-	hewlett-packard-pavilion \
-	hewlett-packard-presario-2100 \
-	hewlett-packard-tablet \
-	hewlett-packard-tx2 \
-	hewlett-packard_elitebook-8440p \
-	hewlett-packard_elitebook-8460p \
-	hewlett-packard-hdx9494nr \
-	ibm-thinkpad-usb-keyboard-trackpoint \
-	inventec-symphony_6.0_7.0 \
-	lenovo-3000 \
-	lenovo-ideapad \
-	lenovo-thinkpad-usb-keyboard-trackpoint \
-	lenovo-thinkpad_x6_tablet \
-	lenovo-thinkpad_x200_tablet \
-	lg-x110 \
-	logitech-usb \
-	logitech-wave \
-	logitech-wave-cordless \
-	logitech-wave-pro-cordless \
-	maxdata-pro_7000 \
-	medion-fid2060 \
-	medionnb-a555 \
-	micro-star \
-	module-asus-w3j \
-	module-ibm \
-	module-lenovo \
-	module-sony \
-	module-sony-old \
-	module-sony-vgn \
-	module-sony-vpc \
-	olpc-xo \
-	onkyo \
-	oqo-model2 \
-	samsung-other \
-	samsung-series-3 \
-	samsung-series-9 \
-	samsung-sq1us \
-	samsung-sx20s \
-	toshiba-satellite_a100 \
-	toshiba-satellite_a110 \
-	toshiba-satellite_m30x \
-	zepto-znote
-
-dist_udevkeymap_DATA = \
-	$(KEYMAPS)
-
-EXTRA_DIST = \
-	$(KEYMAPS)
diff --git a/keymaps/acer b/keymaps/acer
deleted file mode 100644
index a0c6fd278a..0000000000
--- a/keymaps/acer
+++ /dev/null
@@ -1,22 +0,0 @@
-0xA5 help            # Fn+F1
-0xA6 setup           # Fn+F2 Acer eSettings
-0xA7 battery         # Fn+F3 Power Management
-0xA9 switchvideomode # Fn+F5
-0xB3 euro
-0xB4 dollar
-0xCE brightnessup    # Fn+Right
-0xD4 bluetooth       # (toggle) off-to-on
-0xD5 wlan            # (toggle) on-to-off
-0xD6 wlan            # (toggle) off-to-on
-0xD7 bluetooth       # (toggle) on-to-off
-0xD8 bluetooth       # (toggle) off-to-on
-0xD9 brightnessup    # Fn+Right
-0xEE brightnessup    # Fn+Right
-0xEF brightnessdown  # Fn+Left
-0xF1 f22             # Fn+F7 Touchpad toggle (off-to-on)
-0xF2 f23             # Fn+F7 Touchpad toggle (on-to-off)
-0xF3 prog2           # "P2" programmable button
-0xF4 prog1           # "P1" programmable button
-0xF5 presentation
-0xF8 fn
-0xF9 f23             # Launch NTI shadow
diff --git a/keymaps/acer-aspire_5720 b/keymaps/acer-aspire_5720
deleted file mode 100644
index b9381f86c6..0000000000
--- a/keymaps/acer-aspire_5720
+++ /dev/null
@@ -1,5 +0,0 @@
-0x84 bluetooth  # sent when bluetooth module missing, and key pressed
-0x92 media      # Acer arcade
-0xD4 bluetooth  # Bluetooth on
-0xD9 bluetooth  # Bluetooth off
-0xF4 prog3      # e-key
diff --git a/keymaps/acer-aspire_5920g b/keymaps/acer-aspire_5920g
deleted file mode 100644
index 633c4e854c..0000000000
--- a/keymaps/acer-aspire_5920g
+++ /dev/null
@@ -1,5 +0,0 @@
-0x8A media
-0x92 media
-0xA6 setup
-0xB2 www
-0xD9 bluetooth # (toggle) on-to-off
diff --git a/keymaps/acer-aspire_6920 b/keymaps/acer-aspire_6920
deleted file mode 100644
index 699c954b4e..0000000000
--- a/keymaps/acer-aspire_6920
+++ /dev/null
@@ -1,5 +0,0 @@
-0xD9 bluetooth # (toggle) on-to-off
-0x92 media
-0x9E back
-0x83 rewind
-0x89 fastforward
diff --git a/keymaps/acer-aspire_8930 b/keymaps/acer-aspire_8930
deleted file mode 100644
index 8e36cd947c..0000000000
--- a/keymaps/acer-aspire_8930
+++ /dev/null
@@ -1,5 +0,0 @@
-0xCA prog3        # key 'HOLD' on CineDash Media Console
-0x83 rewind
-0x89 fastforward
-0x92 media        # key 'ARCADE' on CineDash Media Console
-0x9E back
diff --git a/keymaps/acer-travelmate_c300 b/keymaps/acer-travelmate_c300
deleted file mode 100644
index bfef4cf868..0000000000
--- a/keymaps/acer-travelmate_c300
+++ /dev/null
@@ -1,5 +0,0 @@
-0x67 f24 # FIXME: rotate screen
-0x68 up
-0x69 down
-0x6B fn
-0x6C screenlock # FIXME: lock tablet device/buttons
diff --git a/keymaps/asus b/keymaps/asus
deleted file mode 100644
index 2a5995f982..0000000000
--- a/keymaps/asus
+++ /dev/null
@@ -1,3 +0,0 @@
-0xED volumeup
-0xEE volumedown
-0xEF mute
diff --git a/keymaps/compaq-e_evo b/keymaps/compaq-e_evo
deleted file mode 100644
index 5fbc573aa4..0000000000
--- a/keymaps/compaq-e_evo
+++ /dev/null
@@ -1,4 +0,0 @@
-0xA3 www # I key
-0x9A search
-0x9E email
-0x9F homepage
diff --git a/keymaps/dell b/keymaps/dell
deleted file mode 100644
index cef41d3e7b..0000000000
--- a/keymaps/dell
+++ /dev/null
@@ -1,29 +0,0 @@
-0x81 playpause       # Play/Pause
-0x82 stopcd          # Stop
-0x83 previoussong    # Previous song
-0x84 nextsong        # Next song
-0x85 brightnessdown  # Fn+Down Brightness Down
-0x86 brightnessup    # Fn+Up Brightness Up
-0x87 battery         # Fn+F3 battery icon
-0x88 unknown         # Fn+F2 Turn On/Off Wireless - handled in hardware
-0x89 ejectclosecd    # Fn+F10 Eject CD
-0x8A suspend         # Fn+F1 hibernate
-0x8B switchvideomode # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
-0x8C f23             # Fn+Right Auto Brightness
-0x8F switchvideomode # Fn+F7 aspect ratio
-0x90 previoussong    # Front panel previous song
-0x91 prog1           # Wi-Fi Catcher (Dell-specific)
-0x92 media           # MediaDirect button (house icon)
-0x93 f23             # FIXME Fn+Left Auto Brightness
-0x95 camera          # Shutter button - Takes a picture if optional camera available
-0x97 email           # Tablet email button
-0x98 f21             # FIXME: Tablet screen rotation
-0x99 nextsong        # Front panel next song
-0x9A setup           # Tablet tools button
-0x9B switchvideomode # Display toggle button
-0x9E f21             # Touchpad toggle
-0xA2 playpause       # Front panel play/pause
-0xA4 stopcd          # Front panel stop
-0xED media           # MediaDirect button
-0xD8 screenlock      # FIXME: Tablet lock button
-0xD9 f21             # Touchpad toggle
diff --git a/keymaps/dell-latitude-xt2 b/keymaps/dell-latitude-xt2
deleted file mode 100644
index 59ff6ff264..0000000000
--- a/keymaps/dell-latitude-xt2
+++ /dev/null
@@ -1,4 +0,0 @@
-0x9B up     # tablet rocker up
-0x9E enter  # tablet rocker press
-0x9F back   # tablet back
-0xA3 down   # tablet rocker down
diff --git a/keymaps/everex-xt5000 b/keymaps/everex-xt5000
deleted file mode 100644
index bd89a23d3e..0000000000
--- a/keymaps/everex-xt5000
+++ /dev/null
@@ -1,7 +0,0 @@
-0x5C media
-0x65 f21    # Fn+F5 Touchpad toggle
-0x67 prog3  # Fan speed control button
-0x6F brightnessup
-0x7F brightnessdown
-0xB2 www
-0xEC mail
diff --git a/keymaps/fujitsu-amilo_li_2732 b/keymaps/fujitsu-amilo_li_2732
deleted file mode 100644
index c9b3198d1b..0000000000
--- a/keymaps/fujitsu-amilo_li_2732
+++ /dev/null
@@ -1,3 +0,0 @@
-0xD9 brightnessdown  # Fn+F8 brightness down
-0xEF brightnessup    # Fn+F9 brightness up
-0xA9 switchvideomode # Fn+F10 Cycle between available video outputs
diff --git a/keymaps/fujitsu-amilo_pa_2548 b/keymaps/fujitsu-amilo_pa_2548
deleted file mode 100644
index f7b0c52444..0000000000
--- a/keymaps/fujitsu-amilo_pa_2548
+++ /dev/null
@@ -1,3 +0,0 @@
-0xE0 volumedown
-0xE1 volumeup
-0xE5 prog1
diff --git a/keymaps/fujitsu-amilo_pro_edition_v3505 b/keymaps/fujitsu-amilo_pro_edition_v3505
deleted file mode 100644
index fd95b000c6..0000000000
--- a/keymaps/fujitsu-amilo_pro_edition_v3505
+++ /dev/null
@@ -1,4 +0,0 @@
-0xA5 help            # Fn+F1
-0xA9 switchvideomode # Fn+F3
-0xD9 brightnessdown  # Fn+F8
-0xE0 brightnessup    # Fn+F9
diff --git a/keymaps/fujitsu-amilo_pro_v3205 b/keymaps/fujitsu-amilo_pro_v3205
deleted file mode 100644
index 8cbf239464..0000000000
--- a/keymaps/fujitsu-amilo_pro_v3205
+++ /dev/null
@@ -1,2 +0,0 @@
-0xF4 f21             # FIXME: silent-mode decrease CPU/GPU clock
-0xF7 switchvideomode # Fn+F3
diff --git a/keymaps/fujitsu-amilo_si_1520 b/keymaps/fujitsu-amilo_si_1520
deleted file mode 100644
index 1419bd9b5e..0000000000
--- a/keymaps/fujitsu-amilo_si_1520
+++ /dev/null
@@ -1,6 +0,0 @@
-0xE1 wlan
-0xF3 wlan
-0xEE brightnessdown
-0xE0 brightnessup
-0xE2 bluetooth
-0xF7 video
diff --git a/keymaps/fujitsu-esprimo_mobile_v5 b/keymaps/fujitsu-esprimo_mobile_v5
deleted file mode 100644
index d3d056b366..0000000000
--- a/keymaps/fujitsu-esprimo_mobile_v5
+++ /dev/null
@@ -1,4 +0,0 @@
-0xA9 switchvideomode
-0xD9 brightnessdown
-0xDF sleep
-0xEF brightnessup
diff --git a/keymaps/fujitsu-esprimo_mobile_v6 b/keymaps/fujitsu-esprimo_mobile_v6
deleted file mode 100644
index 52c70c50cb..0000000000
--- a/keymaps/fujitsu-esprimo_mobile_v6
+++ /dev/null
@@ -1,2 +0,0 @@
-0xCE brightnessup
-0xEF brightnessdown
diff --git a/keymaps/genius-slimstar-320 b/keymaps/genius-slimstar-320
deleted file mode 100644
index d0a3656dd8..0000000000
--- a/keymaps/genius-slimstar-320
+++ /dev/null
@@ -1,35 +0,0 @@
-# Genius SlimStar 320
-#
-# Only buttons which are not properly mapped yet are configured below
-
-# "Scroll wheel", a circular up/down/left/right button. Aimed for scolling,
-# but since there are no scrollleft/scrollright, let's map to back/forward.
-0x900f0 scrollup
-0x900f1 scrolldown
-0x900f3 back
-0x900f2 forward
-
-# Multimedia buttons, left side (from left to right)
-# [W]
-0x900f5 wordprocessor
-# [Ex]
-0x900f6 spreadsheet
-# [P]
-0x900f4 presentation
-# Other five (calculator, playpause, stop, mute and eject) are OK
-
-# Right side, from left to right
-# [e]
-0xc0223 www
-# "man"
-0x900f7 chat
-# "Y"
-0x900fb prog1
-# [X]
-0x900f8 close
-# "picture"
-0x900f9 graphicseditor
-# "two windows"
-0x900fd scale
-# "lock"
-0x900fc screenlock
diff --git a/keymaps/hewlett-packard b/keymaps/hewlett-packard
deleted file mode 100644
index 3f5f5ace6f..0000000000
--- a/keymaps/hewlett-packard
+++ /dev/null
@@ -1,12 +0,0 @@
-0x81 fn_esc
-0x89 battery         # Fn+F8
-0x8A screenlock      # Fn+F6
-0x8B camera
-0x8C media           # music
-0x8E dvd
-0xB1 help
-0xB3 f23             # FIXME: Auto brightness
-0xD7 wlan
-0x92 brightnessdown  # Fn+F7 (Fn+F9 on 6730b)
-0x97 brightnessup    # Fn+F8 (Fn+F10 on 6730b)
-0xEE switchvideomode # Fn+F4
diff --git a/keymaps/hewlett-packard-2510p_2530p b/keymaps/hewlett-packard-2510p_2530p
deleted file mode 100644
index 41ad2e9b5a..0000000000
--- a/keymaps/hewlett-packard-2510p_2530p
+++ /dev/null
@@ -1,2 +0,0 @@
-0xD8 f23 # touchpad off
-0xD9 f22 # touchpad on
diff --git a/keymaps/hewlett-packard-compaq_elitebook b/keymaps/hewlett-packard-compaq_elitebook
deleted file mode 100644
index 42007c5483..0000000000
--- a/keymaps/hewlett-packard-compaq_elitebook
+++ /dev/null
@@ -1,2 +0,0 @@
-0x88 presentation
-0xD9 help # I key (high keycode: "info")
diff --git a/keymaps/hewlett-packard-hdx9494nr b/keymaps/hewlett-packard-hdx9494nr
deleted file mode 100644
index 39e8b4c9f7..0000000000
--- a/keymaps/hewlett-packard-hdx9494nr
+++ /dev/null
@@ -1,3 +0,0 @@
-0xB2 www # Fn+F3
-0xD8 f23 # touchpad off
-0xD9 f22 # touchpad on
diff --git a/keymaps/hewlett-packard-pavilion b/keymaps/hewlett-packard-pavilion
deleted file mode 100644
index 60d1191106..0000000000
--- a/keymaps/hewlett-packard-pavilion
+++ /dev/null
@@ -1,3 +0,0 @@
-0x88 media  # FIXME: quick play
-0xD8 f23    # touchpad off
-0xD9 f22    # touchpad on
diff --git a/keymaps/hewlett-packard-presario-2100 b/keymaps/hewlett-packard-presario-2100
deleted file mode 100644
index 1df39dcbd2..0000000000
--- a/keymaps/hewlett-packard-presario-2100
+++ /dev/null
@@ -1,3 +0,0 @@
-0xF0 help
-0xF1 screenlock
-0xF3 search
diff --git a/keymaps/hewlett-packard-tablet b/keymaps/hewlett-packard-tablet
deleted file mode 100644
index d19005ab90..0000000000
--- a/keymaps/hewlett-packard-tablet
+++ /dev/null
@@ -1,6 +0,0 @@
-0x82 prog2 # Funny Key
-0x83 prog1 # Q
-0x84 tab
-0x85 esc
-0x86 pageup
-0x87 pagedown
diff --git a/keymaps/hewlett-packard-tx2 b/keymaps/hewlett-packard-tx2
deleted file mode 100644
index 36a690fcf6..0000000000
--- a/keymaps/hewlett-packard-tx2
+++ /dev/null
@@ -1,3 +0,0 @@
-0xC2 media
-0xD8 f23 # Toggle touchpad button on tx2 (OFF)
-0xD9 f22 # Toggle touchpad button on tx2 (ON)
diff --git a/keymaps/hewlett-packard_elitebook-8440p b/keymaps/hewlett-packard_elitebook-8440p
deleted file mode 100644
index e0c2a1a859..0000000000
--- a/keymaps/hewlett-packard_elitebook-8440p
+++ /dev/null
@@ -1,5 +0,0 @@
-0x88 www
-0xA0 mute
-0xAE volumedown
-0xB0 volumeup
-0xEC mail
diff --git a/keymaps/hewlett-packard_elitebook-8460p b/keymaps/hewlett-packard_elitebook-8460p
deleted file mode 100644
index 59035f4005..0000000000
--- a/keymaps/hewlett-packard_elitebook-8460p
+++ /dev/null
@@ -1,3 +0,0 @@
-0xF8 wlan   # Wireless HW switch button
-0xB3 prog1  # Fn+F11 - Ambient Light Sensor button
-0xB1 prog2  # Fn+ESC - System information button
diff --git a/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
deleted file mode 100644
index 027e50bf88..0000000000
--- a/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
+++ /dev/null
@@ -1,7 +0,0 @@
-0x900f0 screenlock
-0x900f1 wlan
-0x900f2 switchvideomode
-0x900f3 suspend
-0x900f4 brightnessup
-0x900f5 brightnessdown
-0x900f8 zoom
diff --git a/keymaps/inventec-symphony_6.0_7.0 b/keymaps/inventec-symphony_6.0_7.0
deleted file mode 100644
index 4a8b4ba5a7..0000000000
--- a/keymaps/inventec-symphony_6.0_7.0
+++ /dev/null
@@ -1,2 +0,0 @@
-0xF3 prog2
-0xF4 prog1
diff --git a/keymaps/lenovo-3000 b/keymaps/lenovo-3000
deleted file mode 100644
index 7973369a9d..0000000000
--- a/keymaps/lenovo-3000
+++ /dev/null
@@ -1,5 +0,0 @@
-0x8B switchvideomode # Fn+F7 video
-0x96 wlan            # Fn+F5 wireless
-0x97 sleep           # Fn+F4 suspend
-0x98 suspend         # Fn+F12 hibernate
-0xB4 prog1           # Lenovo Care
diff --git a/keymaps/lenovo-ideapad b/keymaps/lenovo-ideapad
deleted file mode 100644
index 0de16466b4..0000000000
--- a/keymaps/lenovo-ideapad
+++ /dev/null
@@ -1,8 +0,0 @@
-# Key codes observed on S10-3, assumed valid on other IdeaPad models
-0x81 rfkill             # does nothing in BIOS
-0x83 display_off        # BIOS toggles screen state
-0xB9 brightnessup       # does nothing in BIOS
-0xBA brightnessdown     # does nothing in BIOS
-0xF1 camera             # BIOS toggles camera power
-0xf2 f21                # touchpad toggle (key alternately emits F2 and F3)
-0xf3 f21
diff --git a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
deleted file mode 100644
index 78701acbc7..0000000000
--- a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
+++ /dev/null
@@ -1,13 +0,0 @@
-0x90012 screenlock       # Fn+F2
-0x90013 battery          # Fn+F3
-0x90014 wlan             # Fn+F5
-0x90016 switchvideomode  # Fn+F7
-0x90017 f21              # Fn+F8  touchpad toggle
-0x90019 suspend          # Fn+F12
-0x9001A brightnessup     # Fn+Home
-0x9001B brightnessdown   # Fn+End
-0x9001D zoom             # Fn+Space
-0x90011 prog1            # ThinkVantage button
-
-0x90015 camera           # Fn+F6 headset/camera VoIP key  ??
-0x90010 f20              # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html
diff --git a/keymaps/lenovo-thinkpad_x200_tablet b/keymaps/lenovo-thinkpad_x200_tablet
deleted file mode 100644
index f22ec65a5b..0000000000
--- a/keymaps/lenovo-thinkpad_x200_tablet
+++ /dev/null
@@ -1,6 +0,0 @@
-0x5D menu
-0x63 fn
-0x66 screenlock
-0x67 cyclewindows  # bezel circular arrow
-0x68 setup         # bezel setup / menu
-0x6c direction     # rotate screen
diff --git a/keymaps/lenovo-thinkpad_x6_tablet b/keymaps/lenovo-thinkpad_x6_tablet
deleted file mode 100644
index 49c5f64f4c..0000000000
--- a/keymaps/lenovo-thinkpad_x6_tablet
+++ /dev/null
@@ -1,8 +0,0 @@
-0x6C f21         # rotate
-0x68 screenlock  # screenlock
-0x6B esc         # escape
-0x6D right       # right on d-pad
-0x6E left        # left on d-pad
-0x71 up          # up on d-pad
-0x6F down        # down on d-pad
-0x69 enter       # enter on d-pad
diff --git a/keymaps/lg-x110 b/keymaps/lg-x110
deleted file mode 100644
index bbc29a13e9..0000000000
--- a/keymaps/lg-x110
+++ /dev/null
@@ -1,12 +0,0 @@
-0xA0 mute        # Fn+F9
-0xAE volumedown  # Fn+Left
-0xAF search      # Fn+F3
-0xB0 volumeup    # Fn+Right
-0xB1 battery     # Fn+F10 Info
-0xB3 suspend     # Fn+F12
-0xDF sleep       # Fn+F4
-# 0xE2 bluetooth # satellite dish2
-0xE4 f21         # Fn+F5 Touchpad toggle
-0xF6 wlan        # Fn+F6
-0xF7 reserved    # Fn+Down brightness down
-0xF8 reserved    # Fn+Up brightness up
diff --git a/keymaps/logitech-usb b/keymaps/logitech-usb
deleted file mode 100644
index b575aa7c47..0000000000
--- a/keymaps/logitech-usb
+++ /dev/null
@@ -1,6 +0,0 @@
-0x90001 shop    # Shopping
-0x90002 config  # iTouch
-0x90003 finance # Finance
-0x90004 prog1   # My Sites
-0x90005 prog2   # Community
-0xC0183 media   # Media
diff --git a/keymaps/logitech-wave b/keymaps/logitech-wave
deleted file mode 100644
index 781dbe26f7..0000000000
--- a/keymaps/logitech-wave
+++ /dev/null
@@ -1,16 +0,0 @@
-0x9001C scale          # expo
-0x9001F zoomout        # zoom out
-0x90020 zoomin         # zoom in
-0x9003D prog1          # gadget
-0x90005 camera         # camera
-0x90018 media          # media center
-0x90041 wordprocessor  # Fn+F1 (Word)
-0x90042 spreadsheet    # Fn+F2 (Excel)
-0x90043 calendar       # Fn+F3 (calendar)
-0x90044 prog2          # Fn+F4 (program a)
-0x90045 prog3          # Fn+F5 (program b)
-0x90046 prog4          # Fn+F6 (program c)
-0x90048 messenger      # Fn+F8 (MSN messenger)
-0x9002D find           # Fn+F10 (search www)
-0x9004B search         # Fn+F11 (search PC)
-0x9004C ejectclosecd   # Fn+F12 (eject)
diff --git a/keymaps/logitech-wave-cordless b/keymaps/logitech-wave-cordless
deleted file mode 100644
index b40c4dbff7..0000000000
--- a/keymaps/logitech-wave-cordless
+++ /dev/null
@@ -1,15 +0,0 @@
-0xD4 zoomin
-0xCC zoomout
-0xC0183 media
-0xC1005 camera
-0xC101F zoomout
-0xC1020 zoomin
-0xC1041 wordprocessor
-0xC1042 spreadsheet
-0xC1043 calendar
-0xC1044 prog2   # Fn+F4 (program a)
-0xC1045 prog3   # Fn+F5 (program b)
-0xC1046 prog4   # Fn+F6 (program c)
-0xC1048 messenger
-0xC104A find    # Fn+F10 (search www)
-0xC104C ejectclosecd
diff --git a/keymaps/logitech-wave-pro-cordless b/keymaps/logitech-wave-pro-cordless
deleted file mode 100644
index e7aa02206c..0000000000
--- a/keymaps/logitech-wave-pro-cordless
+++ /dev/null
@@ -1,12 +0,0 @@
-0xC01B6 camera
-0xC0183 media
-0xC0184 wordprocessor
-0xC0186 spreadsheet
-0xC018E calendar
-0xC0223 homepage
-0xC01BC messenger
-0xC018A mail
-0xC0221 search
-0xC00B8 ejectcd
-0xC022D zoomin
-0xC022E zoomout
diff --git a/keymaps/maxdata-pro_7000 b/keymaps/maxdata-pro_7000
deleted file mode 100644
index 0d5bbf3ce5..0000000000
--- a/keymaps/maxdata-pro_7000
+++ /dev/null
@@ -1,9 +0,0 @@
-0x97 prog2
-0x9F prog1
-0xA0 mute       # Fn+F5
-0x82 www
-0xEC email
-0xAE volumedown # Fn+Down
-0xB0 volumeup   # Fn+Up
-0xDF suspend    # Fn+F2
-0xF5 help
diff --git a/keymaps/medion-fid2060 b/keymaps/medion-fid2060
deleted file mode 100644
index 75b1647e43..0000000000
--- a/keymaps/medion-fid2060
+++ /dev/null
@@ -1,2 +0,0 @@
-0x6B channeldown  # Thottle Down
-0x6D channelup    # Thottle Up
diff --git a/keymaps/medionnb-a555 b/keymaps/medionnb-a555
deleted file mode 100644
index b69618308b..0000000000
--- a/keymaps/medionnb-a555
+++ /dev/null
@@ -1,4 +0,0 @@
-0x63 www    # N button
-0x66 prog1  # link 1 button
-0x67 email  # envelope button
-0x69 prog2  # link 2 button
diff --git a/keymaps/micro-star b/keymaps/micro-star
deleted file mode 100644
index c283cde8bb..0000000000
--- a/keymaps/micro-star
+++ /dev/null
@@ -1,13 +0,0 @@
-0xA0 mute            # Fn+F9
-0xAE volumedown      # Fn+F7
-0xB0 volumeup        # Fn+F8
-0xB2 www             # e button
-0xDF sleep           # Fn+F12
-0xE2 bluetooth       # satellite dish2
-0xE4 f21             # Fn+F3 Touchpad disable
-0xEC email           # envelope button
-0xEE camera          # Fn+F6 camera disable
-0xF6 wlan            # satellite dish1
-0xF7 brightnessdown  # Fn+F4
-0xF8 brightnessup    # Fn+F5
-0xF9 search
diff --git a/keymaps/module-asus-w3j b/keymaps/module-asus-w3j
deleted file mode 100644
index 773e0b3e82..0000000000
--- a/keymaps/module-asus-w3j
+++ /dev/null
@@ -1,11 +0,0 @@
-0x41 nextsong
-0x45 playpause
-0x43 stopcd
-0x40 previoussong
-0x4C ejectclosecd
-0x32 mute
-0x31 volumedown
-0x30 volumeup
-0x5D wlan
-0x7E bluetooth
-0x8A media # high keycode: "tv"
diff --git a/keymaps/module-ibm b/keymaps/module-ibm
deleted file mode 100644
index ee61b6cf3b..0000000000
--- a/keymaps/module-ibm
+++ /dev/null
@@ -1,16 +0,0 @@
-0x01 battery         # Fn+F2
-0x02 screenlock      # Fn+F3
-0x03 sleep           # Fn+F4
-0x04 wlan            # Fn+F5
-0x06 switchvideomode # Fn+F7
-0x07 zoom            # Fn+F8 screen expand
-0x08 f24             # Fn+F9 undock
-0x0B suspend         # Fn+F12
-0x0F brightnessup    # Fn+Home
-0x10 brightnessdown  # Fn+End
-0x11 kbdillumtoggle  # Fn+PgUp - ThinkLight
-0x13 zoom            # Fn+Space
-0x14 volumeup
-0x15 volumedown
-0x16 mute
-0x17 prog1           # ThinkPad/ThinkVantage button  (high keycode: "vendor")
diff --git a/keymaps/module-lenovo b/keymaps/module-lenovo
deleted file mode 100644
index ed31899d0f..0000000000
--- a/keymaps/module-lenovo
+++ /dev/null
@@ -1,17 +0,0 @@
-0x1 screenlock       # Fn+F2
-0x2 battery          # Fn+F3
-0x3 sleep            # Fn+F4
-0x4 wlan             # Fn+F5
-0x6 switchvideomode  # Fn+F7
-0x7 f21              # Fn+F8 touchpadtoggle
-0x8 f24              # Fn+F9 undock
-0xB suspend          # Fn+F12
-0xF brightnessup     # Fn+Home
-0x10 brightnessdown  # Fn+End
-0x11 kbdillumtoggle  # Fn+PgUp - ThinkLight
-0x13 zoom            # Fn+Space
-0x14 volumeup
-0x15 volumedown
-0x16 mute
-0x17 prog1           # ThinkPad/ThinkVantage button (high keycode: "vendor")
-0x1A f20             # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html
diff --git a/keymaps/module-sony b/keymaps/module-sony
deleted file mode 100644
index 5d3742b463..0000000000
--- a/keymaps/module-sony
+++ /dev/null
@@ -1,8 +0,0 @@
-0x06 mute             # Fn+F2
-0x07 volumedown       # Fn+F3
-0x08 volumeup         # Fn+F4
-0x09 brightnessdown   # Fn+F5
-0x0A brightnessup     # Fn+F6
-0x0B switchvideomode  # Fn+F7
-0x0E zoom             # Fn+F10
-0x10 suspend          # Fn+F12
diff --git a/keymaps/module-sony-old b/keymaps/module-sony-old
deleted file mode 100644
index 596a34258a..0000000000
--- a/keymaps/module-sony-old
+++ /dev/null
@@ -1,2 +0,0 @@
-0x06 battery
-0x07 mute
diff --git a/keymaps/module-sony-vgn b/keymaps/module-sony-vgn
deleted file mode 100644
index cb4ce33717..0000000000
--- a/keymaps/module-sony-vgn
+++ /dev/null
@@ -1,8 +0,0 @@
-0x00 brightnessdown   # Fn+F5
-0x10 brightnessup     # Fn+F6
-0x11 switchvideomode  # Fn+F7
-0x12 zoomout
-0x14 zoomin
-0x15 suspend          # Fn+F12
-0x17 prog1
-0x20 media
diff --git a/keymaps/module-sony-vpc b/keymaps/module-sony-vpc
deleted file mode 100644
index 1b52779535..0000000000
--- a/keymaps/module-sony-vpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# 0x05 touchpad_toggle # fn_f1 -> KEY_TOUCHPAD_TOGGLE
-0x05 f21      # fn_f1 -> KEY_F21 (The actual touchpad toggle)
-0x0d zoomout  # fn_f9
-0x0e zoomin   # fn_f10
diff --git a/keymaps/olpc-xo b/keymaps/olpc-xo
deleted file mode 100644
index 0fa497211a..0000000000
--- a/keymaps/olpc-xo
+++ /dev/null
@@ -1,74 +0,0 @@
-0x59 fn
-0x81 fn_esc
-0xF9 camera
-0xF8 sound # Fn+CAMERA = Mic
-
-
-# Function key mappings, as per
-#    http://dev.laptop.org/ticket/10213#comment:20
-#
-# Unmodified F1-F8 produce F1-F8, so no remap necessary.
-# Unmodified F9-F12 control brightness and volume.
-0x43 brightnessdown
-0x44 brightnessup
-0x57 volumedown
-0x58 volumeup
-
-# Fn-modified fkeys all produce the unmodified version of the key.
-0xBB f1
-0xBC f2
-0xBD f3
-0xBE f4
-0xBF f5
-0xC0 f6
-0xC1 f7
-0xC2 f8
-0xC3 f9
-0xC4 f10
-0xD7 f11
-0xD8 f12
-
-
-# Using F13-F21 for the .5 F keys right now.
-0xF7 f13
-0xF6 f14
-0xF5 f15
-0xF4 f16
-0xF3 f17
-0xF2 f18
-0xF1 f19
-0xF0 f20
-0xEF f21
-
-0xEE chat
-0xE4 chat   # Just mapping Fn+Chat to Chat for now
-0xDD menu   # Frame
-0xDA prog1  # Fn+Frame
-
-# The Fn of some keys is other keys
-0xD3 delete
-0xD2 insert
-0xC9 pageup
-0xD1 pagedown
-0xC7 home
-0xCF end
-
-# Language key - don't ask what they are doing as KEY_HP
-0x73 hp
-0x7E hp
-
-0xDB leftmeta         # left grab
-0xDC rightmeta        # right grab
-0x85 rightmeta        # Right grab releases on a different scancode
-0xD6 kbdillumtoggle   # Fn+Space
-0x69 switchvideomode  # Brightness key
-
-# Game keys
-0x65 kp8 # up
-0x66 kp2 # down
-0x67 kp4 # left
-0x68 kp6 # right
-0xE5 kp9 # pgup
-0xE6 kp3 # pgdn
-0xE7 kp7 # home
-0xE8 kp1 # end
diff --git a/keymaps/onkyo b/keymaps/onkyo
deleted file mode 100644
index 8fc4cffa92..0000000000
--- a/keymaps/onkyo
+++ /dev/null
@@ -1,14 +0,0 @@
-0xA0 mute            # Fn+D
-0xAE volumedown      # Fn+F
-0xB0 volumeup        # Fn+G
-0xDF sleep           # Fn+W
-0xE0 bluetooth       # Fn+H
-0xE2 cyclewindows    # Fn+Esc
-0xEE battery         # Fn+Q
-0xF0 media           # Fn+R
-0xF5 switchvideomode # Fn+E
-0xF6 camera          # Fn+T
-0xF7 f21             # Fn+Y (touchpad toggle)
-0xF8 brightnessup    # Fn+S
-0xF9 brightnessdown  # Fn+A
-0xFB wlan            # Fn+J
diff --git a/keymaps/oqo-model2 b/keymaps/oqo-model2
deleted file mode 100644
index b7f4851abe..0000000000
--- a/keymaps/oqo-model2
+++ /dev/null
@@ -1,5 +0,0 @@
-0x8E wlan
-0xF0 switchvideomode
-0xF1 mute
-0xF2 volumedown
-0xF3 volumeup
diff --git a/keymaps/samsung-other b/keymaps/samsung-other
deleted file mode 100644
index d950c2cbd9..0000000000
--- a/keymaps/samsung-other
+++ /dev/null
@@ -1,14 +0,0 @@
-0x74 prog1            # User key
-0x75 www
-0x78 mail
-0x82 switchvideomode  # Fn+F4 CRT/LCD (high keycode: "displaytoggle")
-0x83 battery          # Fn+F2
-0x84 prog1            # Fn+F5 backlight on/off
-0x86 wlan             # Fn+F9
-0x88 brightnessup     # Fn+Up
-0x89 brightnessdown   # Fn+Down
-0xB1 prog2            # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice)
-0xB3 prog3            # Fn+F8 switch power mode (battery/dynamic/performance)
-0xB4 wlan             # Fn+F9 (X60P)
-0xF7 f22              # Fn+F10 Touchpad on
-0xF9 f23              # Fn+F10 Touchpad off
diff --git a/keymaps/samsung-series-3 b/keymaps/samsung-series-3
deleted file mode 100644
index 303a428b47..0000000000
--- a/keymaps/samsung-series-3
+++ /dev/null
@@ -1,3 +0,0 @@
-0xCE prog1  # Fn+F1  launch control setting
-0xB3 prog2  # Fn+F11 performance mode
-0xD5 wlan   # Fn+F12 Wi-Fi toggle
diff --git a/keymaps/samsung-series-9 b/keymaps/samsung-series-9
deleted file mode 100644
index c0712f02a0..0000000000
--- a/keymaps/samsung-series-9
+++ /dev/null
@@ -1,5 +0,0 @@
-0x96 kbdillumup         # Fn+F8 keyboard backlight up
-0x97 kbdillumdown       # Fn+F7 keyboard backlight down
-0xD5 wlan               # Fn+F12 Wi-Fi toggle
-0xCE prog1              # Fn+F1 performance mode
-0x8D prog2              # Fn+F6 battery life extender
diff --git a/keymaps/samsung-sq1us b/keymaps/samsung-sq1us
deleted file mode 100644
index ea2141ef84..0000000000
--- a/keymaps/samsung-sq1us
+++ /dev/null
@@ -1,7 +0,0 @@
-0xD4 menu
-0xD8 f1
-0xD9 f10
-0xD6 f3
-0xD7 f9
-0xE4 f5
-0xEE f11
diff --git a/keymaps/samsung-sx20s b/keymaps/samsung-sx20s
deleted file mode 100644
index 9d954ee415..0000000000
--- a/keymaps/samsung-sx20s
+++ /dev/null
@@ -1,4 +0,0 @@
-0x74 mute
-0x75 mute
-0x77 f22 # Touchpad on
-0x79 f23 # Touchpad off
diff --git a/keymaps/toshiba-satellite_a100 b/keymaps/toshiba-satellite_a100
deleted file mode 100644
index 22007be71b..0000000000
--- a/keymaps/toshiba-satellite_a100
+++ /dev/null
@@ -1,2 +0,0 @@
-0xA4 stopcd
-0xB2 www
diff --git a/keymaps/toshiba-satellite_a110 b/keymaps/toshiba-satellite_a110
deleted file mode 100644
index 1429409351..0000000000
--- a/keymaps/toshiba-satellite_a110
+++ /dev/null
@@ -1,10 +0,0 @@
-0x92 stop
-0x93 www
-0x94 media
-0x9E f22 # Touchpad on
-0x9F f23 # Touchpad off
-0xB9 nextsong
-0xD9 brightnessup
-0xEE screenlock
-0xF4 previoussong
-0xF7 playpause
diff --git a/keymaps/toshiba-satellite_m30x b/keymaps/toshiba-satellite_m30x
deleted file mode 100644
index 26e0bbd939..0000000000
--- a/keymaps/toshiba-satellite_m30x
+++ /dev/null
@@ -1,6 +0,0 @@
-0xef brightnessdown
-0xd9 brightnessup
-0xee screenlock
-0x93 media
-0x9e f22 # touchpad enable
-0x9f f23 # touchpad disable
diff --git a/keymaps/zepto-znote b/keymaps/zepto-znote
deleted file mode 100644
index cf72fda47b..0000000000
--- a/keymaps/zepto-znote
+++ /dev/null
@@ -1,11 +0,0 @@
-0x93 switchvideomode    # Fn+F3 Toggle Video Output
-0x95 brightnessdown     # Fn+F4 Brightness Down
-0x91 brightnessup       # Fn+F5 Brightness Up
-0xA5 f23                # Fn+F6 Disable Touchpad
-0xA6 f22                # Fn+F6 Enable Touchpad
-0xA7 bluetooth          # Fn+F10 Enable Bluetooth
-0XA9 bluetooth          # Fn+F10 Disable Bluetooth
-0xF1 wlan               # RF Switch Off
-0xF2 wlan               # RF Switch On
-0xF4 prog1              # P1 Button
-0xF3 prog2              # P2 Button