mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
746 lines
21 KiB
Diff
746 lines
21 KiB
Diff
From 87d450d98ef1f69dd6f5255c3b7e665c130935ea Mon Sep 17 00:00:00 2001
|
|
From: allocom <sparky-dev@allo.com>
|
|
Date: Thu, 19 Apr 2018 12:12:26 +0530
|
|
Subject: [PATCH 281/454] Drivers for Allo Katana DAC
|
|
|
|
---
|
|
arch/arm/boot/dts/overlays/Makefile | 1 +
|
|
arch/arm/boot/dts/overlays/README | 6 +
|
|
.../allo-katana-dac-audio-overlay.dts | 46 +++
|
|
arch/arm/configs/bcm2709_defconfig | 1 +
|
|
arch/arm/configs/bcmrpi_defconfig | 1 +
|
|
sound/soc/bcm/Kconfig | 7 +
|
|
sound/soc/bcm/Makefile | 2 +
|
|
sound/soc/bcm/allo-katana-dac.c | 105 ++++++
|
|
sound/soc/codecs/Kconfig | 10 +
|
|
sound/soc/codecs/Makefile | 4 +
|
|
sound/soc/codecs/sabre-ess-i2c.c | 69 ++++
|
|
sound/soc/codecs/sabre-ess.c | 300 ++++++++++++++++++
|
|
sound/soc/codecs/sabre-ess.h | 62 ++++
|
|
13 files changed, 614 insertions(+)
|
|
create mode 100644 arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
|
|
create mode 100644 sound/soc/bcm/allo-katana-dac.c
|
|
create mode 100644 sound/soc/codecs/sabre-ess-i2c.c
|
|
create mode 100644 sound/soc/codecs/sabre-ess.c
|
|
create mode 100644 sound/soc/codecs/sabre-ess.h
|
|
|
|
--- a/arch/arm/boot/dts/overlays/Makefile
|
|
+++ b/arch/arm/boot/dts/overlays/Makefile
|
|
@@ -9,6 +9,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
|
|
akkordion-iqdacplus.dtbo \
|
|
allo-boss-dac-pcm512x-audio.dtbo \
|
|
allo-digione.dtbo \
|
|
+ allo-katana-dac-audio.dtbo \
|
|
allo-piano-dac-pcm512x-audio.dtbo \
|
|
allo-piano-dac-plus-pcm512x-audio.dtbo \
|
|
applepi-dac.dtbo \
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -317,6 +317,12 @@ Load: dtoverlay=allo-digione
|
|
Params: <None>
|
|
|
|
|
|
+Name: allo-katana
|
|
+Info: Configures the Allo Katana audio card
|
|
+Load: dtoverlay=allo-katana-dac-audio
|
|
+Params: <None>
|
|
+
|
|
+
|
|
Name: allo-piano-dac-pcm512x-audio
|
|
Info: Configures the Allo Piano DAC (2.0/2.1) audio cards.
|
|
(NB. This initial support is for 2.0 channel audio ONLY! ie. stereo.
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
|
|
@@ -0,0 +1,46 @@
|
|
+/*
|
|
+ * Definitions for Allo Katana DAC boards
|
|
+ *
|
|
+ * NB. The Katana DAC board contains SABER DAC.
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+ compatible = "brcm,bcm2708";
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&i2s>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&i2c1>;
|
|
+ __overlay__ {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ status = "okay";
|
|
+
|
|
+ sabre-ess@30 {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "saber,sabre-ess";
|
|
+ reg = <0x30>;
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@2 {
|
|
+ target = <&sound>;
|
|
+ katana_dac: __overlay__ {
|
|
+ compatible = "allo,katana-dac";
|
|
+ i2s-controller = <&i2s>;
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
+
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
@@ -894,6 +894,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
|
|
+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
|
|
CONFIG_SND_PISOUND=m
|
|
CONFIG_SND_SOC_ADAU1701=m
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -887,6 +887,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
|
|
+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
|
|
CONFIG_SND_PISOUND=m
|
|
CONFIG_SND_SOC_ADAU1701=m
|
|
--- a/sound/soc/bcm/Kconfig
|
|
+++ b/sound/soc/bcm/Kconfig
|
|
@@ -175,6 +175,13 @@ config SND_BCM2708_SOC_ALLO_DIGIONE
|
|
help
|
|
Say Y or M if you want to add support for Allo DigiOne.
|
|
|
|
+config SND_BCM2708_SOC_ALLO_KATANA_DAC
|
|
+ tristate "Support for Allo Katana DAC"
|
|
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
+ select SND_SOC_SABRE_ESS_I2C
|
|
+ help
|
|
+ Say Y or M if you want to add support for Allo Katana DAC.
|
|
+
|
|
config SND_BCM2708_SOC_FE_PI_AUDIO
|
|
tristate "Support for Fe-Pi-Audio"
|
|
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
--- a/sound/soc/bcm/Makefile
|
|
+++ b/sound/soc/bcm/Makefile
|
|
@@ -34,6 +34,7 @@ snd-soc-allo-boss-dac-objs := allo-boss-
|
|
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
|
|
snd-soc-allo-piano-dac-plus-objs := allo-piano-dac-plus.o
|
|
snd-soc-allo-digione-objs := allo-digione.o
|
|
+snd-soc-allo-katana-dac-objs := allo-katana-dac.o
|
|
snd-soc-pisound-objs := pisound.o
|
|
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
|
|
|
|
@@ -60,5 +61,6 @@ obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_D
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS) += snd-soc-allo-piano-dac-plus.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE) += snd-soc-allo-digione.o
|
|
+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-dac.o
|
|
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/bcm/allo-katana-dac.c
|
|
@@ -0,0 +1,105 @@
|
|
+/*
|
|
+ * ASoC Driver for KATANA DAC
|
|
+ *
|
|
+ * Author: Jaikumar <jaikumar@cem-solutions.net>
|
|
+ * Copyright 2018
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU General Public License
|
|
+ * version 2 as published by the Free Software Foundation.
|
|
+ *
|
|
+ * This program is distributed in the hope that it will be useful, but
|
|
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * General Public License for more details.
|
|
+ */
|
|
+
|
|
+#include <linux/module.h>
|
|
+#include <linux/platform_device.h>
|
|
+
|
|
+#include <sound/core.h>
|
|
+#include <sound/pcm.h>
|
|
+#include <sound/pcm_params.h>
|
|
+#include <sound/soc.h>
|
|
+
|
|
+static struct snd_soc_dai_link snd_allo_katana_dac_dai[] = {
|
|
+{
|
|
+ .name = "KATANA DAC",
|
|
+ //.stream_name = "KATANA DAC HiFi [Master]",
|
|
+ .stream_name = "KATANA DAC",
|
|
+ .cpu_dai_name = "bcm2708-i2s.0",
|
|
+ //.codec_dai_name = "es9038q2m-hifi",
|
|
+ .codec_dai_name = "sabre-ess",
|
|
+ .platform_name = "bcm2708-i2s.0",
|
|
+ //.codec_name = "es9038q2m.1-0030",
|
|
+ .codec_name = "sabre-ess.1-0030",
|
|
+ .dai_fmt = SND_SOC_DAIFMT_I2S |
|
|
+ SND_SOC_DAIFMT_NB_NF |
|
|
+ SND_SOC_DAIFMT_CBM_CFM,
|
|
+},
|
|
+};
|
|
+
|
|
+/* audio machine driver */
|
|
+static struct snd_soc_card snd_allo_katana_dac = {
|
|
+ .name = "snd_allo_katana_dac",
|
|
+ .owner = THIS_MODULE,
|
|
+ .dai_link = snd_allo_katana_dac_dai,
|
|
+ .num_links = ARRAY_SIZE(snd_allo_katana_dac_dai),
|
|
+};
|
|
+
|
|
+static int snd_allo_katana_dac_probe(struct platform_device *pdev)
|
|
+{
|
|
+ int ret = 0;
|
|
+
|
|
+ snd_allo_katana_dac.dev = &pdev->dev;
|
|
+
|
|
+ if (pdev->dev.of_node) {
|
|
+ struct device_node *i2s_node;
|
|
+ struct snd_soc_dai_link *dai = &snd_allo_katana_dac_dai[0];
|
|
+
|
|
+ i2s_node = of_parse_phandle(pdev->dev.of_node,
|
|
+ "i2s-controller", 0);
|
|
+
|
|
+ if (i2s_node) {
|
|
+ dai->cpu_dai_name = NULL;
|
|
+ dai->cpu_of_node = i2s_node;
|
|
+ dai->platform_name = NULL;
|
|
+ dai->platform_of_node = i2s_node;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = snd_soc_register_card(&snd_allo_katana_dac);
|
|
+ if (ret && ret != -EPROBE_DEFER)
|
|
+ dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
|
|
+ ret);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int snd_allo_katana_dac_remove(struct platform_device *pdev)
|
|
+{
|
|
+ return snd_soc_unregister_card(&snd_allo_katana_dac);
|
|
+}
|
|
+
|
|
+static const struct of_device_id snd_allo_katana_dac_of_match[] = {
|
|
+ { .compatible = "allo,katana-dac", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, snd_allo_katana_dac_of_match);
|
|
+
|
|
+static struct platform_driver snd_allo_katana_dac_driver = {
|
|
+ .driver = {
|
|
+ .name = "snd-katana-dac",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = snd_allo_katana_dac_of_match,
|
|
+ },
|
|
+ .probe = snd_allo_katana_dac_probe,
|
|
+ .remove = snd_allo_katana_dac_remove,
|
|
+};
|
|
+
|
|
+module_platform_driver(snd_allo_katana_dac_driver);
|
|
+
|
|
+MODULE_AUTHOR("Jaikumar <jaikumar@cem-solutions.net>");
|
|
+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Katana DAC");
|
|
+MODULE_LICENSE("GPL v2");
|
|
+
|
|
--- a/sound/soc/codecs/Kconfig
|
|
+++ b/sound/soc/codecs/Kconfig
|
|
@@ -77,6 +77,7 @@ config SND_SOC_ALL_CODECS
|
|
select SND_SOC_ES8328_SPI if SPI_MASTER
|
|
select SND_SOC_ES8328_I2C if I2C
|
|
select SND_SOC_ES7134
|
|
+ select SND_SOC_SABRE_ESS_I2C if I2C
|
|
select SND_SOC_GTM601
|
|
select SND_SOC_HDAC_HDMI
|
|
select SND_SOC_ICS43432
|
|
@@ -1186,4 +1187,13 @@ config SND_SOC_TPA6130A2
|
|
tristate "Texas Instruments TPA6130A2 headphone amplifier"
|
|
depends on I2C
|
|
|
|
+config SND_SOC_SABRE_ESS
|
|
+ tristate
|
|
+
|
|
+config SND_SOC_SABRE_ESS_I2C
|
|
+ tristate "Sabre SABRE ESS CODEC - I2C"
|
|
+ depends on I2C
|
|
+ select SND_SOC_SABRE_ESS
|
|
+ select REGMAP_I2C
|
|
+
|
|
endmenu
|
|
--- a/sound/soc/codecs/Makefile
|
|
+++ b/sound/soc/codecs/Makefile
|
|
@@ -71,6 +71,8 @@ snd-soc-es8316-objs := es8316.o
|
|
snd-soc-es8328-objs := es8328.o
|
|
snd-soc-es8328-i2c-objs := es8328-i2c.o
|
|
snd-soc-es8328-spi-objs := es8328-spi.o
|
|
+snd-soc-sabre-ess-objs := sabre-ess.o
|
|
+snd-soc-sabre-ess-i2c-objs := sabre-ess-i2c.o
|
|
snd-soc-gtm601-objs := gtm601.o
|
|
snd-soc-hdac-hdmi-objs := hdac_hdmi.o
|
|
snd-soc-ics43432-objs := ics43432.o
|
|
@@ -313,6 +315,8 @@ obj-$(CONFIG_SND_SOC_ES8316) += snd-s
|
|
obj-$(CONFIG_SND_SOC_ES8328) += snd-soc-es8328.o
|
|
obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
|
|
obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
|
|
+obj-$(CONFIG_SND_SOC_SABRE_ESS) += snd-soc-sabre-ess.o
|
|
+obj-$(CONFIG_SND_SOC_SABRE_ESS_I2C) += snd-soc-sabre-ess-i2c.o
|
|
obj-$(CONFIG_SND_SOC_GTM601) += snd-soc-gtm601.o
|
|
obj-$(CONFIG_SND_SOC_HDAC_HDMI) += snd-soc-hdac-hdmi.o
|
|
obj-$(CONFIG_SND_SOC_ICS43432) += snd-soc-ics43432.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/codecs/sabre-ess-i2c.c
|
|
@@ -0,0 +1,69 @@
|
|
+/*
|
|
+ * Driver for the SABRE ESS CODECs
|
|
+ *
|
|
+ * Author: Jaikumar <jaikumar@cem-solutions.net>
|
|
+ * Copyright 2018
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU General Public License
|
|
+ * version 2 as published by the Free Software Foundation.
|
|
+ *
|
|
+ * This program is distributed in the hope that it will be useful, but
|
|
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * General Public License for more details.
|
|
+ */
|
|
+
|
|
+#include <linux/init.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/i2c.h>
|
|
+
|
|
+#include "sabre-ess.h"
|
|
+
|
|
+static int sabre_ess_i2c_probe(struct i2c_client *i2c,
|
|
+ const struct i2c_device_id *id)
|
|
+{
|
|
+ struct regmap *regmap;
|
|
+ struct regmap_config config = sabre_ess_regmap;
|
|
+
|
|
+ regmap = devm_regmap_init_i2c(i2c, &config);
|
|
+ if (IS_ERR(regmap))
|
|
+ return PTR_ERR(regmap);
|
|
+
|
|
+ return sabre_ess_probe(&i2c->dev, regmap);
|
|
+}
|
|
+
|
|
+static int sabre_ess_i2c_remove(struct i2c_client *i2c)
|
|
+{
|
|
+ sabre_ess_remove(&i2c->dev);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct i2c_device_id sabre_ess_i2c_id[] = {
|
|
+ { "sabre-ess", },
|
|
+ { }
|
|
+};
|
|
+MODULE_DEVICE_TABLE(i2c, sabre_ess_i2c_id);
|
|
+
|
|
+static const struct of_device_id sabre_ess_of_match[] = {
|
|
+ { .compatible = "saber,sabre-ess", },
|
|
+ { }
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, sabre_ess_of_match);
|
|
+
|
|
+static struct i2c_driver sabre_ess_i2c_driver = {
|
|
+ .probe = sabre_ess_i2c_probe,
|
|
+ .remove = sabre_ess_i2c_remove,
|
|
+ .id_table = sabre_ess_i2c_id,
|
|
+ .driver = {
|
|
+ .name = "sabre-ess",
|
|
+ .of_match_table = sabre_ess_of_match,
|
|
+ },
|
|
+};
|
|
+
|
|
+module_i2c_driver(sabre_ess_i2c_driver);
|
|
+
|
|
+MODULE_DESCRIPTION("ASoC SABRE ESS codec driver - I2C");
|
|
+MODULE_AUTHOR("Jaikumar <jaikumar@cem-solutions.net>");
|
|
+MODULE_LICENSE("GPL v2");
|
|
+
|
|
--- /dev/null
|
|
+++ b/sound/soc/codecs/sabre-ess.c
|
|
@@ -0,0 +1,300 @@
|
|
+/*
|
|
+ * Driver for the SABRE ESS CODEC
|
|
+ *
|
|
+ * Author: Jaikumar <jaikumar@cem-solutions.net>
|
|
+ * Copyright 2018
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU General Public License
|
|
+ * version 2 as published by the Free Software Foundation.
|
|
+ *
|
|
+ * This program is distributed in the hope that it will be useful, but
|
|
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * General Public License for more details.
|
|
+ */
|
|
+
|
|
+
|
|
+#include <linux/init.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/clk.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/pm_runtime.h>
|
|
+#include <linux/regmap.h>
|
|
+#include <linux/regulator/consumer.h>
|
|
+#include <linux/gcd.h>
|
|
+#include <sound/soc.h>
|
|
+#include <sound/soc-dapm.h>
|
|
+#include <sound/pcm_params.h>
|
|
+#include <sound/tlv.h>
|
|
+
|
|
+#include "sabre-ess.h"
|
|
+
|
|
+struct sabre_ess_priv {
|
|
+ struct regmap *regmap;
|
|
+ int fmt;
|
|
+};
|
|
+
|
|
+static const struct reg_default sabre_ess_reg_defaults[] = {
|
|
+ { SABRE_ESS_RESET, 0x00 },
|
|
+ { SABRE_ESS_VOLUME_1, 0xF0 },
|
|
+ { SABRE_ESS_VOLUME_2, 0xF0 },
|
|
+ { SABRE_ESS_MUTE, 0x00 },
|
|
+ { SABRE_ESS_DSP_PROGRAM, 0x04 },
|
|
+ { SABRE_ESS_DEEMPHASIS, 0x00 },
|
|
+ { SABRE_ESS_DOP, 0x01 },
|
|
+ { SABRE_ESS_FORMAT, 0xb4 },
|
|
+};
|
|
+
|
|
+static const char * const sabre_ess_dsp_program_texts[] = {
|
|
+ "Linear Phase Fast Roll-off Filter",
|
|
+ "Linear Phase Slow Roll-off Filter",
|
|
+ "Minimum Phase Fast Roll-off Filter",
|
|
+ "Minimum Phase Slow Roll-off Filter",
|
|
+ "Apodizing Fast Roll-off Filter",
|
|
+ "Corrected Minimum Phase Fast Roll-off Filter",
|
|
+ "Brick Wall Filter",
|
|
+};
|
|
+
|
|
+static const unsigned int sabre_ess_dsp_program_values[] = {
|
|
+ 0,
|
|
+ 1,
|
|
+ 2,
|
|
+ 3,
|
|
+ 4,
|
|
+ 6,
|
|
+ 7,
|
|
+};
|
|
+
|
|
+static SOC_VALUE_ENUM_SINGLE_DECL(sabre_ess_dsp_program,
|
|
+ SABRE_ESS_DSP_PROGRAM, 0, 0x07,
|
|
+ sabre_ess_dsp_program_texts,
|
|
+ sabre_ess_dsp_program_values);
|
|
+
|
|
+static const char * const sabre_ess_deemphasis_texts[] = {
|
|
+ "Bypass",
|
|
+ "32kHz",
|
|
+ "44.1kHz",
|
|
+ "48kHz",
|
|
+};
|
|
+
|
|
+static const unsigned int sabre_ess_deemphasis_values[] = {
|
|
+ 0,
|
|
+ 1,
|
|
+ 2,
|
|
+ 3,
|
|
+};
|
|
+
|
|
+static SOC_VALUE_ENUM_SINGLE_DECL(sabre_ess_deemphasis,
|
|
+ SABRE_ESS_DEEMPHASIS, 0, 0x03,
|
|
+ sabre_ess_deemphasis_texts,
|
|
+ sabre_ess_deemphasis_values);
|
|
+
|
|
+static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(master_tlv, -12700, 0);
|
|
+
|
|
+static const struct snd_kcontrol_new sabre_ess_controls[] = {
|
|
+ SOC_DOUBLE_R_TLV("Master Playback Volume", SABRE_ESS_VOLUME_1,
|
|
+ SABRE_ESS_VOLUME_2, 0, 255, 1, master_tlv),
|
|
+ SOC_DOUBLE("Master Playback Switch", SABRE_ESS_MUTE, 0, 0, 1, 1),
|
|
+ SOC_ENUM("DSP Program Route", sabre_ess_dsp_program),
|
|
+ SOC_ENUM("Deemphasis Route", sabre_ess_deemphasis),
|
|
+ SOC_SINGLE("DoP Playback Switch", SABRE_ESS_DOP, 0, 1, 1)
|
|
+};
|
|
+
|
|
+static bool sabre_ess_readable_register(struct device *dev, unsigned int reg)
|
|
+{
|
|
+ switch (reg) {
|
|
+ case SABRE_ESS_CHIP_ID_REG:
|
|
+ return true;
|
|
+ default:
|
|
+ return reg < 0xff;
|
|
+ }
|
|
+}
|
|
+
|
|
+static int sabre_ess_hw_params(struct snd_pcm_substream *substream,
|
|
+ struct snd_pcm_hw_params *params,
|
|
+ struct snd_soc_dai *dai)
|
|
+{
|
|
+ struct snd_soc_codec *codec = dai->codec;
|
|
+ struct sabre_ess_priv *sabre_ess = snd_soc_codec_get_drvdata(codec);
|
|
+ int fmt = 0;
|
|
+ int ret;
|
|
+
|
|
+ dev_dbg(codec->dev, "hw_params %u Hz, %u channels\n",
|
|
+ params_rate(params),
|
|
+ params_channels(params));
|
|
+
|
|
+ switch (sabre_ess->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
|
+ case SND_SOC_DAIFMT_CBM_CFM: // master
|
|
+ if (params_channels(params) == 2)
|
|
+ fmt = SABRE_ESS_CHAN_STEREO;
|
|
+ else
|
|
+ fmt = SABRE_ESS_CHAN_MONO;
|
|
+
|
|
+ switch (params_width(params)) {
|
|
+ case 16:
|
|
+ fmt |= SABRE_ESS_ALEN_16;
|
|
+ break;
|
|
+ case 24:
|
|
+ fmt |= SABRE_ESS_ALEN_24;
|
|
+ break;
|
|
+ case 32:
|
|
+ fmt |= SABRE_ESS_ALEN_32;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(codec->dev, "Bad frame size: %d\n",
|
|
+ params_width(params));
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ switch (params_rate(params)) {
|
|
+ case 44100:
|
|
+ fmt |= SABRE_ESS_RATE_44100;
|
|
+ break;
|
|
+ case 48000:
|
|
+ fmt |= SABRE_ESS_RATE_48000;
|
|
+ break;
|
|
+ case 88200:
|
|
+ fmt |= SABRE_ESS_RATE_88200;
|
|
+ break;
|
|
+ case 96000:
|
|
+ fmt |= SABRE_ESS_RATE_96000;
|
|
+ break;
|
|
+ case 176400:
|
|
+ fmt |= SABRE_ESS_RATE_176400;
|
|
+ break;
|
|
+ case 192000:
|
|
+ fmt |= SABRE_ESS_RATE_192000;
|
|
+ break;
|
|
+ case 352800:
|
|
+ fmt |= SABRE_ESS_RATE_352800;
|
|
+ break;
|
|
+ case 384000:
|
|
+ fmt |= SABRE_ESS_RATE_384000;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(codec->dev, "Bad sample rate: %d\n",
|
|
+ params_rate(params));
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ ret = regmap_write(sabre_ess->regmap, SABRE_ESS_FORMAT, fmt);
|
|
+ if (ret != 0) {
|
|
+ dev_err(codec->dev, "Failed to set format: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int sabre_ess_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|
+{
|
|
+ struct snd_soc_codec *codec = dai->codec;
|
|
+ struct sabre_ess_priv *sabre_ess = snd_soc_codec_get_drvdata(codec);
|
|
+
|
|
+ sabre_ess->fmt = fmt;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct snd_soc_dai_ops sabre_ess_dai_ops = {
|
|
+ .hw_params = sabre_ess_hw_params,
|
|
+ .set_fmt = sabre_ess_set_fmt,
|
|
+};
|
|
+
|
|
+static struct snd_soc_dai_driver sabre_ess_dai = {
|
|
+ .name = "sabre-ess",
|
|
+ .playback = {
|
|
+ .stream_name = "Playback",
|
|
+ .channels_min = 2,
|
|
+ .channels_max = 2,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
+ .rate_min = 44100,
|
|
+ .rate_max = 384000,
|
|
+ .formats = SNDRV_PCM_FMTBIT_S16_LE |
|
|
+ SNDRV_PCM_FMTBIT_S32_LE
|
|
+ },
|
|
+ .ops = &sabre_ess_dai_ops,
|
|
+};
|
|
+
|
|
+static struct snd_soc_codec_driver sabre_ess_codec_driver = {
|
|
+ .idle_bias_off = false,
|
|
+
|
|
+ .component_driver = {
|
|
+ .controls = sabre_ess_controls,
|
|
+ .num_controls = ARRAY_SIZE(sabre_ess_controls),
|
|
+ },
|
|
+};
|
|
+
|
|
+static const struct regmap_range_cfg sabre_ess_range = {
|
|
+ .name = "Pages", .range_min = SABRE_ESS_VIRT_BASE,
|
|
+ .range_max = SABRE_ESS_MAX_REGISTER,
|
|
+ .selector_reg = SABRE_ESS_PAGE,
|
|
+ .selector_mask = 0xff,
|
|
+ .window_start = 0, .window_len = 0x100,
|
|
+};
|
|
+
|
|
+const struct regmap_config sabre_ess_regmap = {
|
|
+ .reg_bits = 8,
|
|
+ .val_bits = 8,
|
|
+
|
|
+ .ranges = &sabre_ess_range,
|
|
+ .num_ranges = 1,
|
|
+
|
|
+ .max_register = SABRE_ESS_MAX_REGISTER,
|
|
+ .readable_reg = sabre_ess_readable_register,
|
|
+ .reg_defaults = sabre_ess_reg_defaults,
|
|
+ .num_reg_defaults = ARRAY_SIZE(sabre_ess_reg_defaults),
|
|
+ .cache_type = REGCACHE_RBTREE,
|
|
+};
|
|
+EXPORT_SYMBOL_GPL(sabre_ess_regmap);
|
|
+
|
|
+int sabre_ess_probe(struct device *dev, struct regmap *regmap)
|
|
+{
|
|
+ struct sabre_ess_priv *sabre_ess;
|
|
+ unsigned int chip_id = 0;
|
|
+ int ret;
|
|
+
|
|
+ sabre_ess = devm_kzalloc(dev, sizeof(struct sabre_ess_priv),
|
|
+ GFP_KERNEL);
|
|
+ if (!sabre_ess)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ dev_set_drvdata(dev, sabre_ess);
|
|
+ sabre_ess->regmap = regmap;
|
|
+
|
|
+ ret = regmap_read(regmap, SABRE_ESS_CHIP_ID_REG, &chip_id);
|
|
+ if ((ret != 0) || (chip_id != SABRE_ESS_CHIP_ID)) {
|
|
+ dev_err(dev, "Failed to read Chip or wrong Chip id: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ regmap_update_bits(regmap, SABRE_ESS_RESET, 0x01, 0x01);
|
|
+ msleep(10);
|
|
+
|
|
+ ret = snd_soc_register_codec(dev, &sabre_ess_codec_driver,
|
|
+ &sabre_ess_dai, 1);
|
|
+ if (ret != 0) {
|
|
+ dev_err(dev, "failed to register codec: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(sabre_ess_probe);
|
|
+
|
|
+void sabre_ess_remove(struct device *dev)
|
|
+{
|
|
+ snd_soc_unregister_codec(dev);
|
|
+ pm_runtime_disable(dev);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(sabre_ess_remove);
|
|
+
|
|
+MODULE_DESCRIPTION("ASoC SABRE ESS codec driver");
|
|
+MODULE_AUTHOR("Jaikumar <jaikumar@cem-solutions.net>");
|
|
+MODULE_LICENSE("GPL v2");
|
|
+
|
|
--- /dev/null
|
|
+++ b/sound/soc/codecs/sabre-ess.h
|
|
@@ -0,0 +1,62 @@
|
|
+/*
|
|
+ * Driver for the SABRE ESS CODEC
|
|
+ *
|
|
+ * Author: Jaikumar <jaikumar@cem-solutions.net>
|
|
+ * Copyright 2018
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU General Public License
|
|
+ * version 2 as published by the Free Software Foundation.
|
|
+ *
|
|
+ * This program is distributed in the hope that it will be useful, but
|
|
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * General Public License for more details.
|
|
+ */
|
|
+
|
|
+#ifndef _SND_SOC_SABRE_ESS_
|
|
+#define _SND_SOC_SABRE_ESS_
|
|
+
|
|
+#include <linux/pm.h>
|
|
+#include <linux/regmap.h>
|
|
+
|
|
+#define SABRE_ESS_CHIP_ID 0x30
|
|
+#define SABRE_ESS_VIRT_BASE 0x100
|
|
+#define SABRE_ESS_PAGE 0
|
|
+
|
|
+#define SABRE_ESS_CHIP_ID_REG (SABRE_ESS_VIRT_BASE + 0)
|
|
+#define SABRE_ESS_RESET (SABRE_ESS_VIRT_BASE + 1)
|
|
+#define SABRE_ESS_VOLUME_1 (SABRE_ESS_VIRT_BASE + 2)
|
|
+#define SABRE_ESS_VOLUME_2 (SABRE_ESS_VIRT_BASE + 3)
|
|
+#define SABRE_ESS_MUTE (SABRE_ESS_VIRT_BASE + 4)
|
|
+#define SABRE_ESS_DSP_PROGRAM (SABRE_ESS_VIRT_BASE + 5)
|
|
+#define SABRE_ESS_DEEMPHASIS (SABRE_ESS_VIRT_BASE + 6)
|
|
+#define SABRE_ESS_DOP (SABRE_ESS_VIRT_BASE + 7)
|
|
+#define SABRE_ESS_FORMAT (SABRE_ESS_VIRT_BASE + 8)
|
|
+#define SABRE_ESS_COMMAND (SABRE_ESS_VIRT_BASE + 9)
|
|
+#define SABRE_ESS_MAX_REGISTER (SABRE_ESS_VIRT_BASE + 9)
|
|
+
|
|
+#define SABRE_ESS_FMT 0xff
|
|
+#define SABRE_ESS_CHAN_MONO 0x00
|
|
+#define SABRE_ESS_CHAN_STEREO 0x80
|
|
+#define SABRE_ESS_ALEN_16 0x10
|
|
+#define SABRE_ESS_ALEN_24 0x20
|
|
+#define SABRE_ESS_ALEN_32 0x30
|
|
+#define SABRE_ESS_RATE_11025 0x01
|
|
+#define SABRE_ESS_RATE_22050 0x02
|
|
+#define SABRE_ESS_RATE_32000 0x03
|
|
+#define SABRE_ESS_RATE_44100 0x04
|
|
+#define SABRE_ESS_RATE_48000 0x05
|
|
+#define SABRE_ESS_RATE_88200 0x06
|
|
+#define SABRE_ESS_RATE_96000 0x07
|
|
+#define SABRE_ESS_RATE_176400 0x08
|
|
+#define SABRE_ESS_RATE_192000 0x09
|
|
+#define SABRE_ESS_RATE_352800 0x0a
|
|
+#define SABRE_ESS_RATE_384000 0x0b
|
|
+
|
|
+extern const struct regmap_config sabre_ess_regmap;
|
|
+
|
|
+int sabre_ess_probe(struct device *dev, struct regmap *regmap);
|
|
+void sabre_ess_remove(struct device *dev);
|
|
+
|
|
+#endif /* _SND_SOC_SABRE_ESS_ */
|