Porting HiFiBerry/IQAudIO digi HATs and correct some settings.

Angus_Wang · jamess-huang · commit 210f735a54f3 · 2017-12-13T17:48:14.000+08:00
Change-Id: I77f9342ae086c7c2c48d9521c60da639711996cf
Reviewed-on: https://tp-biosrd-v02/gerrit/81611
Reviewed-by: Jamess Huang(黃以民) &lt;Jamess_Huang@asus.com&gt;
Tested-by: Jamess Huang(黃以民) &lt;Jamess_Huang@asus.com&gt;
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
@@ -4,7 +4,9 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	hifiberry-amp.dtbo \
 	hifiberry-dac.dtbo \
 	hifiberry-dacplus.dtbo \
+	hifiberry-digi.dtbo \
 	iqaudio-dacplus.dtbo \
+	iqaudio-digi-wm8804-audio.dtbo \
 	waveshare35a-tinker.dtbo \
 	waveshare32b-tinker.dtbo \
 	pps-gpio.dtbo \
diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
@@ -12,15 +12,12 @@
 	};
 
 	fragment@1 {
-		target = <&i2s>;
-		__overlay__ {
-			rockchip,xfer-mode = <1>;
-		};
-	};
-
-	fragment@2 {
 		target = <&i2c1>;
 		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
 			tas5713@1b {
 				#sound-dai-cells = <0>;
 				compatible = "ti,tas5713";
@@ -30,7 +27,7 @@
 		};
 	};
 
-	fragment@3 {
+	fragment@2 {
 		target-path = "/sound-ext-card";
 		__overlay__ {
 			compatible = "hifiberry,hifiberry-amp";
diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-amp-overlay.dts
diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
@@ -12,13 +12,6 @@
 	};
 
 	fragment@1 {
-		target = <&i2s>;
-		__overlay__ {
-			rockchip,xfer-mode = <1>;
-		};
-	};
-
-	fragment@2 {
 		target-path = "/";
 		__overlay__ {
 			pcm5102a-codec {
@@ -29,7 +22,7 @@
 		};
 	};
 
-	fragment@3 {
+	fragment@2 {
 		target-path = "/sound-ext-card";
 		__overlay__ {
 			compatible = "hifiberry,hifiberry-dac";
diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
@@ -12,25 +12,25 @@
 	};
 
 	fragment@1 {
-		target = <&i2s>;
-		__overlay__ {
-			rockchip,xfer-mode = <1>;
-		};
-	};
-
-	fragment@2 {
 		target = <&i2c1>;
 		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
 			pcm5122@4d {
 				#sound-dai-cells = <0>;
 				compatible = "ti,pcm5122";
 				reg = <0x4d>;
+				AVDD-supply = <&vdd_3v3_reg>;
+				DVDD-supply = <&vdd_3v3_reg>;
+				CPVDD-supply = <&vdd_3v3_reg>;
 				status = "okay";
 			};
 		};
 	};
 
-	fragment@3 {
+	fragment@2 {
 		target-path = "/sound-ext-card";
 		hifiberry_dacplus: __overlay__ {
 			compatible = "hifiberry,hifiberry-dacplus";
diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
@@ -0,0 +1,40 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "rockchip,rk3288";
+
+	fragment@0 {
+		target-path ="/sound-simple-card";
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c1>;
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			wm8804@3b {
+				#sound-dai-cells = <0>;
+				compatible = "wlf,wm8804";
+				reg = <0x3b>;
+				PVDD-supply = <&vdd_3v3_reg>;
+				DVDD-supply = <&vdd_3v3_reg>;
+				status = "okay";
+			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/sound-ext-card";
+		__overlay__ {
+			compatible = "hifiberry,hifiberry-digi";
+			i2s-controller = <&i2s>;
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
@@ -12,25 +12,25 @@
 	};
 
 	fragment@1 {
-		target = <&i2s>;
-		__overlay__ {
-			rockchip,xfer-mode = <1>;
-		};
-	};
-
-	fragment@2 {
 		target = <&i2c1>;
 		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
 			pcm5122@4c {
 				#sound-dai-cells = <0>;
 				compatible = "ti,pcm5122";
 				reg = <0x4c>;
+				AVDD-supply = <&vdd_3v3_reg>;
+				DVDD-supply = <&vdd_3v3_reg>;
+				CPVDD-supply = <&vdd_3v3_reg>;
 				status = "okay";
 			};
 		};
 	};
 
-	fragment@3 {
+	fragment@2 {
 		target-path = "/sound-ext-card";
 		iqaudio_dac: __overlay__ {
 			compatible = "iqaudio,iqaudio-dac";
diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
@@ -0,0 +1,46 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "rockchip,rk3288";
+
+	fragment@0 {
+		target-path ="/sound-simple-card";
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c1>;
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			wm8804@3b {
+				#sound-dai-cells = <0>;
+				compatible = "wlf,wm8804";
+				reg = <0x3b>;
+				status = "okay";
+				DVDD-supply = <&vdd_3v3_reg>;
+				PVDD-supply = <&vdd_3v3_reg>;
+			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/sound-ext-card";
+		wm8804_digi: __overlay__ {
+			compatible = "iqaudio,wm8804-digi";
+			i2s-controller = <&i2s>;
+			status = "okay";
+		};
+	};
+
+	__overrides__ {
+		card_name = <&wm8804_digi>,"wm8804-digi,card-name";
+		dai_name = <&wm8804_digi>,"wm8804-digi,dai-name";
+		dai_stream_name = <&wm8804_digi>,"wm8804-digi,dai-stream-name";
+	};
+};
diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
@@ -196,6 +196,14 @@
 		status = "disabled";
 	};
 
+	vdd_3v3_reg: fixedregulator_3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
 	vcc_sys: vsys-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_sys";
diff --git a/arch/arm/configs/miniarm-rk3288_defconfig b/arch/arm/configs/miniarm-rk3288_defconfig
@@ -554,7 +554,9 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_HIFIBERRY_AMP=y
 CONFIG_SND_SOC_HIFIBERRY_DAC=y
 CONFIG_SND_SOC_HIFIBERRY_DACPLUS=y
+CONFIG_SND_SOC_HIFIBERRY_DIGI=y
 CONFIG_SND_SOC_IQAUDIO_DAC=y
+CONFIG_SND_SOC_IQAUDIO_DIGI=y
 CONFIG_SND_SOC_ROCKCHIP=y
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
@@ -304,6 +304,7 @@ static int wm8804_hw_params(struct snd_pcm_substream *substream,
 		blen = 0x1;
 		break;
 	case 24:
+	case 32:
 		blen = 0x2;
 		break;
 	default:
@@ -515,7 +516,7 @@ static const struct snd_soc_dai_ops wm8804_dai_ops = {
 };
 
 #define WM8804_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
-			SNDRV_PCM_FMTBIT_S24_LE)
+			SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 #define WM8804_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
 		      SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \
@@ -543,12 +544,14 @@ static struct snd_soc_dai_driver wm8804_dai = {
 };
 
 static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
-	.idle_bias_off = true,
+	.idle_bias_off = false,
 
-	.dapm_widgets = wm8804_dapm_widgets,
-	.num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets),
-	.dapm_routes = wm8804_dapm_routes,
-	.num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes),
+	.component_driver = {
+		.dapm_widgets		= wm8804_dapm_widgets,
+		.num_dapm_widgets	= ARRAY_SIZE(wm8804_dapm_widgets),
+		.dapm_routes		= wm8804_dapm_routes,
+		.num_dapm_routes	= ARRAY_SIZE(wm8804_dapm_routes),
+	},
 };
 
 const struct regmap_config wm8804_regmap_config = {
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
@@ -114,8 +114,20 @@ config SND_SOC_HIFIBERRY_DACPLUS
 	help
 	  Say Y or M if you want to add support for HifiBerry DAC+.
 
+config SND_SOC_HIFIBERRY_DIGI
+	tristate "Support for HifiBerry Digi"
+	select SND_SOC_WM8804_I2C
+	help
+	  Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
+
 config SND_SOC_IQAUDIO_DAC
 	tristate "Support for IQaudIO-DAC"
 	select SND_SOC_PCM512x_I2C
 	help
 	  Say Y or M if you want to add support for IQaudIO-DAC.
+
+config SND_SOC_IQAUDIO_DIGI
+	tristate "Support for IQaudIO Digi"
+	select SND_SOC_WM8804_I2C
+	help
+	  Say Y or M if you want to add support for IQAudIO Digital IO board.
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
@@ -19,7 +19,9 @@ snd-soc-rockchip-cdndp-objs := rockchip_cdndp.o
 snd-soc-hifiberry-amp-objs := hifiberry_amp.o
 snd-soc-hifiberry-dac-objs := hifiberry_dac.o
 snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
+snd-soc-hifiberry-digi-objs := hifiberry_digi.o
 snd-soc-iqaudio-dac-objs := iqaudio-dac.o
+snd-soc-iqaudio-digi-objs := iqaudio-digi.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
@@ -31,4 +33,6 @@ obj-$(CONFIG_SND_SOC_ROCKCHIP_CDNDP) += snd-soc-rockchip-cdndp.o
 obj-$(CONFIG_SND_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
 obj-$(CONFIG_SND_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
 obj-$(CONFIG_SND_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
+obj-$(CONFIG_SND_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
 obj-$(CONFIG_SND_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
+obj-$(CONFIG_SND_SOC_IQAUDIO_DIGI) += snd-soc-iqaudio-digi.o
diff --git a/sound/soc/rockchip/hifiberry_digi.c b/sound/soc/rockchip/hifiberry_digi.c
diff --git a/sound/soc/rockchip/iqaudio-digi.c b/sound/soc/rockchip/iqaudio-digi.c
