Skip to content

Commit 21fd849

Browse files
author
Wolfram Sang
committed
Merge tag 'i2c-host-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow
i2c-host updates for v6.15 Refactoring and cleanups - octeon, cadence, i801, pasemi, mlxbf, bcm-iproc: general refactorings - octeon: remove 10-bit address support Improvements - amd-asf: improved error handling - designware: use guard(mutex) - amd-asf, designware: update naming to follow latest specs - cadence: fix cleanup path in probe - i801: use MMIO and I/O mapping helpers to access registers - pxa: handle error after clk_prepare_enable New features - added i2c_10bit_addr_*_from_msg() and updated multiple drivers - omap: added multiplexer state handling - qcom-geni: update frequency configuration - qup: introduce DMA usage policy New hardware support - exynos: add support for Samsung exynos7870 - k1: add support for spacemit k1 (new driver) - imx: add support for i.mx94 lpi2c - rk3x: add support for rk3562 Multiplexers - ltc4306, reg: fix assignment in platform_driver structure
2 parents 6b88dac + 39f8d63 commit 21fd849

File tree

1,326 files changed

+16239
-7832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,326 files changed

+16239
-7832
lines changed

.mailmap

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <[email protected]> <[email protected]>
8888
8989
9090
91-
9291
9392
9493
Archit Taneja <[email protected]>
@@ -226,6 +225,7 @@ Fangrui Song <[email protected]> <[email protected]>
226225
Felipe W Damasio <[email protected]>
227226
Felix Kuhling <[email protected]>
228227
Felix Moeller <[email protected]>
228+
229229
230230
Filipe Lautert <[email protected]>
231231
@@ -281,6 +281,7 @@ Henrik Rydberg <[email protected]>
281281
Herbert Xu <[email protected]>
282282
283283
284+
284285
285286
286287
Jacob Shin <[email protected]>
@@ -317,6 +318,8 @@ Jayachandran C <[email protected]> <[email protected]>
317318
Jean Tourrilhes <[email protected]>
318319
319320
Jeff Garzik <[email protected]>
321+
322+
320323
321324
322325
@@ -376,6 +379,7 @@ Juha Yrjola <[email protected]>
376379
377380
378381
382+
379383
380384
Karthikeyan Periyasamy <[email protected]> <[email protected]>
381385
@@ -518,6 +522,7 @@ Nadav Amit <[email protected]> <[email protected]>
518522
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
519523
520524
525+
521526
522527
523528
@@ -530,6 +535,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
530535
531536
532537
538+
533539
534540
535541
@@ -608,6 +614,8 @@ Richard Leitner <[email protected]> <[email protected]>
608614
609615
610616
617+
618+
611619
612620
613621
@@ -684,6 +692,7 @@ Subbaraman Narayanamurthy <[email protected]> <[email protected]>
684692
Subhash Jadavani <[email protected]>
685693
Sudarshan Rajagopalan <[email protected]> <[email protected]>
686694
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
695+
687696
Sumit Semwal <[email protected]>
688697
689698

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Configuring the kernel
176176
values without prompting.
177177

178178
"make defconfig" Create a ./.config file by using the default
179-
symbol values from either arch/$ARCH/defconfig
179+
symbol values from either arch/$ARCH/configs/defconfig
180180
or arch/$ARCH/configs/${PLATFORM}_defconfig,
181181
depending on the architecture.
182182

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ pid>/``).
212212
This value defaults to 0.
213213
214214

215+
core_sort_vma
216+
=============
217+
218+
The default coredump writes VMAs in address order. By setting
219+
``core_sort_vma`` to 1, VMAs will be written from smallest size
220+
to largest size. This is known to break at least elfutils, but
221+
can be handy when dealing with very large (and truncated)
222+
coredumps where the more useful debugging details are included
223+
in the smaller VMAs.
224+
225+
215226
core_uses_pid
216227
=============
217228

Documentation/arch/arm64/gcs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ intended to be exhaustive.
3737
shadow stacks rather than GCS.
3838

3939
* Support for GCS is reported to userspace via HWCAP_GCS in the aux vector
40-
AT_HWCAP2 entry.
40+
AT_HWCAP entry.
4141

4242
* GCS is enabled per thread. While there is support for disabling GCS
4343
at runtime this should be done with great care.

Documentation/arch/powerpc/cxl.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Introduction
1818
both access system memory directly and with the same effective
1919
addresses.
2020

21+
**This driver is deprecated and will be removed in a future release.**
2122

2223
Hardware overview
2324
=================
@@ -453,7 +454,7 @@ Sysfs Class
453454

454455
A cxl sysfs class is added under /sys/class/cxl to facilitate
455456
enumeration and tuning of the accelerators. Its layout is
456-
described in Documentation/ABI/testing/sysfs-class-cxl
457+
described in Documentation/ABI/obsolete/sysfs-class-cxl
457458

458459

459460
Udev rules

Documentation/arch/x86/sva.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the
2525
mmu_notifier() support to keep the device TLB cache and the CPU cache in
2626
sync. When an ATS lookup fails for a virtual address, the device should
2727
use the PRI in order to request the virtual address to be paged into the
28-
CPU page tables. The device must use ATS again in order the fetch the
28+
CPU page tables. The device must use ATS again in order to fetch the
2929
translation before use.
3030

3131
Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions.
216216

217217
Single Root I/O Virtualization (SR-IOV) focuses on providing independent
218218
hardware interfaces for virtualizing hardware. Hence, it's required to be
219-
almost fully functional interface to software supporting the traditional
219+
an almost fully functional interface to software supporting the traditional
220220
BARs, space for interrupts via MSI-X, its own register layout.
221221
Virtual Functions (VFs) are assisted by the Physical Function (PF)
222222
driver.

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ properties:
5353
reg:
5454
maxItems: 1
5555

56+
power-controller:
57+
type: object
58+
59+
reboot-mode:
60+
type: object
61+
5662
required:
5763
- compatible
5864
- reg
5965

60-
additionalProperties: true
66+
additionalProperties: false
6167

6268
examples:
6369
- |

Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:

0 commit comments

Comments
 (0)