mirror of
https://github.com/armbian/build.git
synced 2025-08-17 08:36:59 +02:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 475139057d96fd8c5447d22527be1551f9ed398b Mon Sep 17 00:00:00 2001
|
|
From: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
|
|
Date: Fri, 9 Aug 2019 11:28:03 +0800
|
|
Subject: [PATCH 16/16] ASOC: meson fix build error under 5.3.y
|
|
|
|
Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
|
|
---
|
|
sound/soc/meson-gx/aiu-i2s.c | 3 ++-
|
|
sound/soc/meson-gx/aiu-spdif.c | 3 ++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sound/soc/meson-gx/aiu-i2s.c b/sound/soc/meson-gx/aiu-i2s.c
|
|
index 450f1d20a1d6..21e335498112 100644
|
|
--- a/sound/soc/meson-gx/aiu-i2s.c
|
|
+++ b/sound/soc/meson-gx/aiu-i2s.c
|
|
@@ -313,9 +313,10 @@ static int meson_aiu_i2s_dma_new(struct snd_soc_pcm_runtime *rtd)
|
|
struct snd_card *card = rtd->card->snd_card;
|
|
size_t size = meson_aiu_i2s_dma_hw.buffer_bytes_max;
|
|
|
|
- return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
|
|
+ snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
|
|
SNDRV_DMA_TYPE_DEV,
|
|
card->dev, size, size);
|
|
+ return 0;
|
|
}
|
|
|
|
#define AIU_CLK_CTRL_I2S_DIV_EN BIT(0)
|
|
diff --git a/sound/soc/meson-gx/aiu-spdif.c b/sound/soc/meson-gx/aiu-spdif.c
|
|
index 17cfe134e8f7..a54544d8f065 100644
|
|
--- a/sound/soc/meson-gx/aiu-spdif.c
|
|
+++ b/sound/soc/meson-gx/aiu-spdif.c
|
|
@@ -332,9 +332,10 @@ static int meson_aiu_spdif_dma_new(struct snd_soc_pcm_runtime *rtd)
|
|
struct snd_card *card = rtd->card->snd_card;
|
|
size_t size = meson_aiu_spdif_dma_hw.buffer_bytes_max;
|
|
|
|
- return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
|
|
+ snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
|
|
SNDRV_DMA_TYPE_DEV,
|
|
card->dev, size, size);
|
|
+ return 0;
|
|
}
|
|
|
|
#define AIU_CLK_CTRL_958_DIV_EN BIT(1)
|
|
--
|
|
2.20.1
|
|
|