diff --git a/lichee/linux-4.9/arch/arm/boot/dts/Makefile b/lichee/linux-4.9/arch/arm/boot/dts/Makefile index 3b3063a91..bc2eb4155 100755 --- a/lichee/linux-4.9/arch/arm/boot/dts/Makefile +++ b/lichee/linux-4.9/arch/arm/boot/dts/Makefile @@ -849,7 +849,8 @@ dtb-$(CONFIG_ARCH_SUN8IW11P1) += \ dtb-$(CONFIG_ARCH_SUN8IW15P1) += \ sun8iw15p1-soc.dtb \ sun8iw15p1-mandolin-perf1.dtb \ - sun8iw15p1-a3.dtb + sun8iw15p1-a3.dtb \ + sun8iw15p1-mandolin-pv1c.dtb dtb-$(CONFIG_ARCH_SUN8IW17P1) += \ sun8iw17p1-soc.dtb \ sun8iw17p1-piano-chimera.dtb diff --git a/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-perf1.dts b/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-perf1.dts index 64d34233b..dc8e2af3e 100755 --- a/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-perf1.dts +++ b/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-perf1.dts @@ -85,20 +85,9 @@ }; soc@03000000 { - twi0: twi@0x05002000{ - status = "disabled"; - - ad82584f@31 { - compatible = "ESMT, ad82584f"; - reg = <0x31>; - reset_pin = <&r_pio PL 11 1 1 1 1>; - amp_en = <&r_pio PL 3 1 1 1 1>; - }; - }; - snddaudio0:sound@1{ - sunxi,snddaudio-codec = "ad82584f.0-0031"; - sunxi,snddaudio-codec-dai = "ad82584f"; + sunxi,snddaudio-codec = "netease1.mic.codec"; + sunxi,snddaudio-codec-dai = "netease1.mic.codecdai"; }; wlan:wlan { diff --git a/lichee/linux-4.9/arch/arm/kernel/setup.c b/lichee/linux-4.9/arch/arm/kernel/setup.c index f4e54503a..f7c45c3ca 100755 --- a/lichee/linux-4.9/arch/arm/kernel/setup.c +++ b/lichee/linux-4.9/arch/arm/kernel/setup.c @@ -84,6 +84,8 @@ extern void early_paging_init(const struct machine_desc *); extern void adjust_lowmem_bounds(void); extern enum reboot_mode reboot_mode; extern void setup_dma_zone(const struct machine_desc *desc); +extern int sunxi_get_serial(u8 *serial); +extern int sunxi_get_soc_chipid(u8 *chipid); unsigned int processor_id; EXPORT_SYMBOL(processor_id); @@ -1216,6 +1218,14 @@ static int c_show(struct seq_file *m, void *v) int i, j; u32 cpuid; +#if defined(CONFIG_ARCH_SUNXI) + u32 serial[4]; + u32 chip_id[4] = {0}; + int ret; + memset(serial, 0, sizeof(serial)); + ret = sunxi_get_serial((u8 *)serial); + ret = sunxi_get_soc_chipid((u8 *)chip_id); +#endif for_each_online_cpu(i) { /* * glibc reads /proc/cpuinfo to determine the number of @@ -1272,8 +1282,14 @@ static int c_show(struct seq_file *m, void *v) seq_printf(m, "Hardware\t: %s\n", machine_name); seq_printf(m, "Revision\t: %04x\n", system_rev); +#if defined(CONFIG_ARCH_SUNXI) + seq_printf(m, "Serial\t\t: %04x%08x%08x\n", + serial[2], serial[1], serial[0]); + seq_printf(m, "Chipid\t\t: %08x%08x%08x%08x\n", + chip_id[3],chip_id[2], chip_id[1], chip_id[0]); +#else seq_printf(m, "Serial\t\t: %s\n", system_serial); - +#endif return 0; } diff --git a/lichee/linux-4.9/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c b/lichee/linux-4.9/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c index 0f8de6abc..6cc0ce1f3 100755 --- a/lichee/linux-4.9/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c +++ b/lichee/linux-4.9/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c @@ -95,6 +95,7 @@ static ssize_t sys_info_show(struct class *class, { int i; int databuf[4] = {0}; + int serial[4]; char tmpbuf[129] = {0}; size_t size = 0; @@ -110,12 +111,18 @@ static ssize_t sys_info_show(struct class *class, size += sprintf(buf + size, "%s\n", "normal"); /* chipid */ - sunxi_get_serial((u8 *)databuf); + sunxi_get_soc_chipid((u8 *)databuf); for (i = 0; i < 4; i++) sprintf(tmpbuf + i*8, "%08x", databuf[i]); tmpbuf[128] = 0; size += sprintf(buf + size, "sunxi_chipid : %s\n", tmpbuf); + /* serial */ + memset(serial, 0, sizeof(serial)); + sunxi_get_serial((u8 *)serial); + sprintf(tmpbuf, "%04x%08x%08x", serial[2], serial[1], serial[0]); + size += sprintf(buf+size, "sunxi_serial : %s\n", tmpbuf); + /* chiptype */ sunxi_get_soc_chipid_str(tmpbuf); size += sprintf(buf + size, "sunxi_chiptype : %s\n", tmpbuf); diff --git a/lichee/linux-4.9/drivers/input/keyboard/Kconfig b/lichee/linux-4.9/drivers/input/keyboard/Kconfig index 90f8c09c5..a9204fbba 100755 --- a/lichee/linux-4.9/drivers/input/keyboard/Kconfig +++ b/lichee/linux-4.9/drivers/input/keyboard/Kconfig @@ -713,6 +713,8 @@ config KEYBOARD_CROS_EC To compile this driver as a module, choose M here: the module will be called cros_ec_keyb. + + config KEYBOARD_CAP11XX tristate "Microchip CAP11XX based touch sensors" depends on OF && I2C @@ -735,7 +737,7 @@ config KEYBOARD_BCM module will be called bcm-keypad. config KEYBOARD_SUNXI - tristate "softwinnner KEY BOARD support" + tristate "softwinnner KEY BOARD support!" help Say Y here to enable the keyboard, support 7 keys. based on verify board. @@ -745,5 +747,16 @@ config IR_TX_SUNXI help Say Y here to enable the IR TX, support NEC code. +choice + prompt "Selected Keyboard for netease ihw product" + default XUNFEI_TTS_SDK + + config KEYBOARD_NETEASE_PV1 + tristate "KEYBOARD_NETEASE_PV1" + + config KEYBOARD_NETEASE_PV1_CES + tristate "KEYBOARD_NETEASE_PV1_CES" + +endchoice endif diff --git a/lichee/linux-4.9/drivers/input/keyboard/Makefile b/lichee/linux-4.9/drivers/input/keyboard/Makefile index 09735484d..bac996dd3 100755 --- a/lichee/linux-4.9/drivers/input/keyboard/Makefile +++ b/lichee/linux-4.9/drivers/input/keyboard/Makefile @@ -66,3 +66,5 @@ obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o obj-$(CONFIG_KEYBOARD_SUNXI) += sunxi-keyboard.o obj-$(CONFIG_IR_TX_SUNXI) += sunxi-ir-tx.o +obj-$(CONFIG_KEYBOARD_NETEASE_PV1) += R16-keyboard-pv1.o +obj-$(CONFIG_KEYBOARD_NETEASE_PV1_CES) += R16-keyboard-pv1-ces.o diff --git a/lichee/linux-4.9/drivers/misc/Kconfig b/lichee/linux-4.9/drivers/misc/Kconfig index afdbb1437..bd2fcf6bf 100755 --- a/lichee/linux-4.9/drivers/misc/Kconfig +++ b/lichee/linux-4.9/drivers/misc/Kconfig @@ -4,6 +4,29 @@ menu "Misc devices" +config ADAU1761 + tristate "ADI ADAU1761 DSP" + default n + ---help--- + ADI ADAU1761 DSP. + +config ADAU1761_ES1 + tristate "ADI ADAU1761 DSP FOR ES1" + default n + ---help--- + ADI ADAU1761 DSP FOR ES1. + +config ADAU1761_ES2 + tristate "ADI ADAU1761 DSP FOR ES2" + default n + ---help--- + ADI ADAU1761 DSP FOR ES2. + +config ADAU1761_R311_PV1 + tristate "ADI ADAU1761 DSP FOR R311 PV1" + default n + ---help--- + ADI ADAU1761 DSP FOR R311 PV1. config SENSORS_LIS3LV02D tristate depends on INPUT @@ -801,4 +824,5 @@ source "drivers/misc/echo/Kconfig" source "drivers/misc/cxl/Kconfig" source "drivers/misc/sunxi-rf/Kconfig" source "drivers/misc/leds/Kconfig" +source "drivers/misc/xunfei/Kconfig" endmenu diff --git a/lichee/linux-4.9/drivers/misc/Makefile b/lichee/linux-4.9/drivers/misc/Makefile index d9099697d..31bbafffe 100755 --- a/lichee/linux-4.9/drivers/misc/Makefile +++ b/lichee/linux-4.9/drivers/misc/Makefile @@ -76,4 +76,9 @@ $(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o FORCE $(call if_changed,objcopy) obj-$(CONFIG_SUNXI_RFKILL) += sunxi-rf/ -obj-y += leds/ +obj-$(CONFIG_ADAU1761) += adau1761.o +obj-$(CONFIG_ADAU1761_ES1) += adau1761-es1.o +obj-$(CONFIG_ADAU1761_ES2) += adau1761-es2.o +obj-$(CONFIG_ADAU1761_R311_PV1) += adau1761-r311-pv1.o +obj-y += xunfei/ +obj-y += leds/ \ No newline at end of file diff --git a/lichee/linux-4.9/include/linux/dma/sunxi/dma-sun8iw15.h b/lichee/linux-4.9/include/linux/dma/sunxi/dma-sun8iw15.h index ce315a869..a85a2634f 100755 --- a/lichee/linux-4.9/include/linux/dma/sunxi/dma-sun8iw15.h +++ b/lichee/linux-4.9/include/linux/dma/sunxi/dma-sun8iw15.h @@ -91,6 +91,6 @@ #define DRQDST_OTG_EP3 32 #define DRQDST_OTG_EP4 33 #define DRQDST_OTG_EP5 34 - +#define DRQDST_LEDC 45 #endif /*__DMA_SUN8IW15__ */ diff --git a/lichee/linux-4.9/sound/soc/codecs/Kconfig b/lichee/linux-4.9/sound/soc/codecs/Kconfig index ce0642053..b16b67db3 100755 --- a/lichee/linux-4.9/sound/soc/codecs/Kconfig +++ b/lichee/linux-4.9/sound/soc/codecs/Kconfig @@ -1089,6 +1089,10 @@ config SND_SOC_TPA6130A2 tristate "Texas Instruments TPA6130A2 headphone amplifier" depends on I2C +config SND_SOC_ES7243 + tristate "SND_SOC_ES7243" + depends on I2C + endmenu # Wolfgang add ACX00 diff --git a/lichee/linux-4.9/sound/soc/codecs/Makefile b/lichee/linux-4.9/sound/soc/codecs/Makefile index 175340bc7..50cb66227 100755 --- a/lichee/linux-4.9/sound/soc/codecs/Makefile +++ b/lichee/linux-4.9/sound/soc/codecs/Makefile @@ -456,3 +456,4 @@ obj-$(CONFIG_SND_SOC_AC100) += snd-soc-ac100.o obj-$(CONFIG_SND_SOC_AC102) += snd-soc-ac102.o obj-$(CONFIG_SND_SOC_ES7243) += snd-soc-es7243.o +obj-$(CONFIG_SND_SOC_ES7243) += es7243.o diff --git a/lichee/linux-4.9/sound/soc/soc-core.c b/lichee/linux-4.9/sound/soc/soc-core.c index 885fab464..6f06860ea 100755 --- a/lichee/linux-4.9/sound/soc/soc-core.c +++ b/lichee/linux-4.9/sound/soc/soc-core.c @@ -21,7 +21,7 @@ * o Add more codecs and platforms to ensure good API coverage. * o Support TDM on PCM and I2S */ - +#define DEBUG #include #include #include @@ -985,6 +985,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { + if(dai && dai->name) + printk("Wzj,snd_soc_find_dai cur:%s\n", dai->name); if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) continue; @@ -3407,6 +3409,8 @@ int snd_soc_register_codec(struct device *dev, dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->component.name); + printk("ASoC: Registered codec '%s'\n", + codec->component.name); return 0; err_cleanup: diff --git a/lichee/linux-4.9/sound/soc/sunxi/sunxi-snddaudio.c b/lichee/linux-4.9/sound/soc/sunxi/sunxi-snddaudio.c index 91f46ab86..30f68aee7 100755 --- a/lichee/linux-4.9/sound/soc/sunxi/sunxi-snddaudio.c +++ b/lichee/linux-4.9/sound/soc/sunxi/sunxi-snddaudio.c @@ -116,6 +116,7 @@ static int sunxi_snddaudio_hw_params(struct snd_pcm_substream *substream, /* sunxi card initialization */ static int sunxi_snddaudio_init(struct snd_soc_pcm_runtime *rtd) { + printk("wzj:sunxi_snddaudio_init!\n"); return 0; } @@ -370,6 +371,9 @@ cpu_node_find: dai_link->codec_name, dai_link->codec_dai_name); + printk("wzj: codec: %s, codec_dai: %s.\n", + dai_link->codec_name, + dai_link->codec_dai_name); #ifdef CONFIG_SND_SUNXI_MAD sunxi_daudio_priv.mad_bind = 0; snd_soc_card_set_drvdata(card, &sunxi_daudio_priv); diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system index afff67914..3c6cfdeba 100755 --- a/package/base-files/files/etc/config/system +++ b/package/base-files/files/etc/config/system @@ -1,8 +1,8 @@ config system option hostname TinaLinux - option timezone Asia/Shanghai + option zonename Asia/Shanghai option timezone CST-8 - option log_file /tmp/.lastlog + option log_file /root/.lastlog option log_size 512 option log_buffer_size 64 diff --git a/package/netease/submodules b/package/netease/submodules index cbf96ef8d..5974f3a36 160000 --- a/package/netease/submodules +++ b/package/netease/submodules @@ -1 +1 @@ -Subproject commit cbf96ef8d15ebcc710d6f50c67c58484d3de9e3b +Subproject commit 5974f3a3638478d296e89bd0ec0ad4cc14addbfc diff --git a/target/allwinner/mandolin-common/bin/u-boot-sun8iw15p1.bin b/target/allwinner/mandolin-common/bin/u-boot-sun8iw15p1.bin index 6990fb7ef..bffe3b014 100755 Binary files a/target/allwinner/mandolin-common/bin/u-boot-sun8iw15p1.bin and b/target/allwinner/mandolin-common/bin/u-boot-sun8iw15p1.bin differ diff --git a/target/allwinner/mandolin-pv1/config-4.9 b/target/allwinner/mandolin-pv1/config-4.9 index 3a852cae1..c8516c43b 100644 --- a/target/allwinner/mandolin-pv1/config-4.9 +++ b/target/allwinner/mandolin-pv1/config-4.9 @@ -1,3 +1,7 @@ +# CONFIG_ADAU1761 is not set +# CONFIG_ADAU1761_ES1 is not set +# CONFIG_ADAU1761_ES2 is not set +CONFIG_ADAU1761_R311_PV1=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_AF_KCM is not set CONFIG_ALIGNMENT_TRAP=y @@ -526,6 +530,8 @@ CONFIG_KERNEL_GZIP=y CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO_POLLED=y +# CONFIG_KEYBOARD_NETEASE_PV1 is not set +# CONFIG_KEYBOARD_NETEASE_PV1_CES is not set # CONFIG_KEYBOARD_SUN4I_LRADC is not set CONFIG_KEYBOARD_SUNXI=y # CONFIG_KS7010 is not set @@ -823,6 +829,7 @@ CONFIG_SND_SOC_AD82584F=y # CONFIG_SND_SOC_CS35L33 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=y +# CONFIG_SND_SOC_ES7243 is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_IMG is not set @@ -1061,6 +1068,7 @@ CONFIG_XFRM_USER=y CONFIG_XPS=y # CONFIG_XR829_WLAN is not set # CONFIG_XR_WLAN is not set +# CONFIG_XUNFEI_CPLD is not set CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZLIB_INFLATE=y