Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a5e9dab authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

parents d55f0691 c5d5a58d

include/sound/rcar_snd.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { 
 *

 * A : generation

 */

#define RSND_GEN_MASK	(0xF << 0)

#define RSND_GEN1	(1 << 0) /* fixme */

#define RSND_GEN2	(2 << 0) /* fixme */

sound/soc/sh/rcar/rsnd.h

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv, 
void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,

			       struct rsnd_mod *mod,

			       enum rsnd_reg reg);

#define rsnd_is_gen1(s)		((s)->info->flags & RSND_GEN1)

#define rsnd_is_gen2(s)		((s)->info->flags & RSND_GEN2)

#define rsnd_is_gen1(s)		(((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)

#define rsnd_is_gen2(s)		(((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)



/*

 *	R-Car ADG