| From 168d2cdb51e9d3593fd17530bb4713ab949cd665 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 26 Oct 2016 04:28:06 +0000 |
| Subject: [PATCH 072/299] ASoC: rsnd: rsnd_reg cleanup for SSIU |
| |
| R-Car Gen1 didn't have SSIU IP, and it was part of SRU. |
| In Gen2, SSIU was created and it has original register. |
| Let's cleanup rsnd_reg for SSIU, because this driver |
| doesn't support Gen1 SRU any more. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit bb7927c793e1036bc15f67a8fd10e803f56c6760) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/rsnd.h | 24 +++++++++++++----------- |
| 1 file changed, 13 insertions(+), 11 deletions(-) |
| |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -43,17 +43,7 @@ |
| * see gen1/gen2 for detail |
| */ |
| enum rsnd_reg { |
| - /* SCU (SRC/SSIU/MIX/CTU/DVC) */ |
| - RSND_REG_SSI_MODE, |
| - RSND_REG_SSI_MODE0, |
| - RSND_REG_SSI_MODE1, |
| - RSND_REG_SSI_MODE2, |
| - RSND_REG_SSI_CONTROL, |
| - RSND_REG_SSI_CTRL, |
| - RSND_REG_SSI_BUSIF_MODE, |
| - RSND_REG_SSI_BUSIF_ADINR, |
| - RSND_REG_SSI_BUSIF_DALIGN, |
| - RSND_REG_SSI_INT_ENABLE, |
| + /* SCU (MIX/CTU/DVC) */ |
| RSND_REG_SRC_I_BUSIF_MODE, |
| RSND_REG_SRC_O_BUSIF_MODE, |
| RSND_REG_SRC_ROUTE_MODE0, |
| @@ -160,6 +150,18 @@ enum rsnd_reg { |
| RSND_REG_AUDIO_CLK_SEL1, |
| RSND_REG_AUDIO_CLK_SEL2, |
| |
| + /* SSIU */ |
| + RSND_REG_SSI_MODE, |
| + RSND_REG_SSI_MODE0, |
| + RSND_REG_SSI_MODE1, |
| + RSND_REG_SSI_MODE2, |
| + RSND_REG_SSI_CONTROL, |
| + RSND_REG_SSI_CTRL, |
| + RSND_REG_SSI_BUSIF_MODE, |
| + RSND_REG_SSI_BUSIF_ADINR, |
| + RSND_REG_SSI_BUSIF_DALIGN, |
| + RSND_REG_SSI_INT_ENABLE, |
| + |
| /* SSI */ |
| RSND_REG_SSICR, |
| RSND_REG_SSISR, |
