Commit Graph
100 Commits
Author SHA1 Message Date
Mark Brown 8c4d2a0bfb Merge branch 'asoc-5.5' into asoc-next 2019-11-22 19:56:02 +00:00
Mark Brown 3701d2cb87 Merge branch 'asoc-5.4' into asoc-linus 2019-11-22 19:55:59 +00:00
Mark Brown 302ee055af ASoC: SOF: Intel: Fix build break
Commit 130d3e9077 (Fix CFL and CML FW nocodec binary names.) broke the
build in some configurations as it depends on changes in the development
branch, revert it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-11-18 15:55:29 +00:00
Mark Brown 992fd39a34 Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.5 2019-11-06 16:29:34 +00:00
Mark Brown 962399bb7f ata: libahci_platform: Fix regulator_get_optional() misuse
This driver is using regulator_get_optional() to handle all the supplies
that it handles, and only ever enables and disables all supplies en masse
without ever doing any other configuration of the device to handle missing
power. These are clear signs that the API is being misused - it should only
be used for supplies that may be physically absent from the system and in
these cases the hardware usually needs different configuration if the
supply is missing. Instead use normal regualtor_get(), if the supply is
not described in DT then the framework will substitute a dummy regulator in
so no special handling is needed by the consumer driver.

In the case of the PHY regulator the handling in the driver is a hack to
deal with integrated PHYs; the supplies are only optional in the sense
that that there's some confusion in the code about where they're bound to.
From a code point of view they function exactly as normal supplies so can
be treated as such. It'd probably be better to model this by instantiating
a PHY object for integrated PHYs.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2019-10-25 14:22:20 -06:00
Mark Brown 25317997cb Merge branch 'asoc-5.4' into asoc-5.5 2019-10-02 12:50:40 +01:00
Mark Brown edfa07504c drm/panfrost: Fix regulator_get_optional() misuse
The panfrost driver requests a supply using regulator_get_optional()
but both the name of the supply and the usage pattern suggest that it is
being used for the main power for the device and is not at all optional
for the device for function, there is no meaningful handling for absent
supplies.  Such regulators should use the vanilla regulator_get()
interface, it will ensure that even if a supply is not described in the
system integration one will be provided in software.

Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190904123032.23263-1-broonie@kernel.org
2019-09-19 11:45:44 -05:00
Mark Brown b769c5ba8a Merge branch 'spi-5.4' into spi-next 2019-09-15 10:32:06 +01:00
Mark Brown 262a2f3345 Merge branch 'spi-5.3' into spi-linus 2019-09-15 10:32:04 +01:00
Mark Brown a54f848572 Merge branch 'asoc-5.4' into asoc-next 2019-09-15 10:31:44 +01:00
Mark Brown 7e0d8442e4 Merge branch 'asoc-5.3' into asoc-linus 2019-09-15 10:31:42 +01:00
Mark Brown c4ad85026d Merge branch 'regulator-5.4' into regulator-next 2019-09-11 16:00:19 +01:00
Mark Brown d440c4efe4 Merge branch 'regulator-5.3' into regulator-linus 2019-09-11 16:00:17 +01:00
Mark Brown bb83178611 Merge branch 'asoc-5.4' into asoc-next 2019-09-09 14:55:20 +01:00
Mark Brown 6652ddbb5d Merge branch 'asoc-5.3' into asoc-linus 2019-09-09 14:55:18 +01:00
Mark Brown 7933147e81 Merge branch 'regulator-5.3' into regulator-5.4 2019-09-09 10:56:10 +01:00
Mark Brown 55576cf185 regulator: Defer init completion for a while after late_initcall
The kernel has no way of knowing when we have finished instantiating
drivers, between deferred probe and systems that build key drivers as
modules we might be doing this long after userspace has booted. This has
always been a bit of an issue with regulator_init_complete since it can
power off hardware that's not had it's driver loaded which can result in
user visible effects, the main case is powering off displays. Practically
speaking it's not been an issue in real systems since most systems that
use the regulator API are embedded and build in key drivers anyway but
with Arm laptops coming on the market it's becoming more of an issue so
let's do something about it.

In the absence of any better idea just defer the powering off for 30s
after late_initcall(), this is obviously a hack but it should mask the
issue for now and it's no more arbitrary than late_initcall() itself.
Ideally we'd have some heuristics to detect if we're on an affected
system and tune or skip the delay appropriately, and there may be some
need for a command line option to be added.

Link: https://lore.kernel.org/r/20190904124250.25844-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Tested-by: Lee Jones <lee.jones@linaro.org>
Cc: stable@vger.kernel.org
2019-09-04 13:50:21 +01:00
Mark Brown baedad4c35 MAINTAINERS: Add keyword pattern on regulator_get_optional()
In an effort to try to contain abuses of regulator_get_optional() add a
keyword entry to the MAINTAINERS stanza for the regulator API so that the
regulator maintainers get CCed on new usages.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20190829125435.48770-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-08-30 12:40:06 +01:00
Mark Brown 50bc5731f7 regulator: mt6358: Add BROKEN dependency while waiting for MFD to merge
The mt6358 driver was merged in error, it depends on an existing MFD
rather than a newly added one and needs updates to that driver.  Disable
the build until those are merged.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-08-30 12:29:22 +01:00
Mark Brown 795227660d Merge branch 'spi-5.3' into spi-5.4 2019-08-23 12:00:22 +01:00
Mark Brown cdfca82157 merge_config.sh: Check error codes from make
When we execute make after merging the configurations we ignore any
errors it produces causing whatever is running merge_config.sh to be
unaware of any failures.  This issue was noticed by Guillaume Tucker
while looking at problems with testing of clang only builds in KernelCI
which caused Kbuild to be unable to find a working host compiler.

This implementation was suggested by Yamada-san.

Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-08-22 01:14:11 +09:00
Mark Brown dd28d54c24 Merge branch 'asoc-5.3' into asoc-5.4 2019-08-20 18:28:43 +01:00
Mark Brown 38d1666760 arm64: Clarify when cpu_enable() is called
Strengthen the wording in the documentation for cpu_enable() to make it
more obvious to readers not already familiar with the code when the core
will call this callback and that this is intentional.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
[will: minor tweak to emphasis in the comment]
Signed-off-by: Will Deacon <will@kernel.org>
2019-08-14 17:12:53 +01:00
Mark Brown 1bd4584626 Merge branch 'regmap-5.4' into regmap-next 2019-08-12 14:10:42 +01:00
Mark Brown 0161b87164 Merge branch 'regmap-5.3' into regmap-linus 2019-08-12 14:10:40 +01:00
Mark Brown 4604da661f Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 2019-08-09 12:37:12 +01:00
Mark Brown c2f16a94a8 Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 2019-08-08 23:20:45 +01:00
Mark Brown f6326fa485 ASoC: sof: Fix warning when IPC flood test is not enabled
dentry is only used when the flood test is done so move the declaration
of the variable inside the ifdef for the flood test.

Signed-off-by: Mark Brown <broonie@kernel.org>
2019-08-08 23:15:54 +01:00
Mark Brown e1b141552b Merge branch 'topic/hda-dmic' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 2019-08-08 23:10:35 +01:00
Mark Brown 7c0767643f ASoC: max98373: Remove executable bits
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-08-06 11:15:06 +01:00
Mark Brown 2f8f180b3c arm64: Remove unused cpucap_multi_entry_cap_cpu_enable()
The function cpucap_multi_entry_cap_cpu_enable() is unused, remove it to
avoid any confusion reading the code and potential for bit rot.

Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
2019-08-05 11:06:34 +01:00
Mark Brown 3b46a67af2 Merge branch 'asoc-5.3' into asoc-5.4 2019-07-26 13:10:09 +01:00
Mark Brown 27988c9668 Merge tag 'v5.3-rc1' into regulator-5.3
Linus 5.3-rc1
2019-07-24 17:00:06 +01:00
Mark Brown a98429acad Merge remote-tracking branch 'asoc/topic/meson' into asoc-next 2019-07-06 12:25:28 +01:00
Mark Brown 043b35f281 Merge branch 'asoc-5.3' into asoc-next 2019-07-06 12:25:26 +01:00
Mark Brown 0dceaf7c79 Merge branch 'asoc-5.2' into asoc-linus 2019-07-06 12:25:24 +01:00
Mark Brown 26ac56506b Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next 2019-07-04 17:35:11 +01:00
Mark Brown 106dbe24d4 Merge branch 'spi-5.3' into spi-next 2019-07-04 17:35:07 +01:00
Mark Brown 2337ff4529 Merge branch 'spi-5.2' into spi-linus 2019-07-04 17:35:03 +01:00
Mark Brown 0ed4513c9a Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next 2019-07-04 17:34:34 +01:00
Mark Brown 65244e5b1f Merge branch 'regulator-5.3' into regulator-next 2019-07-04 17:34:32 +01:00
Mark Brown f0386617dc Merge branch 'regulator-5.2' into regulator-linus 2019-07-04 17:34:30 +01:00
Mark Brown aaccf3863c Merge branch 'regmap-5.3' into regmap-next 2019-07-04 17:33:59 +01:00
Mark Brown ea09b3e21f Merge branch 'regmap-5.2' into regmap-linus 2019-07-04 17:33:56 +01:00
Mark Brown 53c8b29abe Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
2019-06-26 12:39:34 +01:00
Mark Brown ca9503fc9e arm64: Expose FRINT capabilities to userspace
ARMv8.5 introduces the FRINT series of instructions for rounding floating
point numbers to integers. Provide a capability to userspace in order to
allow applications to determine if the system supports these instructions.

Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-06-25 14:24:00 +01:00
Mark Brown 1201937491 arm64: Expose ARMv8.5 CondM capability to userspace
ARMv8.5 adds new instructions XAFLAG and AXFLAG to translate the
representation of the results of floating point comparisons between the
native ARM format and an alternative format used by some software. Add
a hwcap allowing userspace to determine if they are present, since we
referred to earlier CondM extensions as FLAGM call these extensions
FLAGM2.

Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-06-25 14:21:41 +01:00
Mark Brown ceaea851b9 ASoC: dapm: Adapt for debugfs API change
Back in ff9fb72bc0 (debugfs: return error values, not NULL) the
debugfs APIs were changed to return error pointers rather than NULL
pointers on error, breaking the error checking in ASoC. Update the
code to use IS_ERR() and log the codes that are returned as part of
the error messages.

Fixes: ff9fb72bc0 (debugfs: return error values, not NULL)
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-06-24 17:18:51 +01:00
Mark Brown c2c928c931 ASoC: core: Adapt for debugfs API change
Back in ff9fb72bc0 (debugfs: return error values, not NULL) the
debugfs APIs were changed to return error pointers rather than NULL
pointers on error, breaking the error checking in ASoC. Update the
code to use IS_ERR() and log the codes that are returned as part of
the error messages.

Fixes: ff9fb72bc0 (debugfs: return error values, not NULL)
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-06-24 17:18:31 +01:00
Mark Brown f2c6203fdd regulator: core: Make entire header comment C++ style
Makes things look more consistent.

Signed-off-by: Mark Brown <broonie@kernel.org>
2019-06-18 19:13:05 +01:00
Mark Brown e1d700f7c9 Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
2019-06-18 19:12:47 +01:00
Mark Brown 4343f61103 Merge tag 'v5.2-rc4' into spi-5.3
Linux 5.2-rc4
2019-06-10 18:52:53 +01:00
Mark Brown a8e992342c Merge branch 'asoc-5.2' into asoc-5.3 2019-06-06 22:44:24 +01:00
Mark Brown a529819d88 Merge branch 'asoc-5.2' into asoc-5.3 2019-06-03 18:38:15 +01:00
Mark Brown 79b3b7c4a3 Merge branch 'asoc-5.2' into asoc-5.3 2019-05-30 16:47:43 +01:00
Mark Brown d9424d6d48 Merge branch 'spi-5.2' into spi-5.3 2019-05-23 14:47:04 +01:00
Mark Brown a41016e403 Merge branch 'for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.3 2019-05-21 22:00:33 +01:00
Mark Brown eceb995e04 Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
2019-05-20 11:54:21 +01:00
Mark Brown 96d82e9d0d Merge tag 'v5.2-rc1' into regulator-5.3
Linux 5.2-rc1
2019-05-20 11:54:11 +01:00
Mark Brown 1c7c3237c0 Merge tag 'v5.2-rc1' into asoc-5.3
Linux 5.2-rc1
2019-05-20 11:53:50 +01:00
Mark Brown e727d4cbc7 Merge tag 'spi-bpw-is-supported' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.3
spi: Add spi_is_bpw_supported()

Lets client drivers check and potentially handle issues.
2019-05-12 12:08:03 +09:00
Mark Brown 0ed56252c9 spi: Fix Raspberry Pi breakage
This reverts commit c9ba7a16d0 (Release spi_res after finalizing
message) which causes races during cleanup.

Reported-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-05-09 11:27:17 +09:00
Mark Brown e2a23affe6 Merge branch 'regulator-5.2' into regulator-next 2019-05-06 22:52:14 +09:00
Mark Brown c7b5128f72 Merge branch 'regulator-5.1' into regulator-linus 2019-05-06 22:52:12 +09:00
Mark Brown 378d590c49 Merge branch 'asoc-5.2' into asoc-next 2019-05-06 22:51:54 +09:00
Mark Brown 7f5a466f2e Merge branch 'asoc-5.1' into asoc-linus 2019-05-06 22:51:52 +09:00
Mark Brown 2e5f081003 Merge branch 'spi-5.2' into spi-next 2019-05-02 11:20:29 +09:00
Mark Brown 58b860ed4a Merge branch 'spi-5.1' into spi-linus 2019-05-02 11:20:26 +09:00
Mark Brown 164a263bf8 ASoC: Intel: Make boards more available for compile test
The Intel boards have very strict dependencies which make them less
available for compile test than is desirable, with requirements for
specific drivers that are only needed at runtime but not at build time.
Relax this a bit if COMPILE_TEST is enabled to improve build coverage
for these drivers.

Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-05-02 10:46:09 +09:00
Mark Brown 93f38ef6a4 Merge branch 'asoc-5.1' into asoc-5.2 2019-04-26 11:02:03 +01:00
Mark Brown 615c4d9a50 Merge branch 'regmap-5.2' into regmap-next 2019-04-25 20:27:04 +01:00
Mark Brown 7fdc9fc874 Merge branch 'regmap-5.1' into regmap-linus 2019-04-25 20:27:00 +01:00
Mark Brown e1a7d16730 Merge branch 'spi-5.1' into spi-5.2 2019-04-05 10:19:10 +07:00
Mark Brown 072cb68a43 Merge branch 'asoc-5.1' into asoc-5.2 2019-04-04 15:07:34 +07:00
Mark Brown 0f9e47b3fd ASoC: sprd: Fix modular build
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-04-03 12:49:00 +07:00
Mark Brown 6d5e2bf9d2 Merge branch 'acpi-utils' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-5.2 2019-04-02 16:20:47 +07:00
Mark Brown 64f01d2b5c ASoC: tlv320aic32x4: Only enable with common clock
Some architectures do not yet support the common clock API at all but
the tlv320aic32x4 driver now requires it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-26 13:18:23 +00:00
Mark Brown 249acb5f47 Merge tag 'v5.1-rc1' into spi-5.2
Linux 5.1-rc1
2019-03-19 13:12:32 +00:00
Mark Brown c9e48084c8 Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
2019-03-19 13:12:18 +00:00
Mark Brown c77526851d Merge branch 'asoc-5.1' into asoc-5.2 for wmadsp 2019-03-19 12:37:11 +00:00
Mark Brown a48f127519 regulator: core: Fix application of "drop lockdep annotation in drms_uA_update()"
[The original commit was sent against -next but needed to be sent as a
bugfix, however -next had some additional changes which needed to be
reverted.  Now everything is all in one branch applying the rest of the
changes to fix up the merge issue -- broonie]

commit e5e21f70bf ("regulator: core: Take lock before applying system
load") took the regulator lock before calling drms_uA_update() in order
to silence a lockdep warning during regulator_register().

However, we are not supposed to need locks at this point as the regulator
is in the process of being registered, so there should be no possibility
of concurrent access.

Instead, remove the unnecessary locking and simply drop the lockdep
annotation, since it is no longer valid.

Fixes: e5e21f70bf ("regulator: core: Take lock before applying system load")
Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-18 15:01:37 +00:00
Mark Brown 3863293a96 Merge branch 'for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.2 2019-03-18 14:57:27 +00:00
Mark Brown 127470597b Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
2019-03-18 11:15:09 +00:00
Mark Brown 22d91ed32b Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
2019-03-18 11:14:51 +00:00
Mark Brown 3949ba3b37 Merge branch 'spi-5.1' into spi-5.2 for stm32 2019-03-15 17:06:34 +00:00
Mark Brown 14dbfb417b Merge branch 'spi-5.1' into spi-next 2019-03-04 15:32:51 +00:00
Mark Brown b50c6ac8b6 Merge branch 'spi-5.0' into spi-linus 2019-03-04 15:32:49 +00:00
Mark Brown 88f268a5bc Merge branch 'regulator-5.1' into regulator-next 2019-03-04 15:32:43 +00:00
Mark Brown c364098fe8 Merge branch 'regulator-5.0' into regulator-linus 2019-03-04 15:32:41 +00:00
Mark Brown ba54f278c3 Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 2019-03-04 00:10:29 +00:00
Mark Brown 1aad9f2f79 Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-5.1 2019-03-03 23:49:46 +00:00
Mark Brown 3146089d23 Merge branch 'asoc-5.1' into asoc-next 2019-02-26 16:22:47 +00:00
Mark Brown b5e806ae4a Merge branch 'asoc-5.0' into asoc-linus 2019-02-26 16:22:45 +00:00
Mark Brown ae3f563a85 Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 2019-02-26 12:18:11 +00:00
Mark Brown bf9f742c38 Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.1 2019-02-20 17:58:18 +00:00
Mark Brown 19febab6da Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 2019-02-19 15:52:41 +00:00
Mark Brown 16646d8d3d Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range 2019-02-19 11:06:41 +00:00
Mark Brown 9516e531fa Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 for refcount fix 2019-02-18 18:51:48 +00:00
Mark Brown 3636887ac6 Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 2019-02-13 11:45:08 +00:00
Mark Brown e29fe437ea Merge branch 'asoc-5.0' into asoc-5.1 for dapm table 2019-02-06 17:31:39 +00:00