From 6cfa7e57887fe1b021cc50b4b7547d2e51240ac1 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 18 Nov 2017 11:59:22 +0100 Subject: [PATCH] ramips: fix DCH-M225 support Setting the pins of the uartf group to gpio+i2s at the time the i2c driver loads is to late for the WPS gpio button. The gpio-keys driver fails to load since the pin used by the WPS button is not yet set to GPIO. The WPS button with the rfkill keycode is essential for this wifi only board. Add the missing sound and i2c kernel modules corresponding to the device nodes. Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/DCH-M225.dts | 7 ++++++- target/linux/ramips/image/mt7620.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts index 3465c70ad0..3c269a5c01 100644 --- a/target/linux/ramips/dts/DCH-M225.dts +++ b/target/linux/ramips/dts/DCH-M225.dts @@ -89,7 +89,7 @@ #sound-dai-cells = <0>; status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&gpio_i2s_pins>, <&wm8960_mclk_pins>; + pinctrl-0 = <&wm8960_mclk_pins>; }; &spi0 { @@ -157,6 +157,11 @@ ralink,function = "gpio"; }; + gpio_i2s { + ralink,group = "uartf"; + ralink,function = "gpio i2s"; + }; + pa { ralink,group = "pa"; ralink,function = "pa"; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 1736d9f480..af1bda4a9d 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -445,7 +445,7 @@ define Device/dch-m225 seama-seal -m "signature=wapn22_dlink.2013gui_dap1320b" | \ check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := D-Link DCH-M225 - DEVICE_PACKAGES := kmod-mt76 + DEVICE_PACKAGES := kmod-mt76 kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink endef TARGET_DEVICES += dch-m225 -- 2.30.2