Add support for Audio Injector Octo audio HAT

Author: hogliux

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

@@ -2,13 +2,16 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/pinctrl/rockchip.h>
+
 / {
-	compatible = "brcm,bcm2708";
+	compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";
 
 	fragment@0 {
 		target = <&i2s>;
 		__overlay__ {
 			status = "okay";
+			rockchip,bcm2835_compatibility_mode = <1>;
 		};
 	};
 
@@ -37,18 +40,32 @@
 	};
 
 	fragment@2 {
-		target = <&sound>;
+		target-path = "/sound-ext-card";
 		snd: __overlay__ {
 			compatible = "ai,audioinjector-octo-soundcard";
-			mult-gpios = <&gpio 27 0>, <&gpio 22 0>, <&gpio 23 0>,
-				     <&gpio 24 0>;
-			reset-gpios = <&gpio 5 0>;
+			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/Kconfig

@@ -7,10 +7,3 @@ config SND_BCM2835_SOC_I2S
 	  Say Y or M if you want to add support for codecs attached to
 	  the BCM2835 I2S interface. You will also need
 	  to select the audio interfaces to support below.
-
-config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
-	tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
-	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-	select SND_SOC_CS42XX8_I2C
-	help
-	  Say Y or M if you want to add support for audioinjector.net octo add on

sound/soc/bcm/Makefile

@@ -2,7 +2,3 @@
 snd-soc-bcm2835-i2s-objs := bcm2835-i2s.o
 
 obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o
-
-snd-soc-audioinjector-octo-soundcard-objs := audioinjector-octo-soundcard.o
-
-obj-$(CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD) += snd-soc-audioinjector-octo-soundcard.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

…d/soc/bcm/audioinjector-octo-soundcard.c …/rockchip/audioinjector-octo-soundcard.csound/soc/bcm/audioinjector-octo-soundcard.c renamed to sound/soc/rockchip/audioinjector-octo-soundcard.c sound/soc/bcm/audioinjector-octo-soundcard.c renamed to sound/soc/rockchip/audioinjector-octo-soundcard.c

@@ -17,6 +17,7 @@
  * General Public License for more details.
  */
 
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/gpio/consumer.h>
@@ -42,7 +43,11 @@ static struct snd_pcm_hw_constraint_list audioinjector_octo_constraints = {
 
 static int audioinjector_octo_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
+#ifdef ROCKCHIP_AUDIO
+    return 0;
+#else
 	return snd_soc_dai_set_bclk_ratio(rtd->cpu_dai, 64);
+#endif
 }
 
 static int audioinjector_octo_startup(struct snd_pcm_substream *substream)

sound/soc/rockchip/rockchip_i2s.c

@@ -57,6 +57,7 @@ struct rk_i2s_dev {
 	int xfer_mode; /* 0: i2s, 1: pcm */
 	const struct rk_i2s_pins *pins;
 	unsigned int bclk_fs;
+	bool bcm2835_compat_mode;
 };
 
 /* txctrl/rxctrl lock */
@@ -339,23 +340,27 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
-	switch (params_channels(params)) {
-	case 8:
-		val |= I2S_CHN_8;
-		break;
-	case 6:
-		val |= I2S_CHN_6;
-		break;
-	case 4:
-		val |= I2S_CHN_4;
-		break;
-	case 2:
+	if (i2s->bcm2835_compat_mode) {
 		val |= I2S_CHN_2;
-		break;
-	default:
-		dev_err(i2s->dev, "invalid channel: %d\n",
-			params_channels(params));
-		return -EINVAL;
+	} else {
+		switch (params_channels(params)) {
+		case 8:
+			val |= I2S_CHN_8;
+			break;
+		case 6:
+			val |= I2S_CHN_6;
+			break;
+		case 4:
+			val |= I2S_CHN_4;
+			break;
+		case 2:
+			val |= I2S_CHN_2;
+			break;
+		default:
+			dev_err(i2s->dev, "invalid channel: %d\n",
+				params_channels(params));
+			return -EINVAL;
+		}
 	}
 
 	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
@@ -692,6 +697,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 			i2s->bclk_fs = val;
 	}
 
+	// If enabled, the behaviour of the rockchip I2S will more closely
+	// resemble that of the BCM 2835 I2S controlller (as used in the
+	// raspberry pi). This can be usuful to achieve compatibility with
+	// Raspberry Pi Audio HATs.
+	i2s->bcm2835_compat_mode =
+		of_property_read_bool(node,
+				      "rockchip,bcm2835_compatibility_mode");
+
 	ret = devm_snd_soc_register_component(&pdev->dev,
 					      &rockchip_i2s_component,
 					      soc_dai, 1);