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

Unverified Commit 19febab6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.0' of... 

Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1
parents c6bebefa cc29ea00

Documentation/devicetree/bindings/sound/adi,adau1977.txt

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
                Documentation/devicetree/bindings/regulator/regulator.txt



Optional properties:

 - reset-gpio:  the reset pin for the chip, for more details consult

 - reset-gpios: the reset pin for the chip, for more details consult

                Documentation/devicetree/bindings/gpio/gpio.txt



 - DVDD-supply: supply voltage for the digital core, please consult
@@ -47,7 +47,7 @@ Examples: 
		DVDD-supply = <&regulator_digital>;



		adi,micbias = <3>;

		reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

	};



	adau1977_i2c: adau1977@11 {
@@ -57,5 +57,5 @@ Examples: 
		AVDD-supply = <&regulator>;

		DVDD-supply = <&regulator_digital>;



		reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

	};

sound/soc/fsl/fsl_esai.c

+4 −3
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		break;

	case SND_SOC_DAIFMT_RIGHT_J:

		/* Data on rising edge of bclk, frame high, right aligned */

		xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCR_xWA;

		xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP;

		xcr  |= ESAI_xCR_xWA;

		break;

	case SND_SOC_DAIFMT_DSP_A:

		/* Data on rising edge of bclk, frame high, 1clk before data */
@@ -455,12 +456,12 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		return -EINVAL;

	}



	mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR;

	mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR | ESAI_xCR_xWA;

	regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, xcr);

	regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, mask, xcr);



	mask = ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCCR_xFSP |

		ESAI_xCCR_xFSD | ESAI_xCCR_xCKD | ESAI_xCR_xWA;

		ESAI_xCCR_xFSD | ESAI_xCCR_xCKD;

	regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, mask, xccr);

	regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, mask, xccr);