|
|
@@ -0,0 +1,287 @@
|
|
|
+From 7174c08bd5f4e4976259c7a0894d302acc67321e Mon Sep 17 00:00:00 2001
|
|
|
+From: Waldemar Brodkorb <wbrodkorb@conet.de>
|
|
|
+Date: Mon, 2 Feb 2015 11:08:33 +0100
|
|
|
+Subject: [PATCH] add support for rpi-proto hardware
|
|
|
+
|
|
|
+Forward port of 3.10.x driver from https://github.com/koalo
|
|
|
+We are using a custom board and would like to use rpi 3.18.x
|
|
|
+kernel. Patch works fine for our embedded system.
|
|
|
+
|
|
|
+Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de>
|
|
|
+---
|
|
|
+ arch/arm/boot/dts/Makefile | 1 +
|
|
|
+ arch/arm/boot/dts/rpi-proto-overlay.dts | 34 +++++++++
|
|
|
+ arch/arm/mach-bcm2708/bcm2708.c | 20 +++++
|
|
|
+ sound/soc/bcm/Kconfig | 8 ++
|
|
|
+ sound/soc/bcm/Makefile | 2 +
|
|
|
+ sound/soc/bcm/rpi-proto.c | 130 ++++++++++++++++++++++++++++++++
|
|
|
+ 6 files changed, 195 insertions(+)
|
|
|
+ create mode 100644 arch/arm/boot/dts/rpi-proto-overlay.dts
|
|
|
+ create mode 100644 sound/soc/bcm/rpi-proto.c
|
|
|
+
|
|
|
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
|
+index 1b66478..7171eb6 100644
|
|
|
+--- a/arch/arm/boot/dts/Makefile
|
|
|
++++ b/arch/arm/boot/dts/Makefile
|
|
|
+@@ -61,6 +61,7 @@ dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb
|
|
|
++dtb-$(CONFIG_BCM2708_DT) += rpi-proto-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb
|
|
|
+ dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb
|
|
|
+diff --git a/arch/arm/boot/dts/rpi-proto-overlay.dts b/arch/arm/boot/dts/rpi-proto-overlay.dts
|
|
|
+new file mode 100644
|
|
|
+index 0000000..984545b
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/arm/boot/dts/rpi-proto-overlay.dts
|
|
|
+@@ -0,0 +1,34 @@
|
|
|
++// Definitions for Rpi-Proto
|
|
|
++/dts-v1/;
|
|
|
++/plugin/;
|
|
|
++
|
|
|
++/ {
|
|
|
++ compatible = "brcm,bcm2708";
|
|
|
++
|
|
|
++ fragment@0 {
|
|
|
++ target = <&sound>;
|
|
|
++ __overlay__ {
|
|
|
++ compatible = "rpi-proto";
|
|
|
++ i2s-controller = <&i2s>;
|
|
|
++ status = "okay";
|
|
|
++ };
|
|
|
++ };
|
|
|
++
|
|
|
++ fragment@1 {
|
|
|
++ target = <&i2s>;
|
|
|
++ __overlay__ {
|
|
|
++ status = "okay";
|
|
|
++ };
|
|
|
++ };
|
|
|
++
|
|
|
++ fragment@2 {
|
|
|
++ target-path = "/";
|
|
|
++ __overlay__ {
|
|
|
++ wm8731-codec {
|
|
|
++ #sound-dai-cells = <0>;
|
|
|
++ compatible = "wlf,wm8731";
|
|
|
++ status = "okay";
|
|
|
++ };
|
|
|
++ };
|
|
|
++ };
|
|
|
++};
|
|
|
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
|
|
|
+index 762e17c..9ce0f78 100644
|
|
|
+--- a/arch/arm/mach-bcm2708/bcm2708.c
|
|
|
++++ b/arch/arm/mach-bcm2708/bcm2708.c
|
|
|
+@@ -703,6 +703,21 @@ static struct i2c_board_info __initdata snd_tas5713_i2c_devices[] = {
|
|
|
+ };
|
|
|
+ #endif
|
|
|
+
|
|
|
++#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE)
|
|
|
++static struct platform_device snd_rpi_proto_device = {
|
|
|
++ .name = "snd-rpi-proto",
|
|
|
++ .id = 0,
|
|
|
++ .num_resources = 0,
|
|
|
++};
|
|
|
++
|
|
|
++static struct i2c_board_info __initdata snd_wm8731_i2c_devices[] = {
|
|
|
++ {
|
|
|
++ I2C_BOARD_INFO("wm8731", 0x1a)
|
|
|
++ },
|
|
|
++};
|
|
|
++
|
|
|
++#endif
|
|
|
++
|
|
|
+ #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
|
|
|
+ static struct platform_device snd_rpi_dac_device = {
|
|
|
+ .name = "snd-rpi-dac",
|
|
|
+@@ -922,6 +937,11 @@ void __init bcm2708_init(void)
|
|
|
+ i2c_register_board_info_dt(1, snd_tas5713_i2c_devices, ARRAY_SIZE(snd_tas5713_i2c_devices));
|
|
|
+ #endif
|
|
|
+
|
|
|
++#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE)
|
|
|
++ bcm_register_device_dt(&snd_rpi_proto_device);
|
|
|
++ i2c_register_board_info_dt(1, snd_wm8731_i2c_devices, ARRAY_SIZE(snd_wm8731_i2c_devices));
|
|
|
++#endif
|
|
|
++
|
|
|
+ #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
|
|
|
+ bcm_register_device_dt(&snd_rpi_dac_device);
|
|
|
+ bcm_register_device_dt(&snd_pcm1794a_codec_device);
|
|
|
+diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
|
|
|
+index a562ddf..1ea891d 100644
|
|
|
+--- a/sound/soc/bcm/Kconfig
|
|
|
++++ b/sound/soc/bcm/Kconfig
|
|
|
+@@ -54,6 +54,14 @@ config SND_BCM2708_SOC_RPI_DAC
|
|
|
+ help
|
|
|
+ Say Y or M if you want to add support for RPi-DAC.
|
|
|
+
|
|
|
++config SND_BCM2708_SOC_RPI_PROTO
|
|
|
++ tristate "Support for Rpi-PROTO"
|
|
|
++ depends on SND_BCM2708_SOC_I2S
|
|
|
++ select SND_SOC_WM8731
|
|
|
++ help
|
|
|
++ Say Y if you want to add support for Audio Codec Board -
|
|
|
++ PROTO (WM8731)
|
|
|
++
|
|
|
+ config SND_BCM2708_SOC_IQAUDIO_DAC
|
|
|
+ tristate "Support for IQaudIO-DAC"
|
|
|
+ depends on SND_BCM2708_SOC_I2S
|
|
|
+diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
|
|
|
+index 17ea2b0..883241b 100644
|
|
|
+--- a/sound/soc/bcm/Makefile
|
|
|
++++ b/sound/soc/bcm/Makefile
|
|
|
+@@ -14,6 +14,7 @@ snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
|
|
|
+ snd-soc-hifiberry-digi-objs := hifiberry_digi.o
|
|
|
+ snd-soc-hifiberry-amp-objs := hifiberry_amp.o
|
|
|
+ snd-soc-rpi-dac-objs := rpi-dac.o
|
|
|
++snd-soc-rpi-proto-objs := rpi-proto.o
|
|
|
+ snd-soc-iqaudio-dac-objs := iqaudio-dac.o
|
|
|
+
|
|
|
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
|
|
|
+@@ -21,4 +22,5 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
|
|
|
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
|
|
|
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
|
|
|
+ obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
|
|
|
++obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
|
|
|
+ obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
|
|
|
+diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c
|
|
|
+new file mode 100644
|
|
|
+index 0000000..70b0166
|
|
|
+--- /dev/null
|
|
|
++++ b/sound/soc/bcm/rpi-proto.c
|
|
|
+@@ -0,0 +1,130 @@
|
|
|
++/*
|
|
|
++ * ASoC driver for PROTO AudioCODEC (with a WM8731)
|
|
|
++ * connected to a Raspberry Pi
|
|
|
++ *
|
|
|
++ * Author: Florian Meier, <koalo@koalo.de>
|
|
|
++ * Copyright 2013
|
|
|
++ *
|
|
|
++ * 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.
|
|
|
++ */
|
|
|
++
|
|
|
++#include <linux/module.h>
|
|
|
++#include <linux/platform_device.h>
|
|
|
++
|
|
|
++#include <sound/core.h>
|
|
|
++#include <sound/pcm.h>
|
|
|
++#include <sound/soc.h>
|
|
|
++#include <sound/jack.h>
|
|
|
++
|
|
|
++#include "../codecs/wm8731.h"
|
|
|
++
|
|
|
++static const unsigned int wm8731_rates_12288000[] = {
|
|
|
++ 8000, 32000, 48000, 96000,
|
|
|
++};
|
|
|
++
|
|
|
++static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = {
|
|
|
++ .list = wm8731_rates_12288000,
|
|
|
++ .count = ARRAY_SIZE(wm8731_rates_12288000),
|
|
|
++};
|
|
|
++
|
|
|
++static int snd_rpi_proto_startup(struct snd_pcm_substream *substream)
|
|
|
++{
|
|
|
++ /* Setup constraints, because there is a 12.288 MHz XTAL on the board */
|
|
|
++ snd_pcm_hw_constraint_list(substream->runtime, 0,
|
|
|
++ SNDRV_PCM_HW_PARAM_RATE,
|
|
|
++ &wm8731_constraints_12288000);
|
|
|
++ return 0;
|
|
|
++}
|
|
|
++
|
|
|
++static int snd_rpi_proto_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;
|
|
|
++ int sysclk = 12288000; /* This is fixed on this board */
|
|
|
++
|
|
|
++ /* Set proto bclk */
|
|
|
++ int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2);
|
|
|
++ if (ret < 0){
|
|
|
++ dev_err(substream->pcm->dev,
|
|
|
++ "Failed to set BCLK ratio %d\n", ret);
|
|
|
++ return ret;
|
|
|
++ }
|
|
|
++
|
|
|
++ /* Set proto sysclk */
|
|
|
++ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
|
|
|
++ sysclk, SND_SOC_CLOCK_IN);
|
|
|
++ if (ret < 0) {
|
|
|
++ dev_err(substream->pcm->dev,
|
|
|
++ "Failed to set WM8731 SYSCLK: %d\n", ret);
|
|
|
++ return ret;
|
|
|
++ }
|
|
|
++
|
|
|
++ return 0;
|
|
|
++}
|
|
|
++
|
|
|
++/* machine stream operations */
|
|
|
++static struct snd_soc_ops snd_rpi_proto_ops = {
|
|
|
++ .startup = snd_rpi_proto_startup,
|
|
|
++ .hw_params = snd_rpi_proto_hw_params,
|
|
|
++};
|
|
|
++
|
|
|
++static struct snd_soc_dai_link snd_rpi_proto_dai[] = {
|
|
|
++{
|
|
|
++ .name = "WM8731",
|
|
|
++ .stream_name = "WM8731 HiFi",
|
|
|
++ .cpu_dai_name = "bcm2708-i2s.0",
|
|
|
++ .codec_dai_name = "wm8731-hifi",
|
|
|
++ .platform_name = "bcm2708-i2s.0",
|
|
|
++ .codec_name = "wm8731.1-001a",
|
|
|
++ .dai_fmt = SND_SOC_DAIFMT_I2S
|
|
|
++ | SND_SOC_DAIFMT_NB_NF
|
|
|
++ | SND_SOC_DAIFMT_CBM_CFM,
|
|
|
++ .ops = &snd_rpi_proto_ops,
|
|
|
++},
|
|
|
++};
|
|
|
++
|
|
|
++/* audio machine driver */
|
|
|
++static struct snd_soc_card snd_rpi_proto = {
|
|
|
++ .name = "snd_rpi_proto",
|
|
|
++ .dai_link = snd_rpi_proto_dai,
|
|
|
++ .num_links = ARRAY_SIZE(snd_rpi_proto_dai),
|
|
|
++};
|
|
|
++
|
|
|
++static int snd_rpi_proto_probe(struct platform_device *pdev)
|
|
|
++{
|
|
|
++ int ret = 0;
|
|
|
++
|
|
|
++ snd_rpi_proto.dev = &pdev->dev;
|
|
|
++ ret = snd_soc_register_card(&snd_rpi_proto);
|
|
|
++ if (ret) {
|
|
|
++ dev_err(&pdev->dev,
|
|
|
++ "snd_soc_register_card() failed: %d\n", ret);
|
|
|
++ }
|
|
|
++
|
|
|
++ return ret;
|
|
|
++}
|
|
|
++
|
|
|
++
|
|
|
++static int snd_rpi_proto_remove(struct platform_device *pdev)
|
|
|
++{
|
|
|
++ return snd_soc_unregister_card(&snd_rpi_proto);
|
|
|
++}
|
|
|
++
|
|
|
++static struct platform_driver snd_rpi_proto_driver = {
|
|
|
++ .driver = {
|
|
|
++ .name = "snd-rpi-proto",
|
|
|
++ .owner = THIS_MODULE,
|
|
|
++ },
|
|
|
++ .probe = snd_rpi_proto_probe,
|
|
|
++ .remove = snd_rpi_proto_remove,
|
|
|
++};
|
|
|
++
|
|
|
++module_platform_driver(snd_rpi_proto_driver);
|
|
|
++
|
|
|
++MODULE_AUTHOR("Florian Meier");
|
|
|
++MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)");
|
|
|
++MODULE_LICENSE("GPL");
|
|
|
+--
|
|
|
+1.9.1
|
|
|
+
|
Waldemar Brodkorb