ソースを参照

更新7210驱动

luyuan_t440 3 年 前
コミット
f3df661d2e

+ 1 - 1
linux/arch/arm/boot/dts/ark1668e.dtsi

@@ -531,7 +531,7 @@
 		i2s_dac: i2s-dac@e4200000 {
 			compatible = "arkmicro,ark1668e-i2s";
 			reg = <0xe4200000 0x1000>;
-			//full-duplex-mode;
+			full-duplex-mode;
 			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 			nco-reg = <0xe490019c>;
 			dmas = <&dmac 25 1 0>, <&dmac 26 0 1>;

+ 6 - 7
linux/arch/arm/boot/dts/ark1668e_devb_emmc.dts

@@ -4,7 +4,6 @@
 #include "ark1668e-pinctrl.dtsi"
 
 //#define I2S_FULL_DUPLEX_CODEC_SUPPORT
-
 / {
 	i2c-gpio-0 {
 		#address-cells = <1>;
@@ -133,20 +132,20 @@
 		simple-audio-card,aux-devs = <&amp>;
 		simple-audio-card,dai-link@0 {		/* I2S - adc */
 			format = "i2s";
-			bitclock-master = <&capture_codec>;
-			frame-master = <&capture_codec>;
+			bitclock-master = <&capture_cpu>;
+			frame-master = <&capture_cpu>;
 			capture_cpu: cpu {
-				sound-dai = <&i2s_adc>;
+				sound-dai = <&i2s_dac>;//i2s_adc
 			};
 			capture_codec: codec {
-				sound-dai = <&cs5343_codec>;//External(ADC):es8316_codec , cs5343_codec  ; Internal:ark_codec
+				sound-dai = <&es7210_codec>;//External(ADC):escodec(es8316) , cs5343_codec  ; Internal(ADC):sdadc
 			};
 		};
 
 		simple-audio-card,dai-link@1 {		/* I2S - dac */
 			format = "i2s";
-			bitclock-master = <&playback_codec>;
-			frame-master = <&playback_codec>;
+			bitclock-master = <&playback_cpu>;
+			frame-master = <&playback_cpu>;
 			playback_cpu: cpu {
 				sound-dai = <&i2s_dac>;
 			};

+ 3 - 8
linux/arch/arm/configs/ark1668e_devb_emmc_defconfig

@@ -168,11 +168,6 @@ CONFIG_RTL8821CS=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GOODIX=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICETREE_SUPPORT=y
 # CONFIG_SERIO is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
@@ -181,6 +176,7 @@ CONFIG_SERIAL_ARKMICRO=y
 CONFIG_HS_SERIAL_ARKMICRO=y
 CONFIG_SERIAL_ARKMICRO_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -220,8 +216,8 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_ARK=y
 CONFIG_SND_SOC_ARK1668E_I2S=y
-CONFIG_SND_SOC_ARK1668E_INTERNAL_DAC=y
-CONFIG_SND_SOC_ARK1668E_INTERNAL_ADC=y
+CONFIG_SND_SOC_ARK1668E_INTERNAL_ADAC=y
+CONFIG_SND_SOC_ES7210=y
 CONFIG_SND_SIMPLE_CARD=y
 # CONFIG_HID_GENERIC is not set
 CONFIG_USB=y
@@ -246,7 +242,6 @@ CONFIG_ARK_AXI_DMA=y
 CONFIG_STAGING=y
 CONFIG_ANDROID_LOGGER=y
 # CONFIG_IOMMU_SUPPORT is not set
-CONFIG_DISABLE_GET_MCU_DATA=y
 CONFIG_REVERSING_TRACK=y
 CONFIG_ARK_HX170DEC=y
 CONFIG_ARK_SCALE=y