Skip to content

Commit

Permalink
Merge tag 'v5.12' into next
Browse files Browse the repository at this point in the history
Sync up with mainline to get the latest device tree bindings and kernel
APIs.
  • Loading branch information
dtor committed May 25, 2021
2 parents 94a332b + 9f4ad9e commit cbb2452
Show file tree
Hide file tree
Showing 967 changed files with 8,835 additions and 4,399 deletions.
10 changes: 10 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Andrew Morton <[email protected]>
Andrew Murray <[email protected]> <[email protected]>
Andrew Murray <[email protected]> <[email protected]>
Andrew Vasquez <[email protected]>
Andrey Konovalov <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andy Adamson <[email protected]>
Expand Down Expand Up @@ -65,6 +66,8 @@ Changbin Du <[email protected]> <[email protected]>
Changbin Du <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Christophe Ricard <[email protected]>
Christoph Hellwig <[email protected]>
Corey Minyard <[email protected]>
Expand Down Expand Up @@ -165,6 +168,7 @@ Johan Hovold <[email protected]> <[email protected]>
Johan Hovold <[email protected]> <[email protected]>
John Paul Adrian Glaubitz <[email protected]>
John Stultz <[email protected]>
Jordan Crouse <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Expand Down Expand Up @@ -250,8 +254,14 @@ Morten Welinder <[email protected]>
Morten Welinder <[email protected]>
Morten Welinder <[email protected]>
Mythri P K <[email protected]>
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
Nathan Chancellor <[email protected]> <[email protected]>
Nguyen Anh Quynh <[email protected]>
Nicholas Piggin <[email protected]> <[email protected]>
Nicholas Piggin <[email protected]> <[email protected]>
Nicholas Piggin <[email protected]> <[email protected]>
Nicholas Piggin <[email protected]> <[email protected]>
Nicholas Piggin <[email protected]> <[email protected]>
Nicolas Ferre <[email protected]> <[email protected]>
Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Pitre <[email protected]> <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/debugfs-moxtet
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/kernel/debug/moxtet/input
Date: March 2019
KernelVersion: 5.3
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Read input from the shift registers, in hexadecimal.
Returns N+1 bytes, where N is the number of Moxtet connected
modules. The first byte is from the CPU board itself.
Expand All @@ -19,7 +19,7 @@ Description: (Read) Read input from the shift registers, in hexadecimal.
What: /sys/kernel/debug/moxtet/output
Date: March 2019
KernelVersion: 5.3
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (RW) Read last written value to the shift registers, in
hexadecimal, or write values to the shift registers, also
in hexadecimal.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/debugfs-turris-mox-rwtm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/kernel/debug/turris-mox-rwtm/do_sign
Date: Jun 2020
KernelVersion: 5.8
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description:

======= ===========================================================
Expand Down
6 changes: 3 additions & 3 deletions Documentation/ABI/testing/sysfs-bus-moxtet-devices
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_description
Date: March 2019
KernelVersion: 5.3
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Moxtet module description. Format: string

What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_id
Date: March 2019
KernelVersion: 5.3
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Moxtet module ID. Format: %x

What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_name
Date: March 2019
KernelVersion: 5.3
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Moxtet module name. Format: string
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/class/leds/<led>/device/brightness
Date: July 2020
KernelVersion: 5.9
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (RW) On the front panel of the Turris Omnia router there is also
a button which can be used to control the intensity of all the
LEDs at once, so that if they are too bright, user can dim them.
Expand Down
10 changes: 5 additions & 5 deletions Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
What: /sys/firmware/turris-mox-rwtm/board_version
Date: August 2019
KernelVersion: 5.4
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Board version burned into eFuses of this Turris Mox board.
Format: %i

What: /sys/firmware/turris-mox-rwtm/mac_address*
Date: August 2019
KernelVersion: 5.4
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) MAC addresses burned into eFuses of this Turris Mox board.
Format: %pM

What: /sys/firmware/turris-mox-rwtm/pubkey
Date: August 2019
KernelVersion: 5.4
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) ECDSA public key (in pubkey hex compressed form) computed
as pair to the ECDSA private key burned into eFuses of this
Turris Mox Board.
Expand All @@ -24,14 +24,14 @@ Description: (Read) ECDSA public key (in pubkey hex compressed form) computed
What: /sys/firmware/turris-mox-rwtm/ram_size
Date: August 2019
KernelVersion: 5.4
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) RAM size in MiB of this Turris Mox board as was detected
during manufacturing and burned into eFuses. Can be 512 or 1024.
Format: %i

What: /sys/firmware/turris-mox-rwtm/serial_number
Date: August 2019
KernelVersion: 5.4
Contact: Marek Behún <[email protected]>
Contact: Marek Behún <[email protected]>
Description: (Read) Serial number burned into eFuses of this Turris Mox device.
Format: %016X
10 changes: 5 additions & 5 deletions Documentation/arm64/acpi_object_usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories:

- Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT

- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,
MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,
TCPA, TPM2, UEFI, XENV
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,
IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,
STAO, TCPA, TPM2, UEFI, XENV

- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,
MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,
PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT

====== ========================================================================
Table Usage for ARMv8 Linux
Expand Down
3 changes: 3 additions & 0 deletions Documentation/arm64/silicon-errata.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ stable kernels.
| Marvell | ARM-MMU-500 | #582743 | N/A |
+----------------+-----------------+-----------------+-----------------------------+
+----------------+-----------------+-----------------+-----------------------------+
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
+----------------+-----------------+-----------------+-----------------------------+
+----------------+-----------------+-----------------+-----------------------------+
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
+----------------+-----------------+-----------------+-----------------------------+
+----------------+-----------------+-----------------+-----------------------------+
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Optional node properties:
- "#thermal-sensor-cells" Used to expose itself to thermal fw.

Read more about iio bindings at
Documentation/devicetree/bindings/iio/iio-bindings.txt
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/

Example:
ncp15wb473@0 {
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Bindings for GPIO bitbanged I2C

maintainers:
- Wolfram Sang <[email protected]>
- Wolfram Sang <[email protected]>

allOf:
- $ref: /schemas/i2c/i2c-controller.yaml#
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/i2c/i2c-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale Inter IC (I2C) and High Speed Inter IC (HS-I2C) for i.MX

maintainers:
- Wolfram Sang <wolfram@the-dreams.de>
- Oleksij Rempel <o.rempel@pengutronix.de>

allOf:
- $ref: /schemas/i2c/i2c-controller.yaml#
Expand Down
5 changes: 3 additions & 2 deletions Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ description: >
Industrial I/O subsystem bindings for ADC controller found in
Ingenic JZ47xx SoCs.
ADC clients must use the format described in iio-bindings.txt, giving
a phandle and IIO specifier pair ("io-channels") to the ADC controller.
ADC clients must use the format described in
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml,
giving a phandle and IIO specifier pair ("io-channels") to the ADC controller.
properties:
compatible:
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/input/adc-joystick.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ properties:
description: >
List of phandle and IIO specifier pairs.
Each pair defines one ADC channel to which a joystick axis is connected.
See Documentation/devicetree/bindings/iio/iio-bindings.txt for details.
See
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml
for details.
'#address-cells':
const: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Required properties:
- compatible: must be "resistive-adc-touch"
The device must be connected to an ADC device that provides channels for
position measurement and optional pressure.
Refer to ../iio/iio-bindings.txt for details
Refer to
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml
for details

- iio-channels: must have at least two channels connected to an ADC device.
These should correspond to the channels exposed by the ADC device and should
have the right index as the ADC device registers them. These channels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: CZ.NIC's Turris Omnia LEDs driver

maintainers:
- Marek Behún <[email protected]>
- Marek Behún <[email protected]>

description:
This module adds support for the RGB LEDs found on the front panel of the
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/mfd/ab8500.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ Required child device properties:
pwm|regulator|rtc|sysctrl|usb]";

A few child devices require ADC channels from the GPADC node. Those follow the
standard bindings from iio/iio-bindings.txt and iio/adc/adc.txt
standard bindings from
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml
and Documentation/devicetree/bindings/iio/adc/adc.yaml

abx500-temp : io-channels "aux1" and "aux2" for measuring external
temperatures.
Expand Down
16 changes: 8 additions & 8 deletions Documentation/devicetree/bindings/mfd/motorola-cpcap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ Optional subnodes:
The sub-functions of CPCAP get their own node with their own compatible values,
which are described in the following files:

- ../power/supply/cpcap-battery.txt
- ../power/supply/cpcap-charger.txt
- ../regulator/cpcap-regulator.txt
- ../phy/phy-cpcap-usb.txt
- ../input/cpcap-pwrbutton.txt
- ../rtc/cpcap-rtc.txt
- ../leds/leds-cpcap.txt
- ../iio/adc/cpcap-adc.txt
- Documentation/devicetree/bindings/power/supply/cpcap-battery.txt
- Documentation/devicetree/bindings/power/supply/cpcap-charger.txt
- Documentation/devicetree/bindings/regulator/cpcap-regulator.txt
- Documentation/devicetree/bindings/phy/phy-cpcap-usb.txt
- Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt
- Documentation/devicetree/bindings/rtc/cpcap-rtc.txt
- Documentation/devicetree/bindings/leds/leds-cpcap.txt
- Documentation/devicetree/bindings/iio/adc/motorola,cpcap-adc.yaml

The only exception is the audio codec. Instead of a compatible value its
node must be named "audio-codec".
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ required:
- interrupts
- interrupt-names

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ properties:
description:
Reference to an nvmem node for the MAC address

nvmem-cells-names:
nvmem-cell-names:
const: mac-address

phy-connection-type:
Expand Down
Loading

0 comments on commit cbb2452

Please sign in to comment.