mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00: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
80 lines
3.2 KiB
Diff
80 lines
3.2 KiB
Diff
From 4bfc6b2d77838f3c04e4a1b0814fcf17be2b048f Mon Sep 17 00:00:00 2001
|
|
From: Marcus Cooper <codekipper@gmail.com>
|
|
Date: Sun, 3 Dec 2017 10:09:08 -0800
|
|
Subject: [PATCH 114/146] ASoC: sun4i-i2s: Add compatibility with A64 codec I2S
|
|
|
|
The I2S block used for the audio codec in the A64 differs from other 3
|
|
I2S modules in A64 and isn't compatible with H3. But it is very similar
|
|
to what is found in A10(sun4i). However, its TX FIFO is
|
|
located at a different address.
|
|
|
|
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
|
|
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
---
|
|
.../devicetree/bindings/sound/sun4i-i2s.txt | 2 ++
|
|
sound/soc/sunxi/sun4i-i2s.c | 21 +++++++++++++++++++
|
|
2 files changed, 23 insertions(+)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
|
|
index b9d50d6cdef3..61e71c1729e0 100644
|
|
--- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
|
|
+++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
|
|
@@ -10,6 +10,7 @@ Required properties:
|
|
- "allwinner,sun6i-a31-i2s"
|
|
- "allwinner,sun8i-a83t-i2s"
|
|
- "allwinner,sun8i-h3-i2s"
|
|
+ - "allwinner,sun50i-a64-codec-i2s"
|
|
- reg: physical base address of the controller and length of memory mapped
|
|
region.
|
|
- interrupts: should contain the I2S interrupt.
|
|
@@ -26,6 +27,7 @@ Required properties for the following compatibles:
|
|
- "allwinner,sun6i-a31-i2s"
|
|
- "allwinner,sun8i-a83t-i2s"
|
|
- "allwinner,sun8i-h3-i2s"
|
|
+ - "allwinner,sun50i-a64-codec-i2s"
|
|
- resets: phandle to the reset line for this codec
|
|
|
|
Example:
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
|
index daa6c08cffbc..d5ec1a20499d 100644
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
|
@@ -950,6 +950,23 @@ static const struct sun4i_i2s_quirks sun8i_h3_i2s_quirks = {
|
|
.field_rxchansel = REG_FIELD(SUN8I_I2S_RX_CHAN_SEL_REG, 0, 2),
|
|
};
|
|
|
|
+static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
|
|
+ .has_reset = true,
|
|
+ .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG,
|
|
+ .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
|
|
+ .has_slave_select_bit = true,
|
|
+ .field_clkdiv_mclk_en = REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 7, 7),
|
|
+ .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 2, 3),
|
|
+ .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5),
|
|
+ .field_fmt_bclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 6, 6),
|
|
+ .field_fmt_lrclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7),
|
|
+ .field_fmt_mode = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 1),
|
|
+ .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),
|
|
+ .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
|
|
+ .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
|
|
+ .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
|
|
+};
|
|
+
|
|
static int sun4i_i2s_init_regmap_fields(struct device *dev,
|
|
struct sun4i_i2s *i2s)
|
|
{
|
|
@@ -1158,6 +1175,10 @@ static const struct of_device_id sun4i_i2s_match[] = {
|
|
.compatible = "allwinner,sun8i-h3-i2s",
|
|
.data = &sun8i_h3_i2s_quirks,
|
|
},
|
|
+ {
|
|
+ .compatible = "allwinner,sun50i-a64-codec-i2s",
|
|
+ .data = &sun50i_a64_codec_i2s_quirks,
|
|
+ },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sun4i_i2s_match);
|
|
--
|
|
2.17.1
|
|
|