olpc/sound: move the Mic and HP jacks from /gpio-keys to /audio-complex
The Linux codec drivers really wants to know which GPIOs are used for
connected jack detection and it also eventually registers an input device.
diff --git a/cpu/arm/olpc/sound.fth b/cpu/arm/olpc/sound.fth
index 0cec3b8..1ef2cb7 100644
--- a/cpu/arm/olpc/sound.fth
+++ b/cpu/arm/olpc/sound.fth
@@ -1090,6 +1090,16 @@
" widgets" property
" /audio/port" encode-phandle " dais" property
+ " /gpio" encode-phandle
+ mic-plug-gpio# encode-int encode+
+ 0 encode-int encode+ \ GPIO_ACTIVE_HIGH
+ " mic-det-gpio" property
+
+ " /gpio" encode-phandle
+ hp-plug-gpio# encode-int encode+
+ 0 encode-int encode+ \ GPIO_ACTIVE_HIGH
+ " hp-det-gpio" property
+
\ The name that was hardcoded in the Linux driver was OLPC XO-1.75
" OLPC XO" " model" string-property
diff --git a/dev/olpc/gpio-keys.fth b/dev/olpc/gpio-keys.fth
index 4d6d916..6367b74 100644
--- a/dev/olpc/gpio-keys.fth
+++ b/dev/olpc/gpio-keys.fth
@@ -43,34 +43,6 @@
" gpios" property
finish-device
-new-device
- " microphone_insert" device-name
- " Microphone Plug" " label" string-property
- 5 " linux,input-type" integer-property \ EV_SW
- 4 " linux,code" integer-property \ SW_MICROPHONE_INSERT
- d# 100 " debounce-interval" integer-property
- 0 0 encode-bytes " wakeup-source" property
-
- " /gpio" encode-phandle
- mic-plug-gpio# encode-int encode+
- 0 encode-int encode+ \ GPIO_ACTIVE_HIGH
- " gpios" property
-finish-device
-
-new-device
- " headphone_insert" device-name
- " Headphone Plug" " label" string-property
- 5 " linux,input-type" integer-property \ EV_SW
- 2 " linux,code" integer-property \ SW_HEADPHONE_INSERT
- d# 100 " debounce-interval" integer-property
- 0 0 encode-bytes " wakeup-source" property
-
- " /gpio" encode-phandle
- hp-plug-gpio# encode-int encode+
- 0 encode-int encode+ \ GPIO_ACTIVE_HIGH
- " gpios" property
-finish-device
-
end-package
\ LICENSE_BEGIN
