[PATCH] ASoC: rockchip: i2s: configure the sdio pins' iomux mode

[Heiko Stuebner]

Hi,

Am Mittwoch, 6. April 2016, 16:38:22 schrieb Sugar Zhang:
> There are 3 i2s sdio pins, which iomux mode is as follows:
> 
>  - sdi3_sdo1
>  - sdi2_sdo2
>  - sdi1_sdo3
> 
> we need to configure these pins' iomux mode via the GRF register
> when use multi channel playback/capture.
> 
> Signed-off-by: Sugar Zhang <sugar.zhang at rock-chips.com>
> ---
> 
>  .../devicetree/bindings/sound/rockchip-i2s.txt     |  5 +++
>  sound/soc/rockchip/rockchip_i2s.c                  | 39
> +++++++++++++++++++++- sound/soc/rockchip/rockchip_i2s.h                 
> |  8 +++++
>  3 files changed, 51 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
> b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index
> 6e86d8a..ad72a7d 100644
> --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
> +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
> @@ -23,6 +23,11 @@ Required properties:
>  - rockchip,playback-channels: max playback channels, if not set, 8
> channels default. - rockchip,capture-channels: max capture channels, if
> not set, 2 channels default.
> 
> +Required properties for controller which support multi channels
> playback/capture: +
> +- rockchip,grf: Should be phandle/offset pair. the phandle of the syscon
> node for GRF register, +  and the offset of the GRF for control register.

I think I'd like it more to use the generic grf-binding we always use 
everwhere else (just the phandle without any offset) and keep the actual 
offset in the driver on a per-soc basis.

That way rockchip,grf stays consistent over all users.

We already have the per-soc compatible values, so it should a easy to add a 
.data element with the necessary offset-information.

> +
>  Example for rk3288 I2S controller:
> 
>  i2s at ff890000 {
> diff --git a/sound/soc/rockchip/rockchip_i2s.c
> b/sound/soc/rockchip/rockchip_i2s.c index 2f8e204..bc72780 100644
> --- a/sound/soc/rockchip/rockchip_i2s.c
> +++ b/sound/soc/rockchip/rockchip_i2s.c

[...]

> @@ -478,6 +504,18 @@ static int rockchip_i2s_probe(struct platform_device
> *pdev) return -ENOMEM;
>  	}
> 
> +	i2s->dev = &pdev->dev;
> +
> +	i2s->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf");
> +	if (!IS_ERR(i2s->grf)) {
> +		ret = of_property_read_u32_index(node, "rockchip,grf",
> +						 1, &i2s->iocfg_reg);
> +		if (ret) {
> +			dev_err(&pdev->dev, "Can't get iocfg_reg offset\n");
> +			return ret;
> +		}
> +	}
> +

as said in the binding part, please use the generic grf handling and get the 
io-offset from per-soc devicetree data in the driver itself.


>  	/* try to prepare related clocks */
>  	i2s->hclk = devm_clk_get(&pdev->dev, "i2s_hclk");
>  	if (IS_ERR(i2s->hclk)) {
> @@ -517,7 +555,6 @@ static int rockchip_i2s_probe(struct platform_device
> *pdev) i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
> i2s->capture_dma_data.maxburst = 4;
> 
> -	i2s->dev = &pdev->dev;
>  	dev_set_drvdata(&pdev->dev, i2s);
> 
>  	pm_runtime_enable(&pdev->dev);
> diff --git a/sound/soc/rockchip/rockchip_i2s.h
> b/sound/soc/rockchip/rockchip_i2s.h index dc6e2c7..9a6aabf 100644
> --- a/sound/soc/rockchip/rockchip_i2s.h
> +++ b/sound/soc/rockchip/rockchip_i2s.h
> @@ -236,4 +236,12 @@ enum {
>  #define I2S_TXDR	(0x0024)
>  #define I2S_RXDR	(0x0028)
> 
> +/* io direction cfg register */
> +#define I2S_IO_DIRECTION_SHIFT	11

this setting is sitting in GRF_SOC_CON8 on the rk3399. That is part of the 
very volatile register set where settings move around a lot for each soc.

So if we're having the io-offset in per-soc data, we can easily put the 
shift into it as well.

> +#define I2S_IO_DIRECTION_MASK	(7 << I2S_IO_DIRECTION_SHIFT)
> +#define I2S_IO_8CH_OUT_2CH_IN	(0 << I2S_IO_DIRECTION_SHIFT)
> +#define I2S_IO_6CH_OUT_4CH_IN	(1 << I2S_IO_DIRECTION_SHIFT)
> +#define I2S_IO_4CH_OUT_6CH_IN	(3 << I2S_IO_DIRECTION_SHIFT)
> +#define I2S_IO_2CH_OUT_8CH_IN	(7 << I2S_IO_DIRECTION_SHIFT)

Keep the settings without the shift here and do the shift dynamically with 
the per-soc setting when changing the setting.


Thanks
Heiko