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

Commit 532161e6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default',... 

Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default', 'asoc/topic/rl6231', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next
parents d781c23e 1af2cc64 41a5fefe ac1125da 1c0beb27 a5afdc5b

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+22 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Required properties: 
- rcar_sound,src		: Should contain SRC feature.

				  The number of SRC subnode should be same as HW.

				  see below for detail.

- rcar_sound,ctu		: Should contain CTU feature.

				  The number of CTU subnode should be same as HW.

				  see below for detail.

- rcar_sound,mix		: Should contain MIX feature.

				  The number of MIX subnode should be same as HW.

				  see below for detail.

- rcar_sound,dvc		: Should contain DVC feature.

				  The number of DVC subnode should be same as HW.

				  see below for detail.
@@ -90,6 +96,22 @@ rcar_sound: sound@ec500000 { 
		};

	};



	rcar_sound,mix {

		mix0: mix@0 { };

		mix1: mix@1 { };

	};



	rcar_sound,ctu {

		ctu00: ctu@0 { };

		ctu01: ctu@1 { };

		ctu02: ctu@2 { };

		ctu03: ctu@3 { };

		ctu10: ctu@4 { };

		ctu11: ctu@5 { };

		ctu12: ctu@6 { };

		ctu13: ctu@7 { };

	};



	rcar_sound,src {

		src0: src@0 {

			interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 


- compatible				: "renesas,rsrc-card,<board>"

					  Examples with soctypes are:

					    - "renesas,rsrc-card"

					    - "renesas,rsrc-card,lager"

					    - "renesas,rsrc-card,koelsch"

Optional properties:
@@ -29,6 +30,12 @@ Optional subnode properties: 
- frame-inversion			: bool property. Add this if the

					  dai-link uses frame clock inversion.

- convert-rate				: platform specified sampling rate convert

- audio-prefix				: see audio-routing

- audio-routing				: A list of the connections between audio components.

					  Each entry is a pair of strings, the first being the connection's sink,

					  the second being the connection's source. Valid names for sources.

					  use audio-prefix if some components is using same sink/sources naming.

					  it can be used if compatible was "renesas,rsrc-card";



Required CPU/CODEC subnodes properties:

drivers/base/regmap/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct regmap { 
	/* if set, the HW registers are known to match map->reg_defaults */

	bool no_sync_defaults;



	struct reg_default *patch;

	struct reg_sequence *patch;

	int patch_regs;



	/* if set, converts bulk rw to single rw */

drivers/base/regmap/regmap.c

+54 −19
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


static int _regmap_update_bits(struct regmap *map, unsigned int reg,

			       unsigned int mask, unsigned int val,

			       bool *change);

			       bool *change, bool force_write);



static int _regmap_bus_reg_read(void *context, unsigned int reg,

				unsigned int *val);
@@ -1178,7 +1178,7 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg, 
		ret = _regmap_update_bits(map, range->selector_reg,

					  range->selector_mask,

					  win_page << range->selector_shift,

					  &page_chg);

					  &page_chg, false);



		map->work_buf = orig_work_buf;
@@ -1624,6 +1624,18 @@ int regmap_fields_write(struct regmap_field *field, unsigned int id, 
}

EXPORT_SYMBOL_GPL(regmap_fields_write);



int regmap_fields_force_write(struct regmap_field *field, unsigned int id,

			unsigned int val)

{

	if (id >= field->id_size)

		return -EINVAL;



	return regmap_write_bits(field->regmap,

				  field->reg + (field->id_offset * id),

				  field->mask, val << field->shift);

}

EXPORT_SYMBOL_GPL(regmap_fields_force_write);



/**

 * regmap_fields_update_bits():	Perform a read/modify/write cycle

 *                              on the register field
@@ -1743,7 +1755,7 @@ EXPORT_SYMBOL_GPL(regmap_bulk_write); 
 * relative. The page register has been written if that was neccessary.

 */

static int _regmap_raw_multi_reg_write(struct regmap *map,

				       const struct reg_default *regs,

				       const struct reg_sequence *regs,

				       size_t num_regs)

{

	int ret;
@@ -1800,12 +1812,12 @@ static unsigned int _regmap_register_page(struct regmap *map, 
}



static int _regmap_range_multi_paged_reg_write(struct regmap *map,

					       struct reg_default *regs,

					       struct reg_sequence *regs,

					       size_t num_regs)

{

	int ret;

	int i, n;

	struct reg_default *base;

	struct reg_sequence *base;

	unsigned int this_page = 0;

	/*

	 * the set of registers are not neccessarily in order, but
@@ -1843,7 +1855,7 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map, 
}



static int _regmap_multi_reg_write(struct regmap *map,

				   const struct reg_default *regs,

				   const struct reg_sequence *regs,

				   size_t num_regs)

{

	int i;
@@ -1895,8 +1907,8 @@ static int _regmap_multi_reg_write(struct regmap *map, 
		struct regmap_range_node *range;

		range = _regmap_range_lookup(map, reg);

		if (range) {

			size_t len = sizeof(struct reg_default)*num_regs;

			struct reg_default *base = kmemdup(regs, len,

			size_t len = sizeof(struct reg_sequence)*num_regs;

			struct reg_sequence *base = kmemdup(regs, len,

							   GFP_KERNEL);

			if (!base)

				return -ENOMEM;
@@ -1929,7 +1941,7 @@ static int _regmap_multi_reg_write(struct regmap *map, 
 * A value of zero will be returned on success, a negative errno will be

 * returned in error cases.

 */

int regmap_multi_reg_write(struct regmap *map, const struct reg_default *regs,

int regmap_multi_reg_write(struct regmap *map, const struct reg_sequence *regs,

			   int num_regs)

{

	int ret;
@@ -1962,7 +1974,7 @@ EXPORT_SYMBOL_GPL(regmap_multi_reg_write); 
 * be returned in error cases.

 */

int regmap_multi_reg_write_bypassed(struct regmap *map,

				    const struct reg_default *regs,

				    const struct reg_sequence *regs,

				    int num_regs)

{

	int ret;
@@ -2327,7 +2339,7 @@ EXPORT_SYMBOL_GPL(regmap_bulk_read); 


static int _regmap_update_bits(struct regmap *map, unsigned int reg,

			       unsigned int mask, unsigned int val,

			       bool *change)

			       bool *change, bool force_write)

{

	int ret;

	unsigned int tmp, orig;
@@ -2339,7 +2351,7 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 
	tmp = orig & ~mask;

	tmp |= val & mask;



	if (tmp != orig) {

	if (force_write || (tmp != orig)) {

		ret = _regmap_write(map, reg, tmp);

		if (change)

			*change = true;
@@ -2367,13 +2379,36 @@ int regmap_update_bits(struct regmap *map, unsigned int reg, 
	int ret;



	map->lock(map->lock_arg);

	ret = _regmap_update_bits(map, reg, mask, val, NULL);

	ret = _regmap_update_bits(map, reg, mask, val, NULL, false);

	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits);



/**

 * regmap_write_bits: Perform a read/modify/write cycle on the register map

 *

 * @map: Register map to update

 * @reg: Register to update

 * @mask: Bitmask to change

 * @val: New value for bitmask

 *

 * Returns zero for success, a negative number on error.

 */

int regmap_write_bits(struct regmap *map, unsigned int reg,

		      unsigned int mask, unsigned int val)

{

	int ret;



	map->lock(map->lock_arg);

	ret = _regmap_update_bits(map, reg, mask, val, NULL, true);

	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_write_bits);



/**

 * regmap_update_bits_async: Perform a read/modify/write cycle on the register

 *                           map asynchronously
@@ -2398,7 +2433,7 @@ int regmap_update_bits_async(struct regmap *map, unsigned int reg, 


	map->async = true;



	ret = _regmap_update_bits(map, reg, mask, val, NULL);

	ret = _regmap_update_bits(map, reg, mask, val, NULL, false);



	map->async = false;
@@ -2427,7 +2462,7 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg, 
	int ret;



	map->lock(map->lock_arg);

	ret = _regmap_update_bits(map, reg, mask, val, change);

	ret = _regmap_update_bits(map, reg, mask, val, change, false);

	map->unlock(map->lock_arg);

	return ret;

}
@@ -2460,7 +2495,7 @@ int regmap_update_bits_check_async(struct regmap *map, unsigned int reg, 


	map->async = true;



	ret = _regmap_update_bits(map, reg, mask, val, change);

	ret = _regmap_update_bits(map, reg, mask, val, change, false);



	map->async = false;
@@ -2552,10 +2587,10 @@ EXPORT_SYMBOL_GPL(regmap_async_complete); 
 * The caller must ensure that this function cannot be called

 * concurrently with either itself or regcache_sync().

 */

int regmap_register_patch(struct regmap *map, const struct reg_default *regs,

int regmap_register_patch(struct regmap *map, const struct reg_sequence *regs,

			  int num_regs)

{

	struct reg_default *p;

	struct reg_sequence *p;

	int ret;

	bool bypass;
@@ -2564,7 +2599,7 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs, 
		return 0;



	p = krealloc(map->patch,

		     sizeof(struct reg_default) * (map->patch_regs + num_regs),

		     sizeof(struct reg_sequence) * (map->patch_regs + num_regs),

		     GFP_KERNEL);

	if (p) {

		memcpy(p + map->patch_regs, regs, num_regs * sizeof(*regs));

drivers/gpu/drm/i2c/adv7511.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct adv7511 *encoder_to_adv7511(struct drm_encoder *encoder) 
}



/* ADI recommended values for proper operation. */

static const struct reg_default adv7511_fixed_registers[] = {

static const struct reg_sequence adv7511_fixed_registers[] = {

	{ 0x98, 0x03 },

	{ 0x9a, 0xe0 },

	{ 0x9c, 0x30 },