Unverified Commit dac825b6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Patches to update for rockchip spdif" from Sugar Zhang <sugar.zhang@rock-chips.com>: 

These patches fixup or update for rockchip spdif.

Sugar Zhang (4):
  ASoC: rockchip: spdif: Mark SPDIF_SMPDR as volatile
  ASoC: rockchip: spdif: Fix some coding style
  ASoC: rockchip: spdif: Add support for rk3568 spdif
  ASoC: dt-bindings: rockchip: Add compatible for rk3568 spdif

 .../devicetree/bindings/sound/rockchip-spdif.yaml  |  1 +
 sound/soc/rockchip/rockchip_spdif.c                | 38 ++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

--
2.7.4
parents 11a08e05 e79ef3c2

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - const: rockchip,rk3366-spdif

      - const: rockchip,rk3368-spdif

      - const: rockchip,rk3399-spdif

      - const: rockchip,rk3568-spdif

      - items:

          - enum:

              - rockchip,rk3188-spdif

sound/soc/rockchip/rockchip_spdif.c

+21 −17
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ static const struct of_device_id rk_spdif_match[] __maybe_unused = { 
	  .data = (void *)RK_SPDIF_RK3366 },

	{ .compatible = "rockchip,rk3399-spdif",

	  .data = (void *)RK_SPDIF_RK3366 },

	{ .compatible = "rockchip,rk3568-spdif",

	  .data = (void *)RK_SPDIF_RK3366 },

	{},

};

MODULE_DEVICE_TABLE(of, rk_spdif_match);
@@ -137,9 +139,9 @@ static int rk_spdif_hw_params(struct snd_pcm_substream *substream, 
	}



	ret = regmap_update_bits(spdif->regmap, SPDIF_CFGR,

		SPDIF_CFGR_CLK_DIV_MASK | SPDIF_CFGR_HALFWORD_ENABLE |

		SDPIF_CFGR_VDW_MASK,

		val);

				 SPDIF_CFGR_CLK_DIV_MASK |

				 SPDIF_CFGR_HALFWORD_ENABLE |

				 SDPIF_CFGR_VDW_MASK, val);



	return ret;

}
@@ -247,6 +249,7 @@ static bool rk_spdif_rd_reg(struct device *dev, unsigned int reg) 
	case SPDIF_INTCR:

	case SPDIF_INTSR:

	case SPDIF_XFER:

	case SPDIF_SMPDR:

		return true;

	default:

		return false;
@@ -258,6 +261,7 @@ static bool rk_spdif_volatile_reg(struct device *dev, unsigned int reg) 
	switch (reg) {

	case SPDIF_INTSR:

	case SPDIF_SDBLR:

	case SPDIF_SMPDR:

		return true;

	default:

		return false;