Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into lean
Browse files Browse the repository at this point in the history
  • Loading branch information
@tossp
tossp committed Sep 30, 2019
2 parents 94979fd + 6f6db95 commit bfd8857
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 38 deletions.
1 change: 0 additions & 1 deletion target/linux/ramips/base-files/etc/board.d/01_leds
View file
Expand Up @@ -416,7 +416,6 @@ wrh-300cr)
set_wifi_led "$boardname:green:wlan"
ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
;;
XiaoYu-C5|\
xzwifi,creativebox-v1)
ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10"
;;
Expand Down
53 changes: 20 additions & 33 deletions target/linux/ramips/dts/XiaoYu-C5.dts
View file
Expand Up @@ -10,58 +10,49 @@
model = "XiaoYu-C5";

aliases {
led-boot = &led_system;
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
};

memory@0 {
device_type = "memory";
reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
led-boot = &led_sys;
led-failsafe = &led_sys;
led-running = &led_sys;
led-upgrade = &led_sys;
label-mac-device = &ethernet;
};

chosen {
bootargs = "console=ttyS0,115200";
bootargs = "console=ttyS0,57600";
};

gpio-leds {
leds {
compatible = "gpio-leds";

led_system:system {
label = "XiaoYu-C5:green:system";
gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
};

work {
label = "XiaoYu-C5:green:usb3.0";
label = "xy-c5:green:work";
gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
linux,default-trigger = "usbport";
};

led_sys: sys {
label = "xy-c5:green:sys";
gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
};
};

gpio-keys-polled {
compatible = "gpio-keys-polled";
poll-interval = <20>;
keys {
compatible = "gpio-keys";

reset {
label = "reset";
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};

};

&spi0 {
status = "okay";

m25p80@0 {
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
m25p,chunked-io = <32>;
spi-max-frequency = <25000000>;

partitions {
compatible = "fixed-partitions";
Expand Down Expand Up @@ -89,11 +80,7 @@
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x50000 0x1fa0000>;
};
partition@1ff0000 {
label = "mib0";
reg = <0x1ff0000 0x10000>;
reg = <0x50000 0x1fb0000>;
};
};
};
Expand All @@ -110,8 +97,8 @@
&pinctrl {
state_default: pinctrl0 {
gpio {
ralink,group = "i2c", "jtag" , "uart2", "uart3";
ralink,group = "uart3", "wdt";
ralink,function = "gpio";
};
};
};
};
3 changes: 1 addition & 2 deletions target/linux/ramips/image/mt7621.mk
View file
Expand Up @@ -584,8 +584,7 @@ define Device/XiaoYu-C5
DTS := XiaoYu-C5
IMAGE_SIZE := $(ralink_default_fw_size_32M)
DEVICE_TITLE := XiaoYu-C5
DEVICE_PACKAGES := \
kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3
endef
TARGET_DEVICES += XiaoYu-C5

Expand Down
15 changes: 15 additions & 0 deletions target/linux/ramips/modules.mk
View file
Expand Up @@ -136,3 +136,18 @@ define KernelPackage/sound-mt7620/description
endef

$(eval $(call KernelPackage,sound-mt7620))

define KernelPackage/sound-mt76x8-wm8960
TITLE:=MT76x8 WM8960 ALSA SoC Machine Driver
DEPENDS:=@TARGET_ramips +kmod-sound-mt7620 +kmod-i2c-mt7628 @!TARGET_ramips_rt288x
KCONFIG:=CONFIG_SND_SOC_MT76X8_WM8960
FILES:=$(LINUX_DIR)/sound/soc/ralink/snd-soc-mt76x8-wm8960.ko
AUTOLOAD:=$(call AutoLoad,91,snd-soc-mt76x8-wm8960)
$(call AddDepends/sound)
endef

define KernelPackage/sound-mt76x8-wm8960/description
ASoC Audio driver for Ralink SoC with WM8960 codec.
endef

$(eval $(call KernelPackage,sound-mt76x8-wm8960))
181 changes: 179 additions & 2 deletions target/linux/ramips/patches-4.14/0048-asoc-add-mt7620-support.patch
View file
Expand Up @@ -58,7 +58,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
obj-$(CONFIG_SND_SOC) += sirf/
--- /dev/null
+++ b/sound/soc/ralink/Kconfig
@@ -0,0 +1,8 @@
@@ -0,0 +1,15 @@
+config SND_RALINK_SOC_I2S
+ depends on RALINK && SND_SOC && !SOC_RT288X
+ select SND_SOC_GENERIC_DMAENGINE_PCM
Expand All @@ -67,15 +67,26 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ help
+ Say Y if you want to use I2S protocol and I2S codec on Ralink/MediaTek
+ based boards.
+
+config SND_SOC_MT76X8_WM8960
+ tristate "ASoC Audio driver for Ralink SoC with WM8960 codec"
+ depends on SND_RALINK_SOC_I2S && I2C
+ select SND_SOC_WM8960
+ help
+ Say Y if you want to use WM8960 codec on Ralink/MediaTek based boards.
--- /dev/null
+++ b/sound/soc/ralink/Makefile
@@ -0,0 +1,6 @@
@@ -0,0 +1,10 @@
+#
+# Ralink/MediaTek Platform Support
+#
+snd-soc-ralink-i2s-objs := ralink-i2s.o
+
+obj-$(CONFIG_SND_RALINK_SOC_I2S) += snd-soc-ralink-i2s.o
+
+snd-soc-mt76x8-wm8960-objs := mt76x8-wm8960.o
+
+obj-$(CONFIG_SND_SOC_MT76X8_WM8960) += snd-soc-mt76x8-wm8960.o
--- /dev/null
+++ b/sound/soc/ralink/ralink-i2s.c
@@ -0,0 +1,965 @@
Expand Down Expand Up @@ -1044,3 +1055,169 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+MODULE_DESCRIPTION("Ralink/MediaTek I2S driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
--- /dev/null
+++ b/sound/soc/ralink/mt76x8-wm8960.c
@@ -0,0 +1,163 @@
+/*
+ * mt76x8-wm8960.c -- MT76x8 WM8960 ALSA SoC machine driver
+ *
+ * Copyright 2018 Jack Chen <redchenjs@live.com>
+ *
+ * Based on mt2701-wm8960.c
+ * Copyright (c) 2017 MediaTek Inc.
+ * Author: Ryder Lee <ryder.lee@mediatek.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include <sound/soc-dapm.h>
+#include <linux/pinctrl/consumer.h>
+
+#include "../codecs/wm8960.h"
+
+static const struct snd_soc_dapm_widget mt76x8_wm8960_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+ SND_SOC_DAPM_SPK("Ext Spk", NULL),
+ SND_SOC_DAPM_LINE("Line In", NULL),
+ SND_SOC_DAPM_MIC("Mic", NULL),
+};
+
+static int mt76x8_wm8960_ops_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ unsigned int mclk_rate;
+ unsigned int rate = params_rate(params);
+ unsigned int div_mclk_over_bck = rate > 192000 ? 2 : 4;
+ unsigned int div_bck_over_lrck = 64;
+
+ mclk_rate = rate * div_bck_over_lrck * div_mclk_over_bck;
+
+ snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_rate, SND_SOC_CLOCK_OUT);
+ snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate, SND_SOC_CLOCK_IN);
+
+ return 0;
+}
+
+static struct snd_soc_ops mt76x8_wm8960_ops = {
+ .hw_params = mt76x8_wm8960_ops_hw_params,
+};
+
+static struct snd_soc_dai_link mt76x8_wm8960_dai_links[] = {
+ {
+ .name = "wm8960-codec",
+ .stream_name = "wm8960-hifi",
+ .cpu_dai_name = "ralink-i2s",
+ .codec_dai_name = "wm8960-hifi",
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS,
+ .ops = &mt76x8_wm8960_ops,
+ .dpcm_playback = 1,
+ .dpcm_capture = 1,
+ },
+};
+
+static struct snd_soc_card mt76x8_wm8960_card = {
+ .name = "MT76x8 WM8960 ASoC Card",
+ .owner = THIS_MODULE,
+ .dai_link = mt76x8_wm8960_dai_links,
+ .num_links = ARRAY_SIZE(mt76x8_wm8960_dai_links),
+ .dapm_widgets = mt76x8_wm8960_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(mt76x8_wm8960_dapm_widgets),
+};
+
+static int mt76x8_wm8960_machine_probe(struct platform_device *pdev)
+{
+ struct snd_soc_card *card = &mt76x8_wm8960_card;
+ struct device_node *platform_node, *codec_node;
+ struct platform_device *platform_dev;
+ struct i2c_client *codec_dev;
+ int ret, i;
+
+ platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);
+ if (!platform_node) {
+ dev_err(&pdev->dev, "property 'platform' missing or invalid\n");
+ return -EINVAL;
+ }
+ platform_dev = of_find_device_by_node(platform_node);
+ if (!platform_dev) {
+ dev_err(&pdev->dev, "failed to find platform device\n");
+ return -EINVAL;
+ }
+ for (i=0; i<card->num_links; i++) {
+ if (mt76x8_wm8960_dai_links[i].platform_name) {
+ continue;
+ }
+ mt76x8_wm8960_dai_links[i].platform_of_node = platform_node;
+ }
+
+ card->dev = &pdev->dev;
+
+ codec_node = of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);
+ if (!codec_node) {
+ dev_err(&pdev->dev, "property 'audio-codec' missing or invalid\n");
+ return -EINVAL;
+ }
+ codec_dev = of_find_i2c_device_by_node(codec_node);
+ if (!codec_dev || !codec_dev->dev.driver) {
+ dev_err(&pdev->dev, "failed to find audio codec device\n");
+ return -EINVAL;
+ }
+ for (i=0; i<card->num_links; i++) {
+ if (mt76x8_wm8960_dai_links[i].codec_name) {
+ continue;
+ }
+ mt76x8_wm8960_dai_links[i].codec_of_node = codec_node;
+ }
+
+ ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
+ if (ret) {
+ dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret);
+ return ret;
+ }
+
+ ret = devm_snd_soc_register_card(&pdev->dev, card);
+ if (ret) {
+ dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret);
+ }
+
+ return ret;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id mt76x8_wm8960_machine_dt_match[] = {
+ {.compatible = "mediatek,mt76x8-wm8960-machine"},
+ {}
+};
+#endif
+
+static struct platform_driver mt76x8_wm8960_machine = {
+ .driver = {
+ .name = "mt76x8-wm8960",
+ .owner = THIS_MODULE,
+#ifdef CONFIG_OF
+ .of_match_table = mt76x8_wm8960_machine_dt_match,
+#endif
+ },
+ .probe = mt76x8_wm8960_machine_probe,
+};
+
+module_platform_driver(mt76x8_wm8960_machine);
+
+/* Module information */
+MODULE_DESCRIPTION("MT76x8 WM8960 ALSA SoC machine driver");
+MODULE_AUTHOR("Jack Chen <redchenjs@live.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("MT76x8 WM8960 ASoC driver");

0 comments on commit bfd8857

Please sign in to comment.