Skip to content

Commit

Permalink
Merge remote-tracking branch 'torvalds/master' into perf/urgent
Browse files Browse the repository at this point in the history
To pick up more UAPI updates to sync with tools/.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed May 21, 2021
2 parents 3b2f17a + 011ff61 commit f248d68
Show file tree
Hide file tree
Showing 213 changed files with 1,537 additions and 1,001 deletions.
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/idt,versaclock5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ properties:
maxItems: 2

idt,xtal-load-femtofarads:
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 9000
maximum: 22760
description: Optional load capacitor for XTAL1 and XTAL2
Expand All @@ -84,7 +83,6 @@ patternProperties:
enum: [ 1800000, 2500000, 3300000 ]
idt,slew-percent:
description: The Slew rate control for CMOS single-ended.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [ 80, 85, 90, 100 ]

required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ patternProperties:

st,adc-channel-names:
description: List of single-ended channel names.
$ref: /schemas/types.yaml#/definitions/string-array

st,filter-order:
description: |
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/input/input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,5 @@ properties:
Duration in seconds which the key should be kept pressed for device to
reset automatically. Device with key pressed reset feature can specify
this property.
$ref: /schemas/types.yaml#/definitions/uint32

additionalProperties: true
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ properties:
this interconnect to send RPMh commands.
qcom,bcm-voter-names:
$ref: /schemas/types.yaml#/definitions/string-array
description: |
Names for each of the qcom,bcm-voters specified.
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/leds/leds-bcm6328.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ This controller is present on BCM6318, BCM6328, BCM6362 and BCM63268.
In these SoCs it's possible to control LEDs both as GPIOs or by hardware.
However, on some devices there are Serial LEDs (LEDs connected to a 74x164
controller), which can either be controlled by software (exporting the 74x164
as spi-gpio. See Documentation/devicetree/bindings/gpio/gpio-74x164.txt), or
by hardware using this driver.
as spi-gpio. See Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml),
or by hardware using this driver.
Some of these Serial LEDs are hardware controlled (e.g. ethernet LEDs) and
exporting the 74x164 as spi-gpio prevents those LEDs to be hardware
controlled, so the only chance to keep them working is by using this driver.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/leds/leds-bcm6358.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LEDs connected to Broadcom BCM6358 controller
This controller is present on BCM6358 and BCM6368.
In these SoCs there are Serial LEDs (LEDs connected to a 74x164 controller),
which can either be controlled by software (exporting the 74x164 as spi-gpio.
See Documentation/devicetree/bindings/gpio/gpio-74x164.txt), or
See Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml), or
by hardware using this driver.

Required properties:
Expand Down
20 changes: 7 additions & 13 deletions Documentation/devicetree/bindings/media/renesas,drif.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,32 +99,26 @@ properties:
Indicates that the channel acts as primary among the bonded channels.

port:
type: object
$ref: /schemas/graph.yaml#/properties/port
unevaluatedProperties: false
description:
Child port node corresponding to the data input, in accordance with the
video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.
The port node must contain at least one endpoint.
Child port node corresponding to the data input. The port node must
contain at least one endpoint.

properties:
endpoint:
type: object
$ref: /schemas/graph.yaml#/$defs/endpoint-base
unevaluatedProperties: false

properties:
remote-endpoint:
description:
A phandle to the remote tuner endpoint subnode in remote node
port.

sync-active:
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1]
description:
Indicates sync signal polarity, 0/1 for low/high respectively.
This property maps to SYNCAC bit in the hardware manual. The
default is 1 (active high).

additionalProperties: false

required:
- compatible
- reg
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/net/qcom,ipa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ properties:
- description: Whether the IPA clock is enabled (if valid)

qcom,smem-state-names:
$ref: /schemas/types.yaml#/definitions/string-array
description: The names of the state bits used for SMP2P output
items:
- const: ipa-clock-enabled-valid
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Required properties:
"mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
"mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
"mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
"mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
- reg: Should contain registers location and length

= Data cells =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ patternProperties:
description:
Specifies the Spread Spectrum Clocking mode used. It can be NO_SSC,
EXTERNAL_SSC or INTERNAL_SSC.
Refer include/dt-bindings/phy/phy-cadence-torrent.h for the constants to be used.
Refer include/dt-bindings/phy/phy-cadence.h for the constants to be used.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1, 2]
default: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ properties:
maxItems: 1

phys:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: phandle to the USB phy

monitored-battery:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ properties:
maxItems: 1

memory-region:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description:
phandle to a node describing reserved memory (System RAM memory)
The M core can't access all the DDR memory space on some platform,
Expand Down
3 changes: 2 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1618,8 +1618,8 @@ F: Documentation/devicetree/bindings/sound/amlogic*
F: sound/soc/meson/

ARM/Amlogic Meson SoC support
M: Neil Armstrong <narmstrong@baylibre.com>
M: Kevin Hilman <khilman@baylibre.com>
R: Neil Armstrong <narmstrong@baylibre.com>
R: Jerome Brunet <jbrunet@baylibre.com>
R: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
Expand Down Expand Up @@ -12180,6 +12180,7 @@ F: drivers/platform/surface/surfacepro3_button.c

MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
M: Maximilian Luz <luzmaximilian@gmail.com>
L: platform-driver-x86@vger.kernel.org
S: Maintained
W: https://github.com/linux-surface/surface-aggregator-module
C: irc://chat.freenode.net/##linux-surface
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/kernel/syscalls/syscall.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
550 common process_madvise sys_process_madvise
551 common epoll_pwait2 sys_epoll_pwait2
552 common mount_setattr sys_mount_setattr
553 common quotactl_path sys_quotactl_path
# 553 reserved for quotactl_path
554 common landlock_create_ruleset sys_landlock_create_ruleset
555 common landlock_add_rule sys_landlock_add_rule
556 common landlock_restrict_self sys_landlock_restrict_self
1 change: 1 addition & 0 deletions arch/arm/mach-npcm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config ARCH_WPCM450
bool "Support for WPCM450 BMC (Hermon)"
depends on ARCH_MULTI_V5
select CPU_ARM926T
select WPCM450_AIC
select NPCM7XX_TIMER
help
General support for WPCM450 BMC (Hermon).
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/tools/syscall.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
443 common quotactl_path sys_quotactl_path
# 443 reserved for quotactl_path
444 common landlock_create_ruleset sys_landlock_create_ruleset
445 common landlock_add_rule sys_landlock_add_rule
446 common landlock_restrict_self sys_landlock_restrict_self
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

ports {
port@0 {
reg = <0>;
csi20_in: endpoint {
clock-lanes = <0>;
data-lanes = <1 2>;
Expand All @@ -29,7 +28,6 @@

ports {
port@0 {
reg = <0>;
csi40_in: endpoint {
clock-lanes = <0>;
data-lanes = <1 2>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a774a1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2573,6 +2573,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2628,6 +2632,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a774b1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2419,6 +2419,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2474,6 +2478,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
status = "okay";

ports {
port {
port@0 {
csi40_in: endpoint {
clock-lanes = <0>;
data-lanes = <1 2>;
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a774c0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a774e1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2709,6 +2709,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2764,6 +2768,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a77950.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
12 changes: 12 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a77951.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -3097,6 +3097,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -3152,6 +3156,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -3191,6 +3199,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a77960.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2761,6 +2761,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2816,6 +2820,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a77961.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2499,6 +2499,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2554,6 +2558,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a77965.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2575,6 +2575,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down Expand Up @@ -2630,6 +2634,10 @@
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
};

port@1 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
Loading

0 comments on commit f248d68

Please sign in to comment.