Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx',... (a5a3717a) · Commits · 戴 / test

drivers/spi/spi-ep93xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi)
		txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV);
		if (IS_ERR(txd)) {
		ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);
		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));
		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(txd));
		msg->status = PTR_ERR(txd);
		return;
		}

+1 −0

+3 −0

Original line number	Diff line number	Diff line
		@@ -560,6 +560,7 @@ static const struct regmap_config ak4642_regmap = {
		.max_register = FIL1_3,
		.reg_defaults = ak4642_reg,
		.num_reg_defaults = NUM_AK4642_REG_DEFAULTS,
		.cache_type = REGCACHE_RBTREE,
		};

		static const struct regmap_config ak4643_regmap = {
		@@ -568,6 +569,7 @@ static const struct regmap_config ak4643_regmap = {
		.max_register = SPK_MS,
		.reg_defaults = ak4643_reg,
		.num_reg_defaults = ARRAY_SIZE(ak4643_reg),
		.cache_type = REGCACHE_RBTREE,
		};

		static const struct regmap_config ak4648_regmap = {
		@@ -576,6 +578,7 @@ static const struct regmap_config ak4648_regmap = {
		.max_register = EQ_FBEQE,
		.reg_defaults = ak4648_reg,
		.num_reg_defaults = ARRAY_SIZE(ak4648_reg),
		.cache_type = REGCACHE_RBTREE,
		};

		static const struct ak4642_drvdata ak4642_drvdata = {

+0 −1

Original line number	Diff line number	Diff line
		@@ -1718,7 +1718,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
		struct hdac_ext_device *edev = to_hda_ext_device(dev);
		struct hdac_device *hdac = &edev->hdac;
		struct hdac_bus *bus = hdac->bus;
		unsigned long timeout;
		struct hdac_ext_bus *ebus = hbus_to_ebus(bus);
		struct hdac_ext_link *hlink = NULL;
		int err;

+2 −2

Original line number	Diff line number	Diff line
		@@ -983,9 +983,9 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
		if (mute) {
		/* Power down drivers and DACs */
		hflctl &= ~(TWL6040_HFDACENA \| TWL6040_HFPGAENA \|
		TWL6040_HFDRVENA);
		TWL6040_HFDRVENA \| TWL6040_HFSWENA);
		hfrctl &= ~(TWL6040_HFDACENA \| TWL6040_HFPGAENA \|
		TWL6040_HFDRVENA);
		TWL6040_HFDRVENA \| TWL6040_HFSWENA);
		}

		twl6040_reg_write(twl6040, TWL6040_REG_HFLCTL, hflctl);