Merge pull request #37 from hogliux/support-for-audioinjector-octo

Add support for Audio Injector Octo multichannel audio HAT

Author: jamess-huang

arch/arm/boot/dts/overlays/Makefile

@@ -24,6 +24,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	mcp2515-can0.dtbo \
 	googlevoicehat-soundcard.dtbo \
 	ads7846-tinker.dtbo \
+	audioinjector-addons.dtbo \
 	camera-ov5647.dtbo
 
 targets += dtbs dtbs_install

arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts

@@ -0,0 +1,72 @@
+// Definitions for audioinjector.net audio add on soundcard
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/pinctrl/rockchip.h>
+
+/ {
+	compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";
+
+	fragment@0 {
+		target = <&i2s>;
+		__overlay__ {
+			status = "okay";
+			rockchip,bcm2835_compatibility_mode = <1>;
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c1>;
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			cs42448: cs42448@48 {
+				#sound-dai-cells = <0>;
+				compatible = "cirrus,cs42448";
+				reg = <0x48>;
+				clocks = <&cs42448_mclk>;
+				clock-names = "mclk";
+				status = "okay";
+			};
+
+			cs42448_mclk: codec-mclk {
+				compatible = "fixed-clock";
+				#clock-cells = <0>;
+				clock-frequency = <49152000>;
+			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/sound-ext-card";
+		snd: __overlay__ {
+			compatible = "ai,audioinjector-octo-soundcard";
+			mult-gpios = <&gpio5 RK_PB6 0>, <&gpio5 RK_PB7 0>, <&gpio5 RK_PB2 0>,
+				     <&gpio5 RK_PB3 0>;
+			reset-gpios = <&gpio5 RK_PB5 0>;
+			i2s-controller = <&i2s>;
+			codec = <&cs42448>;
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target-path = "/sound-simple-card";
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@4 {
+		target = <&hdmi>;
+		__overlay__ {
+			hdmi-i2s-audio-disable;
+		};
+	};
+
+	__overrides__ {
+		non-stop-clocks = <&snd>, "non-stop-clocks?";
+	};
+};

arch/arm/configs/miniarm-rk3288_defconfig

@@ -615,6 +615,8 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
 CONFIG_SND_SOC_ROCKCHIP_RT5645=y
 CONFIG_SND_SOC_CX20810=y
 CONFIG_SND_SOC_RT5616=y
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_RT5640=y
 CONFIG_SND_SOC_SEEEDVOICEHAT_CARD=y
 CONFIG_SND_SOC_SPDIF=y
@@ -895,3 +897,4 @@ CONFIG_CAN_DEV=y
 CONFIG_CAN_MCP251X=y
 CONFIG_SND_SOC_GOOGLEVOICEHAT_CARD=y
 CONFIG_OVERLAY_FS=y
+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m

sound/soc/bcm/Makefile

@@ -2,4 +2,3 @@
 snd-soc-bcm2835-i2s-objs := bcm2835-i2s.o
 
 obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o
-

sound/soc/rockchip/Kconfig

@@ -201,3 +201,10 @@ config SND_SOC_SEEEDVOICEHAT_CARD
         tristate "Support for Seeed voice HAT sound card"
         help
            Say Y or M if you want to add support for Seeed voice sound card.
+
+config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
+       tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
+       depends on SND_SOC_ROCKCHIP
+       select SND_SOC_CS42XX8_I2C
+       help
+           Say Y or M if you want to add support for audioinjector.net octo sound card.

sound/soc/rockchip/Makefile

@@ -41,6 +41,7 @@ snd-soc-justboom-dac-objs := justboom-dac.o
 snd-soc-justboom-digi-objs := justboom-digi.o
 snd-soc-googlevoicehat-soundcard-objs := googlevoicehat-soundcard.o
 snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
+snd-soc-audioinjector-octo-soundcard-objs := audioinjector-octo-soundcard.o
 
 obj-$(CONFIG_SND_SOC_ROCKCHIP_DA7219) += snd-soc-rockchip-da7219.o
 obj-$(CONFIG_SND_SOC_ROCKCHIP_HDMI_ANALOG) += snd-soc-rockchip-hdmi-analog.o
@@ -63,3 +64,4 @@ obj-$(CONFIG_SND_SOC_JUSTBOOM_DIGI) += snd-soc-justboom-digi.o
 obj-$(CONFIG_SND_SOC_GOOGLEVOICEHAT_CARD) += snd-soc-googlevoicehat-soundcard.o
 obj-$(CONFIG_SND_SOC_GOOGLEVOICEHAT_CARD) += snd-soc-googlevoicehat-codec.o
 obj-$(CONFIG_SND_SOC_SEEEDVOICEHAT_CARD) += seeedvoicehat/
+obj-$(CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD) += snd-soc-audioinjector-octo-soundcard.o