Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: rockchip: add bindings for spdif controller

this patch add compatible for rk3366/rk3368/rk3399 spdif,
these three spdifs share the same type.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Sugar Zhang and committed by
Mark Brown
ab877394 d8fc2198

+16 -5
+6 -2
Documentation/devicetree/bindings/sound/rockchip-spdif.txt
··· 7 7 Required properties: 8 8 9 9 - compatible: should be one of the following: 10 - - "rockchip,rk3288-spdif", "rockchip,rk3188-spdif" or 11 - "rockchip,rk3066-spdif" 10 + - "rockchip,rk3066-spdif" 11 + - "rockchip,rk3188-spdif" 12 + - "rockchip,rk3288-spdif" 13 + - "rockchip,rk3366-spdif" 14 + - "rockchip,rk3368-spdif" 15 + - "rockchip,rk3399-spdif" 12 16 - reg: physical base address of the controller and length of memory mapped 13 17 region. 14 18 - interrupts: should contain the SPDIF interrupt.
+10 -3
sound/soc/rockchip/rockchip_spdif.c
··· 28 28 RK_SPDIF_RK3066, 29 29 RK_SPDIF_RK3188, 30 30 RK_SPDIF_RK3288, 31 + RK_SPDIF_RK3366, 31 32 }; 32 33 33 34 #define RK3288_GRF_SOC_CON2 0x24c ··· 46 45 47 46 static const struct of_device_id rk_spdif_match[] = { 48 47 { .compatible = "rockchip,rk3066-spdif", 49 - .data = (void *) RK_SPDIF_RK3066 }, 48 + .data = (void *)RK_SPDIF_RK3066 }, 50 49 { .compatible = "rockchip,rk3188-spdif", 51 - .data = (void *) RK_SPDIF_RK3188 }, 50 + .data = (void *)RK_SPDIF_RK3188 }, 52 51 { .compatible = "rockchip,rk3288-spdif", 53 - .data = (void *) RK_SPDIF_RK3288 }, 52 + .data = (void *)RK_SPDIF_RK3288 }, 53 + { .compatible = "rockchip,rk3366-spdif", 54 + .data = (void *)RK_SPDIF_RK3366 }, 55 + { .compatible = "rockchip,rk3368-spdif", 56 + .data = (void *)RK_SPDIF_RK3366 }, 57 + { .compatible = "rockchip,rk3399-spdif", 58 + .data = (void *)RK_SPDIF_RK3366 }, 54 59 {}, 55 60 }; 56 61 MODULE_DEVICE_TABLE(of, rk_spdif_match);