Skip to content

L
linux
Commit d4fe9117 authored by Tetsuo Handa's avatar Tetsuo Handa
Browse files
Options

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

parents ae7e63d1 ed8780e3
Hide whitespace changes
Inline Side-by-side
Showing with 689 additions and 364 deletions
Documentation/devicetree/bindings/arm/actions.yaml
View file @ d4fe9117
......@@ -49,3 +49,5 @@ properties:
- enum:
- ucrobotics,bubblegum-96 # uCRobotics Bubblegum-96
- const: actions,s900
additionalProperties: true
Documentation/devicetree/bindings/arm/altera.yaml
View file @ d4fe9117
......@@ -19,4 +19,7 @@ properties:
- altr,socfpga-arria5
- altr,socfpga-arria10
- const: altr,socfpga
additionalProperties: true
...
Documentation/devicetree/bindings/arm/amazon,al.yaml
View file @ d4fe9117
......@@ -30,4 +30,6 @@ properties:
- amazon,al-alpine-v3-evp
- const: amazon,al-alpine-v3
additionalProperties: true
...
Documentation/devicetree/bindings/arm/amlogic.yaml
View file @ d4fe9117
......@@ -173,4 +173,7 @@ properties:
- enum:
- amlogic,ad401
- const: amlogic,a1
additionalProperties: true
...
Documentation/devicetree/bindings/arm/arm,integrator.yaml
View file @ d4fe9117
......@@ -83,4 +83,6 @@ required:
- compatible
- core-module@10000000
additionalProperties: true
...
Documentation/devicetree/bindings/arm/arm,realview.yaml
View file @ d4fe9117
......@@ -120,4 +120,6 @@ required:
- compatible
- soc
additionalProperties: true
...
Documentation/devicetree/bindings/arm/arm,versatile.yaml
View file @ d4fe9117
......@@ -68,4 +68,6 @@ required:
- compatible
- core-module@10000000
additionalProperties: true
...
Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
View file @ d4fe9117
......@@ -216,4 +216,6 @@ allOf:
required:
- arm,hbi
additionalProperties: true
...
Documentation/devicetree/bindings/arm/atmel-at91.yaml
View file @ d4fe9117
......@@ -184,4 +184,6 @@ properties:
- const: atmel,samv71
- const: atmel,samv7
additionalProperties: true
...
Documentation/devicetree/bindings/arm/axxia.yaml
View file @ d4fe9117
......@@ -18,4 +18,6 @@ properties:
- const: lsi,axm5516-amarillo
- const: lsi,axm5516
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml
View file @ d4fe9117
......@@ -51,4 +51,6 @@ properties:
- raspberrypi,3-compute-module-lite
- const: brcm,bcm2837
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
View file @ d4fe9117
......@@ -18,4 +18,6 @@ properties:
- brcm,bcm28155-ap
- const: brcm,bcm11351
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
View file @ d4fe9117
......@@ -18,4 +18,6 @@ properties:
- brcm,bcm21664-garnet
- const: brcm,bcm21664
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
View file @ d4fe9117
......@@ -18,4 +18,6 @@ properties:
- brcm,bcm23550-sparrow
- const: brcm,bcm23550
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
View file @ d4fe9117
......@@ -87,4 +87,7 @@ properties:
- const: brcm,brcm53012
- const: brcm,brcm53016
- const: brcm,bcm4708
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml
View file @ d4fe9117
......@@ -26,4 +26,6 @@ properties:
- brcm,bcm58305
- const: brcm,cygnus
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
View file @ d4fe9117
......@@ -25,4 +25,6 @@ properties:
- const: brcm,bcm53342
- const: brcm,hr2
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
View file @ d4fe9117
......@@ -20,4 +20,6 @@ properties:
- brcm,ns2-xmc
- const: brcm,ns2
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
View file @ d4fe9117
......@@ -33,4 +33,6 @@ properties:
- brcm,bcm88312
- const: brcm,nsp
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
View file @ d4fe9117
......@@ -21,4 +21,6 @@ properties:
- brcm,bcm958802a802x
- const: brcm,stingray
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
View file @ d4fe9117
......@@ -19,4 +19,6 @@ properties:
- cavium,thunderx2-cn9900
- const: brcm,vulcan-soc
additionalProperties: true
...
Documentation/devicetree/bindings/arm/bitmain.yaml
View file @ d4fe9117
......@@ -17,4 +17,7 @@ properties:
- enum:
- bitmain,sophon-edge
- const: bitmain,bm1880
additionalProperties: true
...
Documentation/devicetree/bindings/arm/calxeda.yaml
View file @ d4fe9117
......@@ -20,3 +20,5 @@ properties:
- enum:
- calxeda,highbank
- calxeda,ecx-2000
additionalProperties: true
Documentation/devicetree/bindings/arm/digicolor.yaml
View file @ d4fe9117
......@@ -15,4 +15,6 @@ properties:
compatible:
const: cnxt,cx92755
additionalProperties: true
...
Documentation/devicetree/bindings/arm/fsl.yaml
View file @ d4fe9117
......@@ -621,4 +621,6 @@ properties:
- fsl,s32v234-evb # S32V234-EVB2 Customer Evaluation Board
- const: fsl,s32v234
additionalProperties: true
...
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml
View file @ d4fe9117
......@@ -64,4 +64,7 @@ properties:
items:
- const: H836ASDJ
- const: hisilicon,sd5203
additionalProperties: true
...
Documentation/devicetree/bindings/arm/intel,keembay.yaml
View file @ d4fe9117
......@@ -16,4 +16,7 @@ properties:
- enum:
- intel,keembay-evm
- const: intel,keembay
additionalProperties: true
...
Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
View file @ d4fe9117
......@@ -22,3 +22,5 @@ properties:
- enum:
- gateworks,gw2358
- const: intel,ixp43x
additionalProperties: true
Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
View file @ d4fe9117
......@@ -42,3 +42,5 @@ properties:
- description: TI-SCI processor id for the remote processor device
- description: TI-SCI host id to which processor control ownership
should be transferred to
additionalProperties: true
Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
View file @ d4fe9117
......@@ -59,3 +59,5 @@ properties:
- const: marvell,cn9130
- const: marvell,armada-ap807-quad
- const: marvell,armada-ap807
additionalProperties: true
Documentation/devicetree/bindings/arm/mediatek.yaml
View file @ d4fe9117
......@@ -119,4 +119,7 @@ properties:
- const: google,krane-sku176
- const: google,krane
- const: mediatek,mt8183
additionalProperties: true
...
Documentation/devicetree/bindings/arm/microchip,sparx5.yaml
View file @ d4fe9117
......@@ -62,4 +62,6 @@ required:
- compatible
- axi@600000000
additionalProperties: true
...
Documentation/devicetree/bindings/arm/moxart.yaml
View file @ d4fe9117
......@@ -16,4 +16,5 @@ properties:
- const: moxa,moxart-uc-7112-lx
- const: moxa,moxart
additionalProperties: true
...
Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml
View file @ d4fe9117
......@@ -35,4 +35,7 @@ properties:
- enum:
- dell,wyse-ariel
- const: marvell,mmp3
additionalProperties: true
...
Documentation/devicetree/bindings/arm/mstar/mstar.yaml
View file @ d4fe9117
......@@ -31,3 +31,5 @@ properties:
- enum:
- 70mai,midrived08 # 70mai midrive d08
- const: mstar,mercury5
additionalProperties: true
Documentation/devicetree/bindings/arm/nxp/lpc32xx.yaml
View file @ d4fe9117
......@@ -21,4 +21,6 @@ properties:
- ea,ea3250
- phytec,phy3250
- const: nxp,lpc3250
additionalProperties: true
...
Documentation/devicetree/bindings/arm/qcom.yaml
View file @ d4fe9117
......@@ -178,4 +178,6 @@ properties:
- qcom,sm8250-mtp
- const: qcom,sm8250
additionalProperties: true
...
Documentation/devicetree/bindings/arm/rda.yaml
View file @ d4fe9117
......@@ -19,4 +19,6 @@ properties:
- xunlong,orangepi-i96 # Orange Pi i96
- const: rda,8810pl
additionalProperties: true
...
Documentation/devicetree/bindings/arm/realtek.yaml
View file @ d4fe9117
......@@ -54,4 +54,7 @@ properties:
- enum:
- realtek,mjolnir # Realtek Mjolnir EVB
- const: realtek,rtd1619
additionalProperties: true
...
Documentation/devicetree/bindings/arm/renesas.yaml
View file @ d4fe9117
......@@ -299,4 +299,6 @@ properties:
- renesas,rzn1d400-db # RZN1D-DB (RZ/N1D Demo Board for the RZ/N1D 400 pins package)
- const: renesas,r9a06g032
additionalProperties: true
...
Documentation/devicetree/bindings/arm/rockchip.yaml
View file @ d4fe9117
......@@ -569,4 +569,7 @@ properties:
items:
- const: zkmagic,a95x-z2
- const: rockchip,rk3318
additionalProperties: true
...
Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
View file @ d4fe9117
......@@ -180,3 +180,5 @@ properties:
required:
- compatible
additionalProperties: true
Documentation/devicetree/bindings/arm/sirf.yaml
View file @ d4fe9117
......@@ -24,4 +24,7 @@ properties:
- items:
- const: sirf,prima2-cb
- const: sirf,prima2
additionalProperties: true
...
Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml
View file @ d4fe9117
......@@ -19,4 +19,7 @@ properties:
- enum:
- socionext,milbeaut-m10v-evb
- const: socionext,sc2000a
additionalProperties: true
...
Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
View file @ d4fe9117
......@@ -60,3 +60,5 @@ properties:
- enum:
- socionext,uniphier-pxs3-ref
- const: socionext,uniphier-pxs3
additionalProperties: true
Documentation/devicetree/bindings/arm/spear.yaml
View file @ d4fe9117
......@@ -22,4 +22,7 @@ properties:
- st,spear320
- st,spear1310
- st,spear1340
additionalProperties: true
...
Documentation/devicetree/bindings/arm/sprd/sprd.yaml
View file @ d4fe9117
......@@ -30,4 +30,6 @@ properties:
- sprd,sp9863a-1h10
- const: sprd,sc9863a
additionalProperties: true
...
Documentation/devicetree/bindings/arm/sti.yaml
View file @ d4fe9117
......@@ -20,4 +20,7 @@ properties:
- st,stih407
- st,stih410
- st,stih418
additionalProperties: true
...
Documentation/devicetree/bindings/arm/stm32/stm32.yaml
View file @ d4fe9117
......@@ -54,8 +54,11 @@ properties:
- const: st,stm32mp157
- description: Odyssey STM32MP1 SoM based Boards
items:
- enum:
- seeed,stm32mp157c-odyssey
- const: seeed,stm32mp157c-odyssey-som
- const: st,stm32mp157
- enum:
- seeed,stm32mp157c-odyssey
- const: seeed,stm32mp157c-odyssey-som
- const: st,stm32mp157
additionalProperties: true
...
Documentation/devicetree/bindings/arm/sunxi.yaml
View file @ d4fe9117
......@@ -893,3 +893,5 @@ properties:
items:
- const: xunlong,orangepi-zero-plus2-h3
- const: allwinner,sun8i-h3
additionalProperties: true
Documentation/devicetree/bindings/arm/tegra.yaml
View file @ d4fe9117
......@@ -125,3 +125,5 @@ properties:
- enum:
- nvidia,tegra234-vdk
- const: nvidia,tegra234
additionalProperties: true
Documentation/devicetree/bindings/arm/ti/k3.yaml
View file @ d4fe9117
......@@ -32,4 +32,7 @@ properties:
- description: K3 J7200 SoC
items:
- const: ti,j7200
additionalProperties: true
...
Documentation/devicetree/bindings/arm/ti/nspire.yaml
View file @ d4fe9117
......@@ -21,4 +21,7 @@ properties:
- ti,nspire-tp
# Clickpad models
- ti,nspire-clp
additionalProperties: true
...
Documentation/devicetree/bindings/arm/ti/ti,davinci.yaml
View file @ d4fe9117
......@@ -23,4 +23,7 @@ properties:
- enbw,cmc # EnBW AM1808 based CMC board
- lego,ev3 # LEGO MINDSTORMS EV3 (AM1808 based)
- const: ti,da850
additionalProperties: true
...
Documentation/devicetree/bindings/arm/toshiba.yaml
View file @ d4fe9117
......@@ -19,4 +19,7 @@ properties:
- enum:
- toshiba,tmpv7708-rm-mbrc # TMPV7708 RM main board
- const: toshiba,tmpv7708
additionalProperties: true
...
Documentation/devicetree/bindings/arm/ux500.yaml
View file @ d4fe9117
......@@ -34,3 +34,5 @@ properties:
items:
- const: samsung,golden
- const: st-ericsson,u8500
additionalProperties: true
Documentation/devicetree/bindings/arm/vt8500.yaml
View file @ d4fe9117
......@@ -21,3 +21,6 @@ properties:
- wm,wm8650
- wm,wm8750
- wm,wm8850
additionalProperties: true
Documentation/devicetree/bindings/arm/xilinx.yaml
View file @ d4fe9117
......@@ -111,4 +111,6 @@ properties:
- const: xlnx,zynqmp-zcu111
- const: xlnx,zynqmp
additionalProperties: true
...
Documentation/devicetree/bindings/arm/zte.yaml
View file @ d4fe9117
......@@ -23,4 +23,6 @@ properties:
- zte,zx296718-evb
- const: zte,zx296718
additionalProperties: true
...
Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml
View file @ d4fe9117
......@@ -7,17 +7,17 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Toshiba TC358775 DSI to LVDS bridge bindings
maintainers:
- Vinay Simha BN <simhavcs@gmail.com>
- Vinay Simha BN <simhavcs@gmail.com>
description: |
This binding supports DSI to LVDS bridge TC358775
This binding supports DSI to LVDS bridge TC358775
MIPI DSI-RX Data 4-lane, CLK 1-lane with data rates up to 800 Mbps/lane.
Video frame size:
Up to 1600x1200 24-bit/pixel resolution for single-link LVDS display panel
limited by 135 MHz LVDS speed
Up to WUXGA (1920x1200 24-bit pixels) resolution for dual-link LVDS display
panel, limited by 270 MHz LVDS speed.
MIPI DSI-RX Data 4-lane, CLK 1-lane with data rates up to 800 Mbps/lane.
Video frame size:
Up to 1600x1200 24-bit/pixel resolution for single-link LVDS display panel
limited by 135 MHz LVDS speed
Up to WUXGA (1920x1200 24-bit pixels) resolution for dual-link LVDS display
panel, limited by 270 MHz LVDS speed.
properties:
compatible:
......@@ -29,7 +29,7 @@ properties:
vdd-supply:
maxItems: 1
description: 1.2V LVDS Power Supply
description: 1.2V LVDS Power Supply
vddio-supply:
maxItems: 1
......@@ -77,16 +77,18 @@ properties:
- port@1
required:
- compatible
- reg
- vdd-supply
- vddio-supply
- stby-gpios
- reset-gpios
- ports
- compatible
- reg
- vdd-supply
- vddio-supply
- stby-gpios
- reset-gpios
- ports
additionalProperties: false
examples:
- |
- |
#include <dt-bindings/gpio/gpio.h>
/* For single-link LVDS display panel */
......@@ -147,7 +149,7 @@ examples:
};
};
- |
- |
/* For dual-link LVDS display panel */
i2c@78b8000 {
......
Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml
View file @ d4fe9117
......@@ -13,9 +13,8 @@ properties:
compatible:
items:
- enum:
- bananapi,lhr050h41
- feixin,k101-im2byl02
- bananapi,lhr050h41
- feixin,k101-im2byl02
- const: ilitek,ili9881c
backlight: true
......
Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
View file @ d4fe9117
......@@ -48,6 +48,7 @@ required:
- "#address-cells"
- "#size-cells"
additionalProperties: false
examples:
- |
......
Documentation/devicetree/bindings/eeprom/at25.yaml
View file @ d4fe9117
......@@ -81,14 +81,14 @@ properties:
at25,byte-len:
$ref: /schemas/types.yaml#/definitions/uint32
description:
Total eeprom size in bytes. Deprecated, use "size" property instead.
Total eeprom size in bytes. Deprecated, use "size" property instead.
deprecated: true
at25,addr-mode:
$ref: /schemas/types.yaml#/definitions/uint32
description:
Addr-mode flags, as defined in include/linux/spi/eeprom.h.
Deprecated, use "address-width" property instead.
Addr-mode flags, as defined in include/linux/spi/eeprom.h.
Deprecated, use "address-width" property instead.
deprecated: true
at25,page-size:
......
Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
View file @ d4fe9117
......@@ -43,8 +43,8 @@ properties:
gpio-controller: true
gpio-line-names:
minItems: 1
maxItems: 8
minItems: 1
maxItems: 8
required:
- compatible
......
Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml 0 → 100644
View file @ d4fe9117
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/i2c/google,cros-ec-i2c-tunnel.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: I2C bus that tunnels through the ChromeOS EC (cros-ec)
maintainers:
- Doug Anderson <dianders@chromium.org>
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: |
On some ChromeOS board designs we've got a connection to the EC
(embedded controller) but no direct connection to some devices on the
other side of the EC (like a battery and PMIC). To get access to
those devices we need to tunnel our i2c commands through the EC.
The node for this device should be under a cros-ec node like
google,cros-ec-spi or google,cros-ec-i2c.
allOf:
- $ref: i2c-controller.yaml#
properties:
compatible:
const: google,cros-ec-i2c-tunnel
google,remote-bus:
description: The EC bus we'd like to talk to.
$ref: /schemas/types.yaml#/definitions/uint32
required:
- compatible
- google,remote-bus
unevaluatedProperties: false
examples:
- |
spi0 {
#address-cells = <1>;
#size-cells = <0>;
cros-ec@0 {
compatible = "google,cros-ec-spi";
reg = <0>;
spi-max-frequency = <5000000>;
i2c-tunnel {
compatible = "google,cros-ec-i2c-tunnel";
#address-cells = <1>;
#size-cells = <0>;
google,remote-bus = <0>;
battery: sbs-battery@b {
compatible = "sbs,sbs-battery";
reg = <0xb>;
sbs,poll-retry-count = <1>;
};
};
};
};
Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt deleted 100644 → 0
View file @ ae7e63d1
I2C bus that tunnels through the ChromeOS EC (cros-ec)
======================================================
On some ChromeOS board designs we've got a connection to the EC (embedded
controller) but no direct connection to some devices on the other side of
the EC (like a battery and PMIC). To get access to those devices we need
to tunnel our i2c commands through the EC.
The node for this device should be under a cros-ec node like google,cros-ec-spi
or google,cros-ec-i2c.
Required properties:
- compatible: google,cros-ec-i2c-tunnel
- google,remote-bus: The EC bus we'd like to talk to.
Optional child nodes:
- One node per I2C device connected to the tunnelled I2C bus.
Example:
cros-ec@0 {
compatible = "google,cros-ec-spi";
...
i2c-tunnel {
compatible = "google,cros-ec-i2c-tunnel";
#address-cells = <1>;
#size-cells = <0>;
google,remote-bus = <0>;
battery: sbs-battery@b {
compatible = "sbs,sbs-battery";
reg = <0xb>;
sbs,poll-retry-count = <1>;
};
};
}
Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml
View file @ d4fe9117
......@@ -19,11 +19,11 @@ properties:
compatible:
oneOf:
- enum:
- ingenic,jz4770-i2c
- ingenic,x1000-i2c
- ingenic,jz4770-i2c
- ingenic,x1000-i2c
- items:
- const: ingenic,jz4780-i2c
- const: ingenic,jz4770-i2c
- const: ingenic,jz4780-i2c
- const: ingenic,jz4770-i2c
reg:
maxItems: 1
......
Documentation/devicetree/bindings/iio/adc/adi,ad7291.yaml
View file @ d4fe9117
......@@ -43,4 +43,5 @@ examples:
vref-supply = <&adc_vref>;
};
};
...
\ No newline at end of file
...
Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
View file @ d4fe9117
......@@ -46,7 +46,8 @@ properties:
spi-max-frequency: true
spi-cpol: true
spi-cpha : true
spi-cpha: true
"#io-channel-cells":
const: 1
......
Documentation/devicetree/bindings/iio/adc/cosmic,10001-adc.yaml
View file @ d4fe9117
......@@ -22,8 +22,8 @@ properties:
adc-reserved-channels:
$ref: /schemas/types.yaml#/definitions/uint32
description:
Bitmask of reserved channels, i.e. channels that cannot be
used by the OS.
Bitmask of reserved channels, i.e. channels that cannot be
used by the OS.
clocks:
maxItems: 1
......
Documentation/devicetree/bindings/iio/adc/holt,hi8435.yaml
View file @ d4fe9117
......@@ -21,7 +21,7 @@ properties:
gpios:
description:
GPIO used for controlling the reset pin
GPIO used for controlling the reset pin
maxItems: 1
spi-max-frequency: true
......
Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml
View file @ d4fe9117
......@@ -28,6 +28,8 @@ required:
- reg
- vref-supply
additionalProperties: false
examples:
- |
i2c {
......
Documentation/devicetree/bindings/iio/humidity/ti,hdc2010.yaml
View file @ d4fe9117
......@@ -32,6 +32,8 @@ required:
- compatible
- reg
additionalProperties: false
examples:
- |
i2c0 {
......
Documentation/devicetree/bindings/input/cros-ec-keyb.txt deleted 100644 → 0
View file @ ae7e63d1
ChromeOS EC Keyboard
Google's ChromeOS EC Keyboard is a simple matrix keyboard implemented on
a separate EC (Embedded Controller) device. It provides a message for reading
key scans from the EC. These are then converted into keycodes for processing
by the kernel.
This binding is based on matrix-keymap.txt and extends/modifies it as follows:
Required properties:
- compatible: "google,cros-ec-keyb"
Optional properties:
- google,needs-ghost-filter: True to enable a ghost filter for the matrix
keyboard. This is recommended if the EC does not have its own logic or
hardware for this.
Example:
cros-ec-keyb {
compatible = "google,cros-ec-keyb";
keypad,num-rows = <8>;
keypad,num-columns = <13>;
google,needs-ghost-filter;
/*
* Keymap entries take the form of 0xRRCCKKKK where
* RR=Row CC=Column KKKK=Key Code
* The values below are for a US keyboard layout and
* are taken from the Linux driver. Note that the
* 102ND key is not used for US keyboards.
*/
linux,keymap = <
/* CAPSLCK F1 B F10 */
0x0001003a 0x0002003b 0x00030030 0x00040044
/* N = R_ALT ESC */
0x00060031 0x0008000d 0x000a0064 0x01010001
/* F4 G F7 H */
0x0102003e 0x01030022 0x01040041 0x01060023
/* ' F9 BKSPACE L_CTRL */
0x01080028 0x01090043 0x010b000e 0x0200001d
/* TAB F3 T F6 */
0x0201000f 0x0202003d 0x02030014 0x02040040
/* ] Y 102ND [ */
0x0205001b 0x02060015 0x02070056 0x0208001a
/* F8 GRAVE F2 5 */
0x02090042 0x03010029 0x0302003c 0x03030006
/* F5 6 - \ */
0x0304003f 0x03060007 0x0308000c 0x030b002b
/* R_CTRL A D F */
0x04000061 0x0401001e 0x04020020 0x04030021
/* S K J ; */
0x0404001f 0x04050025 0x04060024 0x04080027
/* L ENTER Z C */
0x04090026 0x040b001c 0x0501002c 0x0502002e
/* V X , M */
0x0503002f 0x0504002d 0x05050033 0x05060032
/* L_SHIFT / . SPACE */
0x0507002a 0x05080035 0x05090034 0x050B0039
/* 1 3 4 2 */
0x06010002 0x06020004 0x06030005 0x06040003
/* 8 7 0 9 */
0x06050009 0x06060008 0x0608000b 0x0609000a
/* L_ALT DOWN RIGHT Q */
0x060a0038 0x060b006c 0x060c006a 0x07010010
/* E R W I */
0x07020012 0x07030013 0x07040011 0x07050017
/* U R_SHIFT P O */
0x07060016 0x07070036 0x07080019 0x07090018
/* UP LEFT */
0x070b0067 0x070c0069>;
};
Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml 0 → 100644
View file @ d4fe9117
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/input/google,cros-ec-keyb.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: ChromeOS EC Keyboard
maintainers:
- Simon Glass <sjg@chromium.org>
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: |
Google's ChromeOS EC Keyboard is a simple matrix keyboard
implemented on a separate EC (Embedded Controller) device. It provides
a message for reading key scans from the EC. These are then converted
into keycodes for processing by the kernel.
allOf:
- $ref: "/schemas/input/matrix-keymap.yaml#"
properties:
compatible:
const: google,cros-ec-keyb
google,needs-ghost-filter:
description:
Enable a ghost filter for the matrix keyboard. This is recommended
if the EC does not have its own logic or hardware for this.
type: boolean
required:
- compatible
unevaluatedProperties: false
examples:
- |
cros-ec-keyb {
compatible = "google,cros-ec-keyb";
keypad,num-rows = <8>;
keypad,num-columns = <13>;
google,needs-ghost-filter;
/*
* Keymap entries take the form of 0xRRCCKKKK where
* RR=Row CC=Column KKKK=Key Code
* The values below are for a US keyboard layout and
* are taken from the Linux driver. Note that the
* 102ND key is not used for US keyboards.
*/
linux,keymap = <
/* CAPSLCK F1 B F10 */
0x0001003a 0x0002003b 0x00030030 0x00040044
/* N = R_ALT ESC */
0x00060031 0x0008000d 0x000a0064 0x01010001
/* F4 G F7 H */
0x0102003e 0x01030022 0x01040041 0x01060023
/* ' F9 BKSPACE L_CTRL */
0x01080028 0x01090043 0x010b000e 0x0200001d
/* TAB F3 T F6 */
0x0201000f 0x0202003d 0x02030014 0x02040040
/* ] Y 102ND [ */
0x0205001b 0x02060015 0x02070056 0x0208001a
/* F8 GRAVE F2 5 */
0x02090042 0x03010029 0x0302003c 0x03030006
/* F5 6 - \ */
0x0304003f 0x03060007 0x0308000c 0x030b002b
/* R_CTRL A D F */
0x04000061 0x0401001e 0x04020020 0x04030021
/* S K J ; */
0x0404001f 0x04050025 0x04060024 0x04080027
/* L ENTER Z C */
0x04090026 0x040b001c 0x0501002c 0x0502002e
/* V X , M */
0x0503002f 0x0504002d 0x05050033 0x05060032
/* L_SHIFT / . SPACE */
0x0507002a 0x05080035 0x05090034 0x050B0039
/* 1 3 4 2 */
0x06010002 0x06020004 0x06030005 0x06040003
/* 8 7 0 9 */
0x06050009 0x06060008 0x0608000b 0x0609000a
/* L_ALT DOWN RIGHT Q */
0x060a0038 0x060b006c 0x060c006a 0x07010010
/* E R W I */
0x07020012 0x07030013 0x07040011 0x07050017
/* U R_SHIFT P O */
0x07060016 0x07070036 0x07080019 0x07090018
/* UP LEFT */
0x070b0067 0x070c0069>;
};
Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml
View file @ d4fe9117
......@@ -94,12 +94,12 @@ properties:
instances.
required:
- compatible
- reg
- interrupts
- interrupt-names
- interrupt-controller
- "#interrupt-cells"
- compatible
- reg
- interrupts
- interrupt-names
- interrupt-controller
- "#interrupt-cells"
additionalProperties: false
......
Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
View file @ d4fe9117
......@@ -79,6 +79,8 @@ required:
- ti,sci-dev-id
- ti,interrupt-ranges
unevaluatedProperties: false
examples:
- |
bus {
......
Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
View file @ d4fe9117
......@@ -88,6 +88,8 @@ required:
- ti,sci-dev-id
- ti,interrupt-ranges
unevaluatedProperties: false
examples:
- |
main_gpio_intr: interrupt-controller0 {
......
Documentation/devicetree/bindings/leds/backlight/common.yaml
View file @ d4fe9117
......@@ -32,3 +32,5 @@ properties:
that a LED can be made so bright that it gets damaged or causes damage
due to restrictions in a specific system, such as mounting conditions.
$ref: /schemas/types.yaml#definitions/uint32
additionalProperties: true
Documentation/devicetree/bindings/leds/common.yaml
View file @ d4fe9117
......@@ -43,7 +43,7 @@ properties:
LED_COLOR_ID available, add a new one.
$ref: /schemas/types.yaml#definitions/uint32
minimum: 0
maximum: 8
maximum: 9
function-enumerator:
description:
......
Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
View file @ d4fe9117
......@@ -16,7 +16,7 @@ description: |
modules. This is achieved by adding multi-led nodes layer to the
monochrome LED bindings.
The nodes and properties defined in this document are unique to the multicolor
LED class. Common LED nodes and properties are inherited from the common.txt
LED class. Common LED nodes and properties are inherited from the common.yaml
within this documentation directory.
patternProperties:
......@@ -25,10 +25,11 @@ patternProperties:
description: Represents the LEDs that are to be grouped.
properties:
color:
const: 8 # LED_COLOR_ID_MULTI
description: |
For multicolor LED support this property should be defined as
LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h.
For multicolor LED support this property should be defined as either
LED_COLOR_ID_RGB or LED_COLOR_ID_MULTI which can be found in
include/linux/leds/common.h.
enum: [ 8, 9 ]
$ref: "common.yaml#"
......
Documentation/devicetree/bindings/leds/leds-lp50xx.yaml
View file @ d4fe9117
......@@ -46,6 +46,12 @@ properties:
vled-supply:
description: LED supply.
'#address-cells':
const: 1
'#size-cells':
const: 0
patternProperties:
'^multi-led@[0-9a-f]$':
type: object
......@@ -69,6 +75,8 @@ required:
- compatible
- reg
additionalProperties: false
examples:
- |
#include <dt-bindings/gpio/gpio.h>
......
Documentation/devicetree/bindings/mailbox/mtk-gce.txt
View file @ d4fe9117
......@@ -47,7 +47,7 @@ Example:
interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_LOW>;
clocks = <&infracfg CLK_INFRA_GCE>;
clock-names = "gce";
#mbox-cells = <3>;
#mbox-cells = <2>;
};
Example for a client device:
......
Documentation/devicetree/bindings/mfd/ene-kb3930.yaml
View file @ d4fe9117
......@@ -17,7 +17,7 @@ properties:
compatible:
items:
- enum:
- dell,wyse-ariel-ec # Dell Wyse Ariel board (3020)
- dell,wyse-ariel-ec # Dell Wyse Ariel board (3020)
- const: ene,kb3930
reg:
maxItems: 1
......
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
View file @ d4fe9117
......@@ -59,6 +59,14 @@ properties:
whether this nvram is present or not.
type: boolean
mtk,rpmsg-name:
description:
Must be defined if the cros-ec is a rpmsg device for a Mediatek
ARM Cortex M4 Co-processor. Contains the name pf the rpmsg
device. Used to match the subnode to the rpmsg device announced by
the SCP.
$ref: "/schemas/types.yaml#/definitions/string"
spi-max-frequency:
description: Maximum SPI frequency of the device in Hz.
......@@ -71,6 +79,54 @@ properties:
wakeup-source:
description: Button can wake-up the system.
'#address-cells':
const: 1
'#size-cells':
const: 0
typec:
$ref: "/schemas/chrome/google,cros-ec-typec.yaml#"
ec-pwm:
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
keyboard-controller:
$ref: "/schemas/input/google,cros-ec-keyb.yaml#"
codecs:
type: object
additionalProperties: false
properties:
'#address-cells':
const: 2
'#size-cells':
const: 1
patternProperties:
"^ec-codec@[a-f0-9]+$":
type: object
$ref: "/schemas/sound/google,cros-ec-codec.yaml#"
required:
- "#address-cells"
- "#size-cells"
patternProperties:
"^i2c-tunnel[0-9]*$":
type: object
$ref: "/schemas/i2c/google,cros-ec-i2c-tunnel.yaml#"
"^regulator@[0-9]+$":
type: object
$ref: "/schemas/regulator/google,cros-ec-regulator.yaml#"
"^extcon[0-9]*$":
type: object
$ref: "/schemas/extcon/extcon-usbc-cros-ec.yaml#"
required:
- compatible
......
Documentation/devicetree/bindings/mips/ingenic/devices.yaml
View file @ d4fe9117
......@@ -52,4 +52,7 @@ properties:
items:
- const: yna,cu2000-neo
- const: ingenic,x2000e
additionalProperties: true
...
Documentation/devicetree/bindings/mips/loongson/devices.yaml
View file @ d4fe9117
......@@ -36,4 +36,7 @@ properties:
- description: Virtual Loongson64 Quad Core + VirtIO
items:
- const: loongson,loongson64v-4core-virtio
additionalProperties: true
...
Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml
View file @ d4fe9117
......@@ -32,11 +32,11 @@ allOf:
clock-output-names:
oneOf:
- items:
- const: clk_out_sd0
- const: clk_in_sd0
- const: clk_out_sd0
- const: clk_in_sd0
- items:
- const: clk_out_sd1
- const: clk_in_sd1
- const: clk_out_sd1
- const: clk_in_sd1
properties:
compatible:
......
Documentation/devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml
View file @ d4fe9117
......@@ -46,6 +46,8 @@ required:
- clocks
- clock-names
unevaluatedProperties: false
examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
......
Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
View file @ d4fe9117
......@@ -3,7 +3,7 @@
%YAML 1.2
---
$id: "http://devicetree.org/schemas/mmc/sdhci-am654.yaml#"
$schema : "http://devicetree.org/meta-schemas/core.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: TI AM654 MMC Controller
......@@ -163,13 +163,12 @@ properties:
ti,driver-strength-ohm:
description: DLL drive strength in ohms
$ref: "/schemas/types.yaml#/definitions/uint32"
oneOf:
- enum:
- 33
- 40
- 50
- 66
- 100
enum:
- 33
- 40
- 50
- 66
- 100
ti,strobe-sel:
description: strobe select delay for HS400 speed mode.
......@@ -187,6 +186,8 @@ required:
- clock-names
- ti,otap-del-sel-legacy
unevaluatedProperties: false
examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
......
Documentation/devicetree/bindings/net/intel,dwmac-plat.yaml
View file @ d4fe9117
......@@ -46,6 +46,8 @@ required:
- clocks
- clock-names
unevaluatedProperties: false
examples:
# FIXME: Remove defines and include the correct header file
# once it is available in mainline.
......
Documentation/devicetree/bindings/net/ti,dp83822.yaml
View file @ d4fe9117
......@@ -65,6 +65,8 @@ properties:
required:
- reg
unevaluatedProperties: false
examples:
- |
mdio0 {
......
Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml
View file @ d4fe9117
......@@ -29,16 +29,16 @@ properties:
reg-names:
oneOf:
- items:
- const: dbi
- const: dbi2
- const: link
- const: addr_space
- const: dbi
- const: dbi2
- const: link
- const: addr_space
- items:
- const: dbi
- const: dbi2
- const: link
- const: addr_space
- const: atu
- const: dbi
- const: dbi2
- const: link
- const: addr_space
- const: atu
clocks:
maxItems: 2
......
Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
View file @ d4fe9117
......@@ -31,10 +31,10 @@ properties:
clock-names:
oneOf:
- items: # for PXs2
- const: link
- const: link
- items: # for others
- const: link
- const: phy
- const: link
- const: phy
resets:
maxItems: 2
......
Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml
View file @ d4fe9117
......@@ -7,23 +7,23 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: OMAP USB2 PHY
maintainers:
- Kishon Vijay Abraham I <kishon@ti.com>
- Roger Quadros <rogerq@ti.com>
- Kishon Vijay Abraham I <kishon@ti.com>
- Roger Quadros <rogerq@ti.com>
properties:
compatible:
oneOf:
- items:
- enum:
- ti,dra7x-usb2
- ti,dra7x-usb2-phy2
- ti,am654-usb2
- enum:
- ti,omap-usb2
- enum:
- ti,dra7x-usb2
- ti,dra7x-usb2-phy2
- ti,am654-usb2
- enum:
- ti,omap-usb2
- items:
- const: ti,am437x-usb2
- const: ti,am437x-usb2
- items:
- const: ti,omap-usb2
- const: ti,omap-usb2
reg:
maxItems: 1
......@@ -62,6 +62,8 @@ required:
- clocks
- clock-names
additionalProperties: false
examples:
- |
usb0_phy: phy@4100000 {
......
Documentation/devicetree/bindings/pinctrl/actions,s500-pinctrl.yaml
View file @ d4fe9117
......@@ -76,22 +76,22 @@ patternProperties:
items:
oneOf:
- enum: [lcd0_d18_mfp, rmii_crs_dv_mfp, rmii_txd0_mfp,
rmii_txd1_mfp, rmii_txen_mfp, rmii_rxen_mfp, rmii_rxd1_mfp,
rmii_rxd0_mfp, rmii_ref_clk_mfp, i2s_d0_mfp, i2s_pcm1_mfp,
i2s0_pcm0_mfp, i2s1_pcm0_mfp, i2s_d1_mfp, ks_in2_mfp,
ks_in1_mfp, ks_in0_mfp, ks_in3_mfp, ks_out0_mfp,
ks_out1_mfp, ks_out2_mfp, lvds_o_pn_mfp, dsi_dn0_mfp,
dsi_dp2_mfp, lcd0_d17_mfp, dsi_dp3_mfp, dsi_dn3_mfp,
dsi_dp0_mfp, lvds_ee_pn_mfp, spi0_i2c_pcm_mfp,
spi0_i2s_pcm_mfp, dsi_dnp1_cp_mfp, lvds_e_pn_mfp,
dsi_dn2_mfp, uart2_rtsb_mfp, uart2_ctsb_mfp, uart3_rtsb_mfp,
uart3_ctsb_mfp, sd0_d0_mfp, sd0_d1_mfp, sd0_d2_d3_mfp,
sd1_d0_d3_mfp, sd0_cmd_mfp, sd0_clk_mfp, sd1_cmd_mfp,
uart0_rx_mfp, clko_25m_mfp, csi_cn_cp_mfp, sens0_ckout_mfp,
uart0_tx_mfp, i2c0_mfp, csi_dn_dp_mfp, sen0_pclk_mfp,
pcm1_in_mfp, pcm1_clk_mfp, pcm1_sync_mfp, pcm1_out_mfp,
dnand_data_wr_mfp, dnand_acle_ce0_mfp, nand_ceb2_mfp,
nand_ceb3_mfp]
rmii_txd1_mfp, rmii_txen_mfp, rmii_rxen_mfp, rmii_rxd1_mfp,
rmii_rxd0_mfp, rmii_ref_clk_mfp, i2s_d0_mfp, i2s_pcm1_mfp,
i2s0_pcm0_mfp, i2s1_pcm0_mfp, i2s_d1_mfp, ks_in2_mfp,
ks_in1_mfp, ks_in0_mfp, ks_in3_mfp, ks_out0_mfp,
ks_out1_mfp, ks_out2_mfp, lvds_o_pn_mfp, dsi_dn0_mfp,
dsi_dp2_mfp, lcd0_d17_mfp, dsi_dp3_mfp, dsi_dn3_mfp,
dsi_dp0_mfp, lvds_ee_pn_mfp, spi0_i2c_pcm_mfp,
spi0_i2s_pcm_mfp, dsi_dnp1_cp_mfp, lvds_e_pn_mfp,
dsi_dn2_mfp, uart2_rtsb_mfp, uart2_ctsb_mfp, uart3_rtsb_mfp,
uart3_ctsb_mfp, sd0_d0_mfp, sd0_d1_mfp, sd0_d2_d3_mfp,
sd1_d0_d3_mfp, sd0_cmd_mfp, sd0_clk_mfp, sd1_cmd_mfp,
uart0_rx_mfp, clko_25m_mfp, csi_cn_cp_mfp, sens0_ckout_mfp,
uart0_tx_mfp, i2c0_mfp, csi_dn_dp_mfp, sen0_pclk_mfp,
pcm1_in_mfp, pcm1_clk_mfp, pcm1_sync_mfp, pcm1_out_mfp,
dnand_data_wr_mfp, dnand_acle_ce0_mfp, nand_ceb2_mfp,
nand_ceb3_mfp]
minItems: 1
maxItems: 32
......@@ -100,10 +100,10 @@ patternProperties:
Specify the alternative function to be configured for the
given gpio pin groups.
enum: [nor, eth_rmii, eth_smii, spi0, spi1, spi2, spi3, sens0,
sens1, uart0, uart1, uart2, uart3, uart4, uart5, uart6, i2s0,
i2s1, pcm1, pcm0, ks, jtag, pwm0, pwm1, pwm2, pwm3, pwm4, pwm5,
p0, sd0, sd1, sd2, i2c0, i2c1, i2c3, dsi, lvds, usb30, clko_25m,
mipi_csi, nand, spdif, ts, lcd0]
sens1, uart0, uart1, uart2, uart3, uart4, uart5, uart6, i2s0,
i2s1, pcm1, pcm0, ks, jtag, pwm0, pwm1, pwm2, pwm3, pwm4, pwm5,
p0, sd0, sd1, sd2, i2c0, i2c1, i2c3, dsi, lvds, usb30, clko_25m,
mipi_csi, nand, spdif, ts, lcd0]
required:
- groups
......@@ -126,14 +126,14 @@ patternProperties:
items:
oneOf:
- enum: [sirq_drv, rmii_txd01_txen_drv, rmii_rxer_drv,
rmii_crs_drv, rmii_rxd10_drv, rmii_ref_clk_drv,
smi_mdc_mdio_drv, i2s_d0_drv, i2s_bclk0_drv, i2s3_drv,
i2s13_drv, pcm1_drv, ks_in_drv, ks_out_drv, lvds_all_drv,
lcd_dsi_drv, dsi_drv, sd0_d0_d3_drv, sd1_d0_d3_drv,
sd0_cmd_drv, sd0_clk_drv, sd1_cmd_drv, sd1_clk_drv,
spi0_all_drv, uart0_rx_drv, uart0_tx_drv, uart2_all_drv,
i2c0_all_drv, i2c12_all_drv, sens0_pclk_drv,
sens0_ckout_drv, uart3_all_drv]
rmii_crs_drv, rmii_rxd10_drv, rmii_ref_clk_drv,
smi_mdc_mdio_drv, i2s_d0_drv, i2s_bclk0_drv, i2s3_drv,
i2s13_drv, pcm1_drv, ks_in_drv, ks_out_drv, lvds_all_drv,
lcd_dsi_drv, dsi_drv, sd0_d0_d3_drv, sd1_d0_d3_drv,
sd0_cmd_drv, sd0_clk_drv, sd1_cmd_drv, sd1_clk_drv,
spi0_all_drv, uart0_rx_drv, uart0_tx_drv, uart2_all_drv,
i2c0_all_drv, i2c12_all_drv, sens0_pclk_drv,
sens0_ckout_drv, uart3_all_drv]
minItems: 1
maxItems: 32
......@@ -144,29 +144,29 @@ patternProperties:
items:
oneOf:
- enum: [dnand_dqs, dnand_dqsn, eth_txd0, eth_txd1, eth_txen,
eth_rxer, eth_crs_dv, eth_rxd1, eth_rxd0, eth_ref_clk,
eth_mdc, eth_mdio, sirq0, sirq1, sirq2, i2s_d0, i2s_bclk0,
i2s_lrclk0, i2s_mclk0, i2s_d1, i2s_bclk1, i2s_lrclk1,
i2s_mclk1, ks_in0, ks_in1, ks_in2, ks_in3, ks_out0, ks_out1,
ks_out2, lvds_oep, lvds_oen, lvds_odp, lvds_odn, lvds_ocp,
lvds_ocn, lvds_obp, lvds_obn, lvds_oap, lvds_oan, lvds_eep,
lvds_een, lvds_edp, lvds_edn, lvds_ecp, lvds_ecn, lvds_ebp,
lvds_ebn, lvds_eap, lvds_ean, lcd0_d18, lcd0_d17, dsi_dp3,
dsi_dn3, dsi_dp1, dsi_dn1, dsi_cp, dsi_cn, dsi_dp0, dsi_dn0,
dsi_dp2, dsi_dn2, sd0_d0, sd0_d1, sd0_d2, sd0_d3, sd1_d0,
sd1_d1, sd1_d2, sd1_d3, sd0_cmd, sd0_clk, sd1_cmd, sd1_clk,
spi0_sclk, spi0_ss, spi0_miso, spi0_mosi, uart0_rx,
uart0_tx, i2c0_sclk, i2c0_sdata, sensor0_pclk,
sensor0_ckout, dnand_ale, dnand_cle, dnand_ceb0, dnand_ceb1,
dnand_ceb2, dnand_ceb3, uart2_rx, uart2_tx, uart2_rtsb,
uart2_ctsb, uart3_rx, uart3_tx, uart3_rtsb, uart3_ctsb,
pcm1_in, pcm1_clk, pcm1_sync, pcm1_out, i2c1_sclk,
i2c1_sdata, i2c2_sclk, i2c2_sdata, csi_dn0, csi_dp0,
csi_dn1, csi_dp1, csi_dn2, csi_dp2, csi_dn3, csi_dp3,
csi_cn, csi_cp, dnand_d0, dnand_d1, dnand_d2, dnand_d3,
dnand_d4, dnand_d5, dnand_d6, dnand_d7, dnand_rb, dnand_rdb,
dnand_rdbn, dnand_wrb, porb, clko_25m, bsel, pkg0, pkg1,
pkg2, pkg3]
eth_rxer, eth_crs_dv, eth_rxd1, eth_rxd0, eth_ref_clk,
eth_mdc, eth_mdio, sirq0, sirq1, sirq2, i2s_d0, i2s_bclk0,
i2s_lrclk0, i2s_mclk0, i2s_d1, i2s_bclk1, i2s_lrclk1,
i2s_mclk1, ks_in0, ks_in1, ks_in2, ks_in3, ks_out0, ks_out1,
ks_out2, lvds_oep, lvds_oen, lvds_odp, lvds_odn, lvds_ocp,
lvds_ocn, lvds_obp, lvds_obn, lvds_oap, lvds_oan, lvds_eep,
lvds_een, lvds_edp, lvds_edn, lvds_ecp, lvds_ecn, lvds_ebp,
lvds_ebn, lvds_eap, lvds_ean, lcd0_d18, lcd0_d17, dsi_dp3,
dsi_dn3, dsi_dp1, dsi_dn1, dsi_cp, dsi_cn, dsi_dp0, dsi_dn0,
dsi_dp2, dsi_dn2, sd0_d0, sd0_d1, sd0_d2, sd0_d3, sd1_d0,
sd1_d1, sd1_d2, sd1_d3, sd0_cmd, sd0_clk, sd1_cmd, sd1_clk,
spi0_sclk, spi0_ss, spi0_miso, spi0_mosi, uart0_rx,
uart0_tx, i2c0_sclk, i2c0_sdata, sensor0_pclk,
sensor0_ckout, dnand_ale, dnand_cle, dnand_ceb0, dnand_ceb1,
dnand_ceb2, dnand_ceb3, uart2_rx, uart2_tx, uart2_rtsb,
uart2_ctsb, uart3_rx, uart3_tx, uart3_rtsb, uart3_ctsb,
pcm1_in, pcm1_clk, pcm1_sync, pcm1_out, i2c1_sclk,
i2c1_sdata, i2c2_sclk, i2c2_sdata, csi_dn0, csi_dp0,
csi_dn1, csi_dp1, csi_dn2, csi_dp2, csi_dn3, csi_dp3,
csi_cn, csi_cp, dnand_d0, dnand_d1, dnand_d2, dnand_d3,
dnand_d4, dnand_d5, dnand_d6, dnand_d7, dnand_rb, dnand_rdb,
dnand_rdbn, dnand_wrb, porb, clko_25m, bsel, pkg0, pkg1,
pkg2, pkg3]
minItems: 1
maxItems: 64
......
Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml
View file @ d4fe9117
......@@ -106,7 +106,7 @@ patternProperties:
required:
- pinmux
additionalProperties: false
additionalProperties: false
required:
- compatible
......
Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml
View file @ d4fe9117
......@@ -71,9 +71,9 @@ patternProperties:
Specify the alternative function to be configured for the specified
pins. Functions are only valid for gpio pins.
enum: [ gpio, cci_i2c0, blsp_uim1, blsp_uim2, blsp_uim3, blsp_uim5,
blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c5, blsp_spi1,
blsp_spi2, blsp_spi3, blsp_spi5, blsp_uart1, blsp_uart2,
blsp_uart3, blsp_uart5, cam_mclk0, cam_mclk1, wlan ]
blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c5, blsp_spi1,
blsp_spi2, blsp_spi3, blsp_spi5, blsp_uart1, blsp_uart2,
blsp_uart3, blsp_uart5, cam_mclk0, cam_mclk1, wlan ]
drive-strength:
enum: [2, 4, 6, 8, 10, 12, 14, 16]
......
Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
View file @ d4fe9117
......@@ -40,24 +40,24 @@ patternProperties:
Function to mux.
$ref: "/schemas/types.yaml#/definitions/string"
enum: [i2c0, i2c1, i2c2, i2c3, i2c4, i2c5, i2c6, i2c7, i2c8,
spi0, spi1, spi2, spi3, spi4, spi5, spi6,
uart0, uart1, uart2, uart3, pwm, pcmif_out, pcmif_in]
spi0, spi1, spi2, spi3, spi4, spi5, spi6,
uart0, uart1, uart2, uart3, pwm, pcmif_out, pcmif_in]
groups:
description:
Name of the pin group to use for the functions.
$ref: "/schemas/types.yaml#/definitions/string"
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
drive-strength:
enum: [2, 4, 6, 8, 16, 24, 32]
......
Documentation/devicetree/bindings/power/reset/reboot-mode.yaml
View file @ d4fe9117
......@@ -28,14 +28,16 @@ description: |
properties:
mode-normal:
$ref: /schemas/types.yaml#/definitions/uint32
description: |
Default value to set on a reboot if no command was provided.
$ref: /schemas/types.yaml#/definitions/uint32
description:
Default value to set on a reboot if no command was provided.
patternProperties:
"^mode-.*$":
$ref: /schemas/types.yaml#/definitions/uint32
additionalProperties: false
examples:
- |
reboot-mode {
......
Documentation/devicetree/bindings/power/supply/ingenic,battery.yaml
View file @ d4fe9117
......@@ -15,10 +15,10 @@ properties:
oneOf:
- const: ingenic,jz4740-battery
- items:
- enum:
- ingenic,jz4725b-battery
- ingenic,jz4770-battery
- const: ingenic,jz4740-battery
- enum:
- ingenic,jz4725b-battery
- ingenic,jz4770-battery
- const: ingenic,jz4740-battery
io-channels:
maxItems: 1
......
Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
View file @ d4fe9117
......@@ -84,12 +84,12 @@ allOf:
then:
properties:
summit,mains-current-limit-microamp:
enum: [ 300000, 500000, 700000, 1000000,
1500000, 1800000, 2000000]
enum: [ 300000, 500000, 700000, 1000000,
1500000, 1800000, 2000000]
summit,usb-current-limit-microamp:
enum: [ 300000, 500000, 700000, 1000000,
1500000, 1800000, 2000000]
enum: [ 300000, 500000, 700000, 1000000,
1500000, 1800000, 2000000]
summit,charge-current-compensation-microamp:
enum: [200000, 450000, 600000, 900000]
......@@ -97,12 +97,12 @@ allOf:
else:
properties:
summit,mains-current-limit-microamp:
enum: [ 300000, 500000, 700000, 900000, 1200000,
1500000, 1800000, 2000000, 2200000, 2500000]
enum: [ 300000, 500000, 700000, 900000, 1200000,
1500000, 1800000, 2000000, 2200000, 2500000]
summit,usb-current-limit-microamp:
enum: [ 300000, 500000, 700000, 900000, 1200000,
1500000, 1800000, 2000000, 2200000, 2500000]
enum: [ 300000, 500000, 700000, 900000, 1200000,
1500000, 1800000, 2000000, 2200000, 2500000]
summit,charge-current-compensation-microamp:
enum: [250000, 700000, 900000, 1200000]
......
Documentation/devicetree/bindings/regulator/mps,mp886x.yaml
View file @ d4fe9117
......@@ -41,6 +41,8 @@ required:
- enable-gpios
- mps,fb-voltage-divider
unevaluatedProperties: false
examples:
- |
#include <dt-bindings/gpio/gpio.h>
......
Documentation/devicetree/bindings/regulator/pfuze100.yaml
View file @ d4fe9117
......@@ -80,6 +80,8 @@ required:
- compatible
- reg
additionalProperties: false
examples:
- |
i2c {
......
Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml
View file @ d4fe9117
......@@ -25,8 +25,8 @@ select:
properties:
compatible:
items:
- enum:
- sifive,fu540-c000-ccache
- enum:
- sifive,fu540-c000-ccache
required:
- compatible
......
Documentation/devicetree/bindings/riscv/sifive.yaml
View file @ d4fe9117
......@@ -22,4 +22,7 @@ properties:
- sifive,hifive-unleashed-a00
- const: sifive,fu540-c000
- const: sifive,fu540
additionalProperties: true
...
Documentation/devicetree/bindings/rng/imx-rng.yaml
View file @ d4fe9117
......@@ -19,9 +19,9 @@ properties:
- const: fsl,imx21-rnga
- items:
- enum:
- fsl,imx6sl-rngb
- fsl,imx6sll-rngb
- fsl,imx6ull-rngb
- fsl,imx6sl-rngb
- fsl,imx6sll-rngb
- fsl,imx6ull-rngb
- const: fsl,imx25-rngb
- const: fsl,imx35-rngc
......
Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
View file @ d4fe9117
......@@ -20,30 +20,30 @@ properties:
- const: fsl,imx21-uart
- items:
- enum:
- fsl,imx25-uart
- fsl,imx27-uart
- fsl,imx31-uart
- fsl,imx35-uart
- fsl,imx50-uart
- fsl,imx51-uart
- fsl,imx53-uart
- fsl,imx6q-uart
- fsl,imx25-uart
- fsl,imx27-uart
- fsl,imx31-uart
- fsl,imx35-uart
- fsl,imx50-uart
- fsl,imx51-uart
- fsl,imx53-uart
- fsl,imx6q-uart
- const: fsl,imx21-uart
- items:
- enum:
- fsl,imx6sl-uart
- fsl,imx6sll-uart
- fsl,imx6sx-uart
- fsl,imx6sl-uart
- fsl,imx6sll-uart
- fsl,imx6sx-uart
- const: fsl,imx6q-uart
- const: fsl,imx21-uart
- items:
- enum:
- fsl,imx6ul-uart
- fsl,imx7d-uart
- fsl,imx8mm-uart
- fsl,imx8mn-uart
- fsl,imx8mp-uart
- fsl,imx8mq-uart
- fsl,imx6ul-uart
- fsl,imx7d-uart
- fsl,imx8mm-uart
- fsl,imx8mn-uart
- fsl,imx8mp-uart
- fsl,imx8mq-uart
- const: fsl,imx6q-uart
reg:
......
Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
View file @ d4fe9117
......@@ -11,9 +11,10 @@ maintainers:
description: |
Google's ChromeOS EC codec is a digital mic codec provided by the
Embedded Controller (EC) and is controlled via a host-command interface.
An EC codec node should only be found as a sub-node of the EC node (see
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml).
Embedded Controller (EC) and is controlled via a host-command
interface. An EC codec node should only be found inside the "codecs"
subnode of a cros-ec node.
(see Documentation/devicetree/bindings/mfd/google,cros-ec.yaml).
properties:
compatible:
......@@ -54,14 +55,19 @@ examples:
#size-cells = <0>;
cros-ec@0 {
compatible = "google,cros-ec-spi";
#address-cells = <2>;
#size-cells = <1>;
reg = <0>;
cros_ec_codec: ec-codec@10500000 {
compatible = "google,cros-ec-codec";
#sound-dai-cells = <1>;
reg = <0x0 0x10500000 0x80000>;
memory-region = <&reserved_mem>;
codecs {
#address-cells = <2>;
#size-cells = <1>;
cros_ec_codec: ec-codec@10500000 {
compatible = "google,cros-ec-codec";
#sound-dai-cells = <1>;
reg = <0x0 0x10500000 0x80000>;
memory-region = <&reserved_mem>;
};
};
};
};
Documentation/devicetree/bindings/sound/mchp,spdifrx.yaml
View file @ d4fe9117
......@@ -10,8 +10,8 @@ maintainers:
- Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
description:
The Microchip Sony/Philips Digital Interface Receiver is a
serial port compliant with the IEC-60958 standard.
The Microchip Sony/Philips Digital Interface Receiver is a serial port
compliant with the IEC-60958 standard.
properties:
"#sound-dai-cells":
......
Documentation/devicetree/bindings/sound/mchp,spdiftx.yaml
View file @ d4fe9117
......@@ -10,8 +10,8 @@ maintainers:
- Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
description:
The Microchip Sony/Philips Digital Interface Transmitter is a
serial port compliant with the IEC-60958 standard.
The Microchip Sony/Philips Digital Interface Transmitter is a serial port
compliant with the IEC-60958 standard.
properties:
"#sound-dai-cells":
......
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml
View file @ d4fe9117
......@@ -26,8 +26,10 @@ properties:
reg:
maxItems: 2
description: LPAIF core registers
reg-names:
maxItems: 2
maxItems: 2
clocks:
minItems: 3
maxItems: 6
......@@ -39,8 +41,10 @@ properties:
interrupts:
maxItems: 2
description: LPAIF DMA buffer interrupt
interrupt-names:
maxItems: 2
qcom,adsp:
$ref: /schemas/types.yaml#/definitions/phandle
description: Phandle for the audio DSP node
......@@ -141,31 +145,31 @@ allOf:
properties:
clock-names:
oneOf:
- items: #for I2S
- const: pcnoc-sway-clk
- const: audio-core
- const: mclk0
- const: pcnoc-mport-clk
- const: mi2s-bit-clk0
- const: mi2s-bit-clk1
- items: #for HDMI
- const: pcnoc-sway-clk
- const: audio-core
- const: pcnoc-mport-clk
- items: #for I2S
- const: pcnoc-sway-clk
- const: audio-core
- const: mclk0
- const: pcnoc-mport-clk
- const: mi2s-bit-clk0
- const: mi2s-bit-clk1
- items: #for HDMI
- const: pcnoc-sway-clk
- const: audio-core
- const: pcnoc-mport-clk
reg-names:
anyOf:
- items: #for I2S
- const: lpass-lpaif
- const: lpass-lpaif
- items: #for I2S and HDMI
- const: lpass-hdmiif
- const: lpass-lpaif
- const: lpass-hdmiif
- const: lpass-lpaif
interrupt-names:
anyOf:
- items: #for I2S
- const: lpass-irq-lpaif
- const: lpass-irq-lpaif
- items: #for I2S and HDMI
- const: lpass-irq-lpaif
- const: lpass-irq-hdmi
- const: lpass-irq-lpaif
- const: lpass-irq-hdmi
required:
- iommus
- power-domains
......
Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml
View file @ d4fe9117
......@@ -26,6 +26,8 @@ properties:
required:
- compatible
additionalProperties: false
examples:
- |
#include <dt-bindings/gpio/gpio.h>
......
Documentation/devicetree/bindings/timer/arm,sp804.yaml
View file @ d4fe9117
......@@ -33,8 +33,8 @@ properties:
compatible:
items:
- enum:
- arm,sp804
- hisilicon,sp804
- arm,sp804
- hisilicon,sp804
- const: arm,primecell
interrupts:
......@@ -58,11 +58,11 @@ properties:
clock is used for all clock inputs.
oneOf:
- items:
- description: clock for timer 1
- description: clock for timer 2
- description: bus clock
- description: clock for timer 1
- description: clock for timer 2
- description: bus clock
- items:
- description: unified clock for both timers and the bus
- description: unified clock for both timers and the bus
clock-names: true
# The original binding did not specify any clock names, and there is no
......
Documentation/devicetree/bindings/usb/cdns,usb3.yaml
View file @ d4fe9117
......@@ -44,8 +44,8 @@ properties:
enum: [super-speed, high-speed, full-speed]
phys:
minItems: 1
maxItems: 2
minItems: 1
maxItems: 2
phy-names:
minItems: 1
......
Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml
View file @ d4fe9117
......@@ -17,7 +17,7 @@ description: |-
properties:
compatible:
const: ti,hd3ss3220
const: ti,hd3ss3220
reg:
maxItems: 1
......
Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml
View file @ d4fe9117
......@@ -15,10 +15,10 @@ properties:
- const: fsl,imx21-owire
- items:
- enum:
- fsl,imx27-owire
- fsl,imx50-owire
- fsl,imx51-owire
- fsl,imx53-owire
- fsl,imx27-owire
- fsl,imx50-owire
- fsl,imx51-owire
- fsl,imx53-owire
- const: fsl,imx21-owire
reg:
......
arch/arm/kernel/vmlinux.lds.S
View file @ d4fe9117
......@@ -40,6 +40,10 @@ SECTIONS
ARM_DISCARD
#ifndef CONFIG_SMP_ON_UP
*(.alt.smp.init)
#endif
#ifndef CONFIG_ARM_UNWIND
*(.ARM.exidx) *(.ARM.exidx.*)
*(.ARM.extab) *(.ARM.extab.*)
#endif
}
......
arch/x86/entry/syscalls/syscall_64.tbl
View file @ d4fe9117
......@@ -364,10 +364,10 @@
440 common process_madvise sys_process_madvise
#
# x32-specific system call numbers start at 512 to avoid cache impact
# for native 64-bit operation. The __x32_compat_sys stubs are created
# on-the-fly for compat_sys_*() compatibility system calls if X86_X32
# is defined.
# Due to a historical design error, certain syscalls are numbered differently
# in x32 as compared to native x86_64. These syscalls have numbers 512-547.
# Do not add new syscalls to this range. Numbers 548 and above are available
# for non-x32 use.
#
512 x32 rt_sigaction compat_sys_rt_sigaction
513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn
......@@ -405,3 +405,5 @@
545 x32 execveat compat_sys_execveat
546 x32 preadv2 compat_sys_preadv64v2
547 x32 pwritev2 compat_sys_pwritev64v2
# This is the end of the legacy x32 range. Numbers 548 and above are
# not special and are not to be used for x32-specific syscalls.
arch/x86/kernel/alternative.c
View file @ d4fe9117
......@@ -807,6 +807,15 @@ static inline temp_mm_state_t use_temporary_mm(struct mm_struct *mm)
temp_mm_state_t temp_state;
lockdep_assert_irqs_disabled();
/*
* Make sure not to be in TLB lazy mode, as otherwise we'll end up
* with a stale address space WITHOUT being in lazy mode after
* restoring the previous mm.
*/
if (this_cpu_read(cpu_tlbstate.is_lazy))
leave_mm(smp_processor_id());
temp_state.mm = this_cpu_read(cpu_tlbstate.loaded_mm);
switch_mm_irqs_off(NULL, mm, current);
......
arch/x86/kernel/kexec-bzimage64.c
View file @ d4fe9117
......@@ -200,8 +200,7 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
params->hdr.hardware_subarch = boot_params.hdr.hardware_subarch;
/* Copying screen_info will do? */
memcpy(&params->screen_info, &boot_params.screen_info,
sizeof(struct screen_info));
memcpy(&params->screen_info, &screen_info, sizeof(struct screen_info));
/* Fill in memsize later */
params->screen_info.ext_mem_k = 0;
......
arch/x86/kernel/unwind_orc.c
View file @ d4fe9117
......@@ -321,19 +321,12 @@ EXPORT_SYMBOL_GPL(unwind_get_return_address);
unsigned long *unwind_get_return_address_ptr(struct unwind_state *state)
{
struct task_struct *task = state->task;
if (unwind_done(state))
return NULL;
if (state->regs)
return &state->regs->ip;
if (task != current && state->sp == task->thread.sp) {
struct inactive_task_frame *frame = (void *)task->thread.sp;
return &frame->ret_addr;
}
if (state->sp)
return (unsigned long *)state->sp - 1;
......@@ -663,7 +656,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task,
} else {
struct inactive_task_frame *frame = (void *)task->thread.sp;
state->sp = task->thread.sp;
state->sp = task->thread.sp + sizeof(*frame);
state->bp = READ_ONCE_NOCHECK(frame->bp);
state->ip = READ_ONCE_NOCHECK(frame->ret_addr);
state->signal = (void *)state->ip == ret_from_fork;
......
drivers/of/of_reserved_mem.c
View file @ d4fe9117
......@@ -200,6 +200,16 @@ static int __init __rmem_cmp(const void *a, const void *b)
if (ra->base > rb->base)
return 1;
/*
* Put the dynamic allocations (address == 0, size == 0) before static
* allocations at address 0x0 so that overlap detection works
* correctly.
*/
if (ra->size < rb->size)
return -1;
if (ra->size > rb->size)
return 1;
return 0;
}
......@@ -217,8 +227,7 @@ static void __init __rmem_check_for_overlap(void)
this = &reserved_mem[i];
next = &reserved_mem[i + 1];
if (!(this->base && next->base))
continue;
if (this->base + this->size > next->base) {
phys_addr_t this_end, next_end;
......
drivers/video/fbdev/hyperv_fb.c
View file @ d4fe9117
......@@ -1114,8 +1114,15 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
getmem_done:
remove_conflicting_framebuffers(info->apertures,
KBUILD_MODNAME, false);
if (!gen2vm)
if (gen2vm) {
/* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */
screen_info.lfb_size = 0;
screen_info.lfb_base = 0;
screen_info.orig_video_isVGA = 0;
} else {
pci_dev_put(pdev);
}
kfree(info->apertures);
return 0;
......
include/asm-generic/vmlinux.lds.h
View file @ d4fe9117
......@@ -701,6 +701,7 @@
#ifdef CONFIG_CONSTRUCTORS
#define KERNEL_CTORS() . = ALIGN(8); \
__ctors_start = .; \
KEEP(*(SORT(.ctors.*))) \
KEEP(*(.ctors)) \
KEEP(*(SORT(.init_array.*))) \
KEEP(*(.init_array)) \
......
mm/process_vm_access.c
View file @ d4fe9117
......@@ -5,6 +5,7 @@
* Copyright (C) 2010-2011 Christopher Yeoh <cyeoh@au1.ibm.com>, IBM Corp.
*/
#include <linux/compat.h>
#include <linux/mm.h>
#include <linux/uio.h>
#include <linux/sched.h>
......@@ -273,7 +274,8 @@ static ssize_t process_vm_rw(pid_t pid,
return rc;
if (!iov_iter_count(&iter))
goto free_iov_l;
iov_r = iovec_from_user(rvec, riovcnt, UIO_FASTIOV, iovstack_r, false);
iov_r = iovec_from_user(rvec, riovcnt, UIO_FASTIOV, iovstack_r,
in_compat_syscall());
if (IS_ERR(iov_r)) {
rc = PTR_ERR(iov_r);
goto free_iov_l;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7