Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.

Signed-off-by: Maarten Lankhorst <maarten.la

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

show more ...

Merge drm/drm-next into drm-intel-next-queued

Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").

Signed-off-by: Jani Nikula <jani.nikula@inte

Merge drm/drm-next into drm-intel-next-queued

Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

show more ...

Merge series "ASoC: merge snd_soc_component_read() and snd_soc_component_read32()" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

Because we can use "read" function which is usi

Merge series "ASoC: merge snd_soc_component_read() and snd_soc_component_read32()" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

Because we can use "read" function which is using
"regmap" or "driver", current ALSA SoC drivers are using both
snd_soc_component_read() // for regmap
snd_soc_component_read32() // for driver callback
These are similar but needs different parameter.

This patch aggressively merge snd_soc_component_read() and _read32(),
and makes snd_soc_component_read/write() as generally style.

New read doesn't return error if it failed,
thus, it can't keep compatibility,
but assuming it is not a big problem.
Because 1) it will indicate error message,
2) it can do nothing anyway if it fails "read".

[02/16] patch is not directly connected to read function merging,
but need to be apply after [01/16].

Kuninori Morimoto (16):
ASoC: soc-component: merge snd_soc_component_read() and snd_soc_component_read32()
ASoC: soc-component: use io_mutex correctly
ASoC: pxa: rename to snd_soc_component_read()
ASoC: atmel: rename to snd_soc_component_read()
ASoC: codecs: rename to snd_soc_component_read()
ASoC: codecs: wcd*: rename to snd_soc_component_read()
ASoC: codecs: tlv*: rename to snd_soc_component_read()
ASoC: codecs: max*: rename to snd_soc_component_read()
ASoC: codecs: msm*: rename to snd_soc_component_read()
ASoC: codecs: alc*: rename to snd_soc_component_read()
ASoC: codecs: wm*: rename to snd_soc_component_read()
ASoC: codecs: rt*: rename to snd_soc_component_read()
ASoC: codecs: da*: rename to snd_soc_component_read()
ASoC: codecs: cs*: rename to snd_soc_component_read()
ASoC: codecs: ak*: rename to snd_soc_component_read()
ASoC: remove snd_soc_component_read32()

include/sound/soc-component.h | 4 +-
sound/soc/atmel/atmel-pdmic.c | 4 +-
sound/soc/codecs/88pm860x-codec.c | 14 ++---
sound/soc/codecs/ab8500-codec.c | 8 +--
sound/soc/codecs/ad1980.c | 4 +-
sound/soc/codecs/ak4458.c | 2 +-
sound/soc/codecs/ak4535.c | 4 +-
sound/soc/codecs/ak4613.c | 4 +-
sound/soc/codecs/ak4671.c | 8 +--
sound/soc/codecs/alc5623.c | 6 +-
sound/soc/codecs/alc5632.c | 6 +-
sound/soc/codecs/arizona.c | 18 +++---
sound/soc/codecs/cs4270.c | 10 +--
sound/soc/codecs/cs42l42.c | 2 +-
sound/soc/codecs/cs42l51.c | 8 +--
sound/soc/codecs/cs42l73.c | 4 +-
sound/soc/codecs/cs47l35.c | 10 +--
sound/soc/codecs/cs47l85.c | 10 +--
sound/soc/codecs/da7210.c | 24 ++++----
sound/soc/codecs/da7213.c | 24 ++++----
sound/soc/codecs/da7218.c | 34 +++++------
sound/soc/codecs/da7219-aad.c | 16 ++---
sound/soc/codecs/da7219.c | 20 +++---
sound/soc/codecs/da732x.c | 18 +++---
sound/soc/codecs/da9055.c | 14 ++---
sound/soc/codecs/inno_rk3036.c | 6 +-
sound/soc/codecs/madera.c | 49 +++------------
sound/soc/codecs/max98088.c | 12 ++--
sound/soc/codecs/max98090.c | 20 +++---
sound/soc/codecs/max98095.c | 16 ++---
sound/soc/codecs/max9850.c | 2 +-
sound/soc/codecs/msm8916-wcd-analog.c | 14 ++---
sound/soc/codecs/msm8916-wcd-digital.c | 16 ++---
sound/soc/codecs/nau8822.c | 6 +-
sound/soc/codecs/rt1305.c | 2 +-
sound/soc/codecs/rt298.c | 2 +-
sound/soc/codecs/rt5616.c | 2 +-
sound/soc/codecs/rt5631.c | 32 +++++-----
sound/soc/codecs/rt5640.c | 10 +--
sound/soc/codecs/rt5645.c | 16 ++---
sound/soc/codecs/rt5651.c | 6 +-
sound/soc/codecs/rt5659.c | 14 ++---
sound/soc/codecs/rt5660.c | 2 +-
sound/soc/codecs/rt5663.c | 34 +++++------
sound/soc/codecs/rt5665.c | 16 ++---
sound/soc/codecs/rt5668.c | 16 ++---
sound/soc/codecs/rt5670.c | 18 +++---
sound/soc/codecs/rt5682-i2c.c | 2 +-
sound/soc/codecs/rt5682.c | 19 +++---
sound/soc/codecs/sgtl5000.c | 16 ++---
sound/soc/codecs/sta32x.c | 4 +-
sound/soc/codecs/tas2552.c | 4 +-
sound/soc/codecs/tas5720.c | 4 +-
sound/soc/codecs/tda7419.c | 9 +--
sound/soc/codecs/tlv320aic23.c | 14 ++---
sound/soc/codecs/tlv320aic26.c | 4 +-
sound/soc/codecs/tlv320aic32x4.c | 16 ++---
sound/soc/codecs/tlv320aic3x.c | 14 ++---
sound/soc/codecs/tscs42xx.c | 4 +-
sound/soc/codecs/tscs454.c | 24 ++------
sound/soc/codecs/wcd-clsh-v2.c | 2 +-
sound/soc/codecs/wcd9335.c | 48 +++++++--------
sound/soc/codecs/wcd934x.c | 52 ++++++++--------
sound/soc/codecs/wm2200.c | 4 +-
sound/soc/codecs/wm5100.c | 18 +++---
sound/soc/codecs/wm5110.c | 6 +-
sound/soc/codecs/wm8350.c | 32 +++++-----
sound/soc/codecs/wm8400.c | 50 +++++++--------
sound/soc/codecs/wm8510.c | 28 ++++-----
sound/soc/codecs/wm8523.c | 6 +-
sound/soc/codecs/wm8580.c | 12 ++--
sound/soc/codecs/wm8711.c | 8 +--
sound/soc/codecs/wm8728.c | 10 +--
sound/soc/codecs/wm8731.c | 6 +-
sound/soc/codecs/wm8750.c | 8 +--
sound/soc/codecs/wm8753.c | 42 ++++++-------
sound/soc/codecs/wm8770.c | 2 +-
sound/soc/codecs/wm8776.c | 2 +-
sound/soc/codecs/wm8804.c | 2 +-
sound/soc/codecs/wm8900.c | 22 +++----
sound/soc/codecs/wm8903.c | 20 +++---
sound/soc/codecs/wm8904.c | 16 ++---
sound/soc/codecs/wm8940.c | 32 +++++-----
sound/soc/codecs/wm8955.c | 2 +-
sound/soc/codecs/wm8958-dsp2.c | 18 +++---
sound/soc/codecs/wm8960.c | 20 +++---
sound/soc/codecs/wm8961.c | 58 +++++++++---------
sound/soc/codecs/wm8962.c | 31 +++++-----
sound/soc/codecs/wm8971.c | 8 +--
sound/soc/codecs/wm8974.c | 24 ++++----
sound/soc/codecs/wm8978.c | 12 ++--
sound/soc/codecs/wm8983.c | 8 +--
sound/soc/codecs/wm8985.c | 8 +--
sound/soc/codecs/wm8988.c | 12 ++--
sound/soc/codecs/wm8990.c | 18 +++---
sound/soc/codecs/wm8991.c | 38 ++++++------
sound/soc/codecs/wm8993.c | 28 ++++-----
sound/soc/codecs/wm8994.c | 60 +++++++++---------
sound/soc/codecs/wm8995.c | 16 ++---
sound/soc/codecs/wm8996.c | 30 ++++-----
sound/soc/codecs/wm8998.c | 8 +--
sound/soc/codecs/wm9081.c | 36 +++++------
sound/soc/codecs/wm9090.c | 4 +-
sound/soc/codecs/wm9713.c | 2 +-
sound/soc/codecs/wm_hubs.c | 30 ++++-----
sound/soc/fsl/fsl_audmix.c | 10 +--
sound/soc/fsl/fsl_easrc.c | 5 +-
sound/soc/meson/aiu-encoder-i2s.c | 3 +-
sound/soc/meson/aiu-fifo-i2s.c | 3 +-
sound/soc/meson/aiu-fifo.c | 3 +-
sound/soc/pxa/mioa701_wm9713.c | 8 +--
sound/soc/soc-ac97.c | 7 +--
sound/soc/soc-component.c | 84 ++++++++++++++------------
sound/soc/soc-dapm.c | 31 ++++------
sound/soc/soc-ops.c | 43 +++----------
115 files changed, 854 insertions(+), 963 deletions(-)

--
2.25.1

show more ...

ASoC: codecs: rename to snd_soc_component_read()

We need to use snd_soc_component_read()
instead of snd_soc_component_read32()

This patch renames _read32() to _read()

Signed-off-by: Kuninori M

ASoC: codecs: rename to snd_soc_component_read()

We need to use snd_soc_component_read()
instead of snd_soc_component_read32()

This patch renames _read32() to _read()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87mu534me5.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

show more ...

Merge tag 'v5.8-rc1' into regulator-5.8

Linux 5.8-rc1

Merge tag 'v5.8-rc1' into fixes

Linux 5.8-rc1

Merge v5.8-rc1 into drm-misc-fixes

Beginning a new release cycles for what will become v5.8. Updating
drm-misc-fixes accordingly.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge branch 'dt/schema-cleanups' into dt/linus

Merge branch 'x86/entry' into ras/core

to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.

Merge tag 'sound-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
"It was another busy development cycle, and the majority of changes are

Merge tag 'sound-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
"It was another busy development cycle, and the majority of changes are
found in ASoC side. Below are Some highlights.

ASoC core:
- Lots of core cleanups and refactorings, still on-going work by
Morimoto-san

ASoC drivers:
- Continued work on cleaning up and improving the Intel SOF stuff,
along with new platform support including SoundWire

- Fixes to make the Marvell SSPA driver work upstream

- Support for AMD Renoir ACP, Dialog DA7212, Freescale EASRC and
i.MX8M, Intel Elkhard Lake, Maxim MAX98390, Nuvoton NAU8812 and
NAU8814 and Realtek RT1016.

USB-audio:
- Improvement for sync and implicit feedback streams with the more
accurate frame size calculation and full-duplex support

- Support for RME Babyface Pro and Prioneer DJ DJM

HD-audio:
- Fixes for Mic mute LED on HP machines

- Re-enable support of Intel SST driver for SKL/KBL platforms

FireWire:
- Lots of refactoring, add support for RME FireFace and MOTU
UltraLite-mk3"

* tag 'sound-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (428 commits)
ALSA: es1688: Add the missed snd_card_free()
ALSA: hda: add sienna_cichlid audio asic id for sienna_cichlid up
ALSA: usb-audio: Add Pioneer DJ DJM-900NXS2 support
ASoC: qcom: q6asm-dai: kCFI fix
ASoC: soc-card: add snd_soc_card_remove_dai_link()
ASoC: soc-card: add snd_soc_card_add_dai_link()
ASoC: soc-card: add snd_soc_card_set_bias_level_post()
ASoC: soc-card: add snd_soc_card_set_bias_level()
ASoC: soc-card: add snd_soc_card_remove()
ASoC: soc-card: add snd_soc_card_late_probe()
ASoC: soc-card: add snd_soc_card_probe()
ASoC: soc-card: add probed bit field to snd_soc_card
ASoC: soc-card: add snd_soc_card_resume_post()
ASoC: soc-card: add snd_soc_card_resume_pre()
ASoC: soc-card: add snd_soc_card_suspend_post()
ASoC: soc-card: add snd_soc_card_suspend_pre()
ASoC: soc-card: move snd_soc_card_subclass to soc-card
ASoC: soc-card: move snd_soc_card_get_codec_dai() to soc-card
ASoC: soc-card: move snd_soc_card_set/get_drvdata() to soc-card
ASoC: soc-card: move snd_soc_card_jack_new() to soc-card
...

show more ...

Merge tag 'asoc-v5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.8

This has been another very active release with a bunch of new drivers,
l

Merge tag 'asoc-v5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.8

This has been another very active release with a bunch of new drivers,
lots of fixes everywhere and continued core improvements from
Morimoto-san:

- Lots of core cleanups and refactorings from Morimoto-san, factoring
out common operations and making the card abstraction more solid.
- Continued work on cleaning up and improving the Intel drivers, along
with some new platform support for them.
- Fixes to make the Marvell SSPA driver work upstream.
- Support for AMD Renoir ACP, Dialog DA7212, Freescale EASRC and
i.MX8M, Intel Elkhard Lake, Maxim MAX98390, Nuvoton NAU8812 and
NAU8814 and Realtek RT1016.

show more ...

Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus

ASoC: sta32x: add missed function calls in error paths

sta32x_probe() forgets to call undo functions when it fails, add
the missed function calls to fix it.

Signed-off-by: Chuhong Yuan <hslester96@

ASoC: sta32x: add missed function calls in error paths

sta32x_probe() forgets to call undo functions when it fails, add
the missed function calls to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20200528102004.911653-1-hslester96@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

show more ...

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in fixes for the XIVE interrupt controller which touch both
generic powerpc and PPC KVM code. To avoid mer

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in fixes for the XIVE interrupt controller which touch both
generic powerpc and PPC KVM code. To avoid merge conflicts, these
commits will go upstream via the powerpc tree as well as the KVM tree.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

show more ...

Merge branch 'ti-sysc-fixes' into fixes

Merge branch 'next' into for-linus

Prepare second round of input updates for 5.3 merge window.

Merge tag 'v5.2' into next

Sync up with mainline to resolve conflicts in iforce driver.

Merge tag 'kvm-arm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for 5.3

- Add support for chained PMU counters in guests
- Improve SError handli

Merge tag 'kvm-arm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for 5.3

- Add support for chained PMU counters in guests
- Improve SError handling
- Handle Neoverse N1 erratum #1349291
- Allow side-channel mitigation status to be migrated
- Standardise most AArch64 system register accesses to msr_s/mrs_s
- Fix host MPIDR corruption on 32bit

show more ...

Merge drm/drm-next into drm-intel-next-queued

Catch-up with 5.2. Specially to remove a drm-tip merge
fixup around intel_workarounds.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.3

This is a very big update, mainly thanks to Morimoto-san's refactoring
w

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.3

This is a very big update, mainly thanks to Morimoto-san's refactoring
work and some fairly large new drivers.

- Lots more work on moving towards a component based framework from
Morimoto-san.
- Support for force disconnecting muxes from Jerome Brunet.
- New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant
CX2072X, Realtek RT1011 and RT1308.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

show more ...

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

NAND core changes:
- use longest matching pattern in ->exec_op() default parser
- export NAND operat

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

NAND core changes:
- use longest matching pattern in ->exec_op() default parser
- export NAND operation tracer
- add flag to indicate panic_write in MTD
- use kzalloc() instead of kmalloc() and memset()

Raw NAND controller drivers changes:
- brcmnand:
* fix BCH ECC layout for large page NAND parts
* fallback to detected ecc-strength, ecc-step-size
* when oops in progress use pio and interrupt polling
* code refactor code to introduce helper functions
* add support for v7.3 controller
- FSMC:
* use nand_op_trace for operation tracing
- GPMI:
* move all driver code into single file
* various cleanups (including dmaengine changes)
* use runtime PM to manage clocks
* implement exec_op
- MTK:
* correct low level time calculation of r/w cycle
* improve data sampling timing for read cycle
* add validity check for CE# pin setting
* fix wrongly assigned OOB buffer pointer issue
* re-license MTK NAND driver as Dual MIT/GPL
- STM32:
* manage the get_irq error case
* increase DMA completion timeouts

Raw NAND chips drivers changes:
- Macronix: add read-retry support

Onenand driver changes:
- add support for 8Gb datasize chips
- avoid fall-through warnings

SPI-NAND changes:
- define macros for page-read ops with three-byte addresses
- add support for two-byte device IDs and then for GigaDevice
GD5F1GQ4UFxxG
- add initial support for Paragon PN26G0xA
- handle the case where the last page read has bitflips

show more ...

Merge tag 'v5.2-rc6' into rdma.git for-next

For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX c

Merge tag 'v5.2-rc6' into rdma.git for-next

For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

show more ...

Merge tag 'v5.2-rc6' into asoc-5.3

Linux 5.2-rc6

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Some fixes have been accidentally pushed to this, so I cannot fost-forward.
Required to pull in the remove-fbcon-notifiers fixes.

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Some fixes have been accidentally pushed to this, so I cannot fost-forward.
Required to pull in the remove-fbcon-notifiers fixes.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

show more ...