Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next (5b2ad46d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/base/regmap/internal.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,9 @@ struct regmap_field {
		/* lsb */
		unsigned int shift;
		unsigned int reg;

		unsigned int id_size;
		unsigned int id_offset;
		};

		#ifdef CONFIG_DEBUG_FS

drivers/base/regmap/regmap.c

+103 −0

Original line number	Diff line number	Diff line
		@@ -813,6 +813,8 @@ static void regmap_field_init(struct regmap_field *rm_field,
		rm_field->reg = reg_field.reg;
		rm_field->shift = reg_field.lsb;
		rm_field->mask = ((BIT(field_bits) - 1) << reg_field.lsb);
		rm_field->id_size = reg_field.id_size;
		rm_field->id_offset = reg_field.id_offset;
		}

		/**
		@@ -1420,6 +1422,74 @@ int regmap_field_write(struct regmap_field *field, unsigned int val)
		}
		EXPORT_SYMBOL_GPL(regmap_field_write);

		/**
		* regmap_field_update_bits(): Perform a read/modify/write cycle
		* on the register field
		*
		* @field: Register field to write to
		* @mask: Bitmask to change
		* @val: Value to be written
		*
		* A value of zero will be returned on success, a negative errno will
		* be returned in error cases.
		*/
		int regmap_field_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val)
		{
		mask = (mask << field->shift) & field->mask;

		return regmap_update_bits(field->regmap, field->reg,
		mask, val << field->shift);
		}
		EXPORT_SYMBOL_GPL(regmap_field_update_bits);

		/**
		* regmap_fields_write(): Write a value to a single register field with port ID
		*
		* @field: Register field to write to
		* @id: port ID
		* @val: Value to be written
		*
		* A value of zero will be returned on success, a negative errno will
		* be returned in error cases.
		*/
		int regmap_fields_write(struct regmap_field *field, unsigned int id,
		unsigned int val)
		{
		if (id >= field->id_size)
		return -EINVAL;

		return regmap_update_bits(field->regmap,
		field->reg + (field->id_offset * id),
		field->mask, val << field->shift);
		}
		EXPORT_SYMBOL_GPL(regmap_fields_write);

		/**
		* regmap_fields_update_bits(): Perform a read/modify/write cycle
		* on the register field
		*
		* @field: Register field to write to
		* @id: port ID
		* @mask: Bitmask to change
		* @val: Value to be written
		*
		* A value of zero will be returned on success, a negative errno will
		* be returned in error cases.
		*/
		int regmap_fields_update_bits(struct regmap_field *field, unsigned int id,
		unsigned int mask, unsigned int val)
		{
		if (id >= field->id_size)
		return -EINVAL;

		mask = (mask << field->shift) & field->mask;

		return regmap_update_bits(field->regmap,
		field->reg + (field->id_offset * id),
		mask, val << field->shift);
		}
		EXPORT_SYMBOL_GPL(regmap_fields_update_bits);

		/*
		* regmap_bulk_write(): Write multiple registers to the device
		*
		@@ -1730,6 +1800,39 @@ int regmap_field_read(struct regmap_field field, unsigned int val)
		}
		EXPORT_SYMBOL_GPL(regmap_field_read);

		/**
		* regmap_fields_read(): Read a value to a single register field with port ID
		*
		* @field: Register field to read from
		* @id: port ID
		* @val: Pointer to store read value
		*
		* A value of zero will be returned on success, a negative errno will
		* be returned in error cases.
		*/
		int regmap_fields_read(struct regmap_field *field, unsigned int id,
		unsigned int *val)
		{
		int ret;
		unsigned int reg_val;

		if (id >= field->id_size)
		return -EINVAL;

		ret = regmap_read(field->regmap,
		field->reg + (field->id_offset * id),
		&reg_val);
		if (ret != 0)
		return ret;

		reg_val &= field->mask;
		reg_val >>= field->shift;
		*val = reg_val;

		return ret;
		}
		EXPORT_SYMBOL_GPL(regmap_fields_read);

		/**
		* regmap_bulk_read(): Read multiple registers from the device
		*

include/linux/regmap.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -431,11 +431,15 @@ bool regmap_reg_in_ranges(unsigned int reg,
		* @reg: Offset of the register within the regmap bank
		* @lsb: lsb of the register field.
		* @reg: msb of the register field.
		* @id_size: port size if it has some ports
		* @id_offset: address offset for each ports
		*/
		struct reg_field {
		unsigned int reg;
		unsigned int lsb;
		unsigned int msb;
		unsigned int id_size;
		unsigned int id_offset;
		};

		#define REG_FIELD(_reg, _lsb, _msb) { \
		@@ -454,6 +458,15 @@ void devm_regmap_field_free(struct device dev, struct regmap_field field);

		int regmap_field_read(struct regmap_field field, unsigned int val);
		int regmap_field_write(struct regmap_field *field, unsigned int val);
		int regmap_field_update_bits(struct regmap_field *field,
		unsigned int mask, unsigned int val);

		int regmap_fields_write(struct regmap_field *field, unsigned int id,
		unsigned int val);
		int regmap_fields_read(struct regmap_field *field, unsigned int id,
		unsigned int *val);
		int regmap_fields_update_bits(struct regmap_field *field, unsigned int id,
		unsigned int mask, unsigned int val);

		/**
		* Description of an IRQ for the generic regmap irq_chip.

include/sound/rcar_snd.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@
		#define RSND_SSI_CLK_PIN_SHARE (1 << 31)
		#define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */
		#define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */
		#define RSND_SSI_DEPENDENT (1 << 28) /* SSI needs SRU/SCU */

		#define RSND_SSI_PLAY (1 << 24)

sound/soc/sh/rcar/adg.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		* for more details.
		*/
		#include <linux/sh_clk.h>
		#include <mach/clock.h>
		#include "rsnd.h"

		#define CLKA 0
		@@ -22,6 +21,7 @@ struct rsnd_adg {

		int rate_of_441khz_div_6;
		int rate_of_48khz_div_6;
		u32 ckr;
		};

		#define for_each_rsnd_clk(pos, adg, i) \
		@@ -116,6 +116,11 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate)

		found_clock:

		/* see rsnd_adg_ssi_clk_init() */
		rsnd_mod_bset(mod, SSICKR, 0x00FF0000, adg->ckr);
		rsnd_mod_write(mod, BRRA, 0x00000002); /* 1/6 */
		rsnd_mod_write(mod, BRRB, 0x00000002); /* 1/6 */

		/*
		* This "mod" = "ssi" here.
		* we can get "ssi id" from mod
		@@ -182,9 +187,7 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv priv, struct rsnd_adg adg)
		}
		}

		rsnd_priv_bset(priv, SSICKR, 0x00FF0000, ckr);
		rsnd_priv_write(priv, BRRA, 0x00000002); /* 1/6 */
		rsnd_priv_write(priv, BRRB, 0x00000002); /* 1/6 */
		adg->ckr = ckr;
		}

		int rsnd_adg_probe(struct platform_device *pdev,