diff --git a/packages/linux/patches/amlogic-3.14/linux-007-sound_soc_aml_m8-Report-only-working-frequecies-and-bit-depths.patch b/packages/linux/patches/amlogic-3.14/linux-007-sound_soc_aml_m8-Report-only-working-frequecies-and-bit-depths.patch deleted file mode 100644 index 72c12ac0722..00000000000 --- a/packages/linux/patches/amlogic-3.14/linux-007-sound_soc_aml_m8-Report-only-working-frequecies-and-bit-depths.patch +++ /dev/null @@ -1,58 +0,0 @@ -From edab2a489829689fdaadb90f1897c948ea3c9020 Mon Sep 17 00:00:00 2001 -From: kszaq -Date: Wed, 3 Jun 2015 10:20:04 +0200 -Subject: [PATCH] sound/soc/aml/m8: Report only working frequecies and bit - depths - ---- - sound/soc/aml/m8/aml_spdif_codec.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/aml/m8/aml_spdif_codec.c b/sound/soc/aml/m8/aml_spdif_codec.c -index ac76ef6..cf0e929 100644 ---- a/sound/soc/aml/m8/aml_spdif_codec.c -+++ b/sound/soc/aml/m8/aml_spdif_codec.c -@@ -26,9 +26,8 @@ - - #define DRV_NAME "spdif-dit" - --#define STUB_RATES SNDRV_PCM_RATE_8000_192000 --#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ -- SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -+#define STUB_RATES SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000 -+#define STUB_FORMATS SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE - - struct pinctrl *pin_spdif_ctl; - struct device *spdif_dev; --- -1.8.3.1 - -From 1e6294498438359c4ac39b2ab563487d750fbaaf Mon Sep 17 00:00:00 2001 -From: kszaq -Date: Tue, 30 Aug 2016 23:31:29 +0200 -Subject: [PATCH] sound/soc/aml/m8: report only working frequencies and bit - depths for I2S - ---- - sound/soc/aml/m8/aml_i2s_dai.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/aml/m8/aml_i2s_dai.c b/sound/soc/aml/m8/aml_i2s_dai.c -index 3626676..d2ebad1 100644 ---- a/sound/soc/aml/m8/aml_i2s_dai.c -+++ b/sound/soc/aml/m8/aml_i2s_dai.c -@@ -290,9 +290,8 @@ static int aml_dai_i2s_resume(struct snd_soc_dai *dai) - return 0; - } - --#define AML_DAI_I2S_RATES (SNDRV_PCM_RATE_8000_192000) --#define AML_DAI_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ -- SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -+#define AML_DAI_I2S_RATES SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000 -+#define AML_DAI_I2S_FORMATS SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE - - static struct snd_soc_dai_ops aml_dai_i2s_ops = { - .startup = aml_dai_i2s_startup, --- -1.8.3.1 - diff --git a/projects/S805/linux/linux.arm.conf b/projects/S805/linux/linux.arm.conf index 0c84e5e305e..88d889af7be 100644 --- a/projects/S805/linux/linux.arm.conf +++ b/projects/S805/linux/linux.arm.conf @@ -2822,7 +2822,7 @@ CONFIG_ZRAM=y # CONFIG_SPEAKUP is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set -CONFIG_STAGING_MEDIA=y +# CONFIG_STAGING_MEDIA is not set # # Android diff --git a/projects/S905/linux/linux.aarch64.conf b/projects/S905/linux/linux.aarch64.conf index b0929ee78df..2d598d60b52 100644 --- a/projects/S905/linux/linux.aarch64.conf +++ b/projects/S905/linux/linux.aarch64.conf @@ -815,7 +815,7 @@ CONFIG_USB_HOST_ELECT_TEST=y # # I2C Hardware Bus support # -# CONFIG_I2C_AML is not set +CONFIG_I2C_AML=y # CONFIG_I2C_SLAVE_AML is not set # CONFIG_I2C_SW_AML is not set CONFIG_AML_PWM=y @@ -2217,7 +2217,7 @@ CONFIG_REGULATOR=y # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set -CONFIG_VEXPRESS_DVI_CONTROL=y +# CONFIG_VEXPRESS_DVI_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set @@ -2253,32 +2253,7 @@ CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_AUO_K190X is not set # CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI922X is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -# CONFIG_LCD_PLATFORM is not set -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_HX8357 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -# CONFIG_BACKLIGHT_PWM is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_GPIO is not set -# CONFIG_BACKLIGHT_LV5207LP is not set -# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_ADF is not set # @@ -2337,6 +2312,7 @@ CONFIG_SND_SOC_TAS5707=y CONFIG_SND_SOC_TAS5717=y CONFIG_SND_SOC_TAS5731=y CONFIG_SND_SOC_AMLPMU4=y +CONFIG_SND_SOC_ES8323=y CONFIG_SND_SOC_PCM2BT=y CONFIG_SND_SOC_AMLT9015=y CONFIG_SND_SOC_AMLT9015S=y @@ -2401,8 +2377,6 @@ CONFIG_PANTHERLORD_FF=y CONFIG_HID_PETALYNX=y CONFIG_HID_PICOLCD=m CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y # CONFIG_HID_PRIMAX is not set # CONFIG_HID_ROCCAT is not set diff --git a/projects/S905/options b/projects/S905/options index b85d9680e51..90e9fe88c95 100644 --- a/projects/S905/options +++ b/projects/S905/options @@ -75,7 +75,7 @@ # Kernel to use. values can be: # default: default mainline kernel LINUX="custom" - KERNEL_VERSION="f353216" + KERNEL_VERSION="8ab0f59" KERNEL_URL="https://github.com/kszaq/linux-amlogic-le/archive/$KERNEL_VERSION.tar.gz" KERNEL_SOURCE_DIR="linux-amlogic-le-$KERNEL_VERSION*" KERNEL_PATCH_DIRS="amlogic-3.14"