Stephen Rothwell
7b44e0f876
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
2024-12-20 13:12:27 +11:00
Stephen Rothwell
dfc7a55ee6
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
2024-12-20 13:12:26 +11:00
Stephen Rothwell
6e16033768
Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
...
# Conflicts:
# drivers/mfd/cs42l43.c
2024-12-20 13:12:25 +11:00
Stephen Rothwell
d03fc22c60
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
2024-12-20 13:12:22 +11:00
Stephen Rothwell
dca381d2cc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
2024-12-20 12:23:25 +11:00
Stephen Rothwell
39772e3ec9
Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git
2024-12-20 12:14:06 +11:00
Stephen Rothwell
cecc27b364
Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git
2024-12-20 12:13:59 +11:00
Stephen Rothwell
6d7a3c76c5
Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
2024-12-20 12:13:56 +11:00
Stephen Rothwell
a682817489
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
2024-12-20 12:10:57 +11:00
Stephen Rothwell
25d313f34d
Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
2024-12-20 12:10:56 +11:00
Stephen Rothwell
a7acb58ac1
Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
2024-12-20 12:10:55 +11:00
Stephen Rothwell
06a622defc
Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
2024-12-20 12:10:53 +11:00
Stephen Rothwell
e58c8fbfaa
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git
2024-12-20 11:48:50 +11:00
Stephen Rothwell
350a5ae97e
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
2024-12-20 11:48:47 +11:00
Stephen Rothwell
0b744f9e35
Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
2024-12-20 11:48:38 +11:00
Stephen Rothwell
4f5e1cc179
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
2024-12-20 11:29:44 +11:00
Stephen Rothwell
baf1197b35
Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
2024-12-20 11:29:40 +11:00
Stephen Rothwell
1dae1421fa
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
2024-12-20 11:29:38 +11:00
Stephen Rothwell
7bb5219654
Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git
2024-12-20 11:07:40 +11:00
Stephen Rothwell
a4b7d49533
Merge branch 'docs-next' of git://git.lwn.net/linux.git
2024-12-20 11:07:39 +11:00
Stephen Rothwell
e24a64840a
Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
2024-12-20 11:07:37 +11:00
Stephen Rothwell
ecc935f512
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
2024-12-20 11:07:33 +11:00
Dimitri Fedrau
0a219d6fd7
dt-bindings: power: supply: gpio-charger: add support for default charge current limit
...
With DT properties charge-current-limit-gpios and
charge-current-limit-mapping one can define charge current limits in uA
using up to 32 GPIOs. Add property charge-current-limit-default-microamp
which selects a default charge current limit that must be listed in
charge-current-limit-mapping.
This is helpful when the smallest possible charge current limit is 0uA. The
driver defaults to the smallest possible value at the moment, which
disables charging on probe. With the default its possible to setup a safe
charge current limit.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Dimitri Fedrau <dimitri.fedrau@liebherr.com>
Link: https://lore.kernel.org/r/20241218-default-charge-current-limit-v3-1-b26118cf06b5@liebherr.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
2024-12-20 00:52:31 +01:00
Stephen Rothwell
07ccd1271c
Merge branch 'fs-next' of linux-next
2024-12-20 10:45:33 +11:00
Stephen Rothwell
27cf1ac224
Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
2024-12-20 10:41:35 +11:00
Stephen Rothwell
5a66cf2412
Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git
2024-12-20 10:41:29 +11:00
Stephen Rothwell
e1c6109e87
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
2024-12-20 10:41:26 +11:00
Stephen Rothwell
aaca9cb780
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git
2024-12-20 10:41:23 +11:00
Stephen Rothwell
1c96fc4c1d
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
2024-12-20 10:41:22 +11:00
Stephen Rothwell
c35d387b30
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git
2024-12-20 10:41:21 +11:00
Stephen Rothwell
a03c7cb185
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
2024-12-20 10:41:19 +11:00
Stephen Rothwell
54d4f3b6e6
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
2024-12-20 10:41:18 +11:00
Stephen Rothwell
5d0a136628
Merge branch 'next' of https://github.com/Broadcom/stblinux.git
2024-12-20 10:41:16 +11:00
Stephen Rothwell
c354952b89
Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
2024-12-20 10:41:15 +11:00
Stephen Rothwell
c60eaf2f23
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
2024-12-20 10:41:14 +11:00
Stephen Rothwell
2086880948
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
2024-12-20 10:41:11 +11:00
Stephen Rothwell
311e20a8a3
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
2024-12-20 10:41:10 +11:00
Stephen Rothwell
cb272ea815
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git
2024-12-20 10:41:09 +11:00
Stephen Rothwell
7bdd902c16
Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
2024-12-20 10:41:08 +11:00
Stephen Rothwell
b86e29c311
Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-12-20 10:23:48 +11:00
Stephen Rothwell
29c9b8e299
Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git
2024-12-20 09:42:17 +11:00
Stephen Rothwell
d87e38f596
Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
2024-12-20 09:42:01 +11:00
Stephen Rothwell
3d7ad880d6
Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
2024-12-20 09:41:46 +11:00
Stephen Rothwell
bbbc571c9c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
2024-12-20 09:41:41 +11:00
Stephen Rothwell
cd07c43f9b
Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
2024-12-20 09:19:26 +11:00
Stephen Rothwell
d5d92a4e97
Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git
2024-12-20 09:19:10 +11:00
Jakub Kicinski
07e5c4eb94
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
...
Cross-merge networking fixes after downstream PR (net-6.13-rc4).
No conflicts.
Adjacent changes:
drivers/net/ethernet/renesas/rswitch.h
32fd46f5b6
("net: renesas: rswitch: remove speed from gwca structure")
922b4b955a
("net: renesas: rswitch: rework ts tags management")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-12-19 11:35:07 -08:00
Mark Brown
45f6111597
Merge remote-tracking branch 'asoc/for-6.14' into asoc-next
2024-12-19 18:54:16 +00:00
Bjorn Andersson
e43857dccf
Merge branches 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14', 'drivers-fixes-for-6.13' and 'drivers-for-6.14' into for-next
2024-12-19 12:45:19 -06:00
Anshuman Khandual
1e4a5e3679
docs: arm64: Document EL3 requirements for FEAT_PMUv3
...
This documents EL3 requirements for FEAT_PMUv3. The register field MDCR_EL3
.TPM needs to be cleared for accesses into PMU registers without any trap
being generated into EL3. PMUv3 registers like PMCCFILTR_EL0, PMCCNTR_EL0
PMCNTENCLR_EL0, PMCNTENSET_EL0, PMCR_EL0, PMEVCNTR<n>_EL0, PMEVTYPER<n>_EL0
etc are already being accessed for perf HW PMU implementation.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20241211065425.1106683-3-anshuman.khandual@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
2024-12-19 17:01:07 +00:00