forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. No conflicts, or adjacent changes. Signed-off-by: Jakub Kicinski <[email protected]>
- Loading branch information
Showing
613 changed files
with
13,092 additions
and
4,251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,31 +14,30 @@ description: The Nomadik I2C host controller began its life in the ST | |
| maintainers: | ||
| - Linus Walleij <[email protected]> | ||
|
|
||
| allOf: | ||
| - $ref: /schemas/i2c/i2c-controller.yaml# | ||
|
|
||
| # Need a custom select here or 'arm,primecell' will match on lots of nodes | ||
| select: | ||
| properties: | ||
| compatible: | ||
| contains: | ||
| enum: | ||
| - st,nomadik-i2c | ||
| - mobileye,eyeq5-i2c | ||
| required: | ||
| - compatible | ||
|
|
||
| properties: | ||
| compatible: | ||
| oneOf: | ||
| # The variant found in STn8815 | ||
| - items: | ||
| - const: st,nomadik-i2c | ||
| - const: arm,primecell | ||
| # The variant found in DB8500 | ||
| - items: | ||
| - const: stericsson,db8500-i2c | ||
| - const: st,nomadik-i2c | ||
| - const: arm,primecell | ||
| - items: | ||
| - const: mobileye,eyeq5-i2c | ||
| - const: arm,primecell | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
@@ -55,7 +54,7 @@ properties: | |
| - items: | ||
| - const: mclk | ||
| - const: apb_pclk | ||
| # Clock name in DB8500 | ||
| # Clock name in DB8500 or EyeQ5 | ||
| - items: | ||
| - const: i2cclk | ||
| - const: apb_pclk | ||
|
|
@@ -70,6 +69,16 @@ properties: | |
| minimum: 1 | ||
| maximum: 400000 | ||
|
|
||
| mobileye,olb: | ||
| $ref: /schemas/types.yaml#/definitions/phandle-array | ||
| items: | ||
| - items: | ||
| - description: Phandle to OLB system controller node. | ||
| - description: Platform-wide controller ID (integer starting from zero). | ||
| description: | ||
| The phandle pointing to OLB system controller node, with the I2C | ||
| controller index. | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
|
|
@@ -79,6 +88,20 @@ required: | |
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| allOf: | ||
| - $ref: /schemas/i2c/i2c-controller.yaml# | ||
| - if: | ||
| properties: | ||
| compatible: | ||
| contains: | ||
| const: mobileye,eyeq5-i2c | ||
| then: | ||
| required: | ||
| - mobileye,olb | ||
| else: | ||
| properties: | ||
| mobileye,olb: false | ||
|
|
||
| examples: | ||
| - | | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
|
|
@@ -111,5 +134,19 @@ examples: | |
| clocks = <&i2c0clk>, <&pclki2c0>; | ||
| clock-names = "mclk", "apb_pclk"; | ||
| }; | ||
| - | | ||
| #include <dt-bindings/interrupt-controller/mips-gic.h> | ||
| i2c@300000 { | ||
| compatible = "mobileye,eyeq5-i2c", "arm,primecell"; | ||
| reg = <0x300000 0x1000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <GIC_SHARED 1 IRQ_TYPE_LEVEL_HIGH>; | ||
| clock-frequency = <400000>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| clocks = <&i2c_ser_clk>, <&i2c_clk>; | ||
| clock-names = "i2cclk", "apb_pclk"; | ||
| mobileye,olb = <&olb 0>; | ||
| }; | ||
| ... | ||
75 changes: 75 additions & 0 deletions
75
Documentation/devicetree/bindings/mtd/partitions/linux,ubi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/mtd/partitions/linux,ubi.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Unsorted Block Images | ||
|
|
||
| description: | | ||
| UBI ("Unsorted Block Images") is a volume management system for raw | ||
| flash devices which manages multiple logical volumes on a single | ||
| physical flash device and spreads the I/O load (i.e wear-leveling) | ||
| across the whole flash chip. | ||
| maintainers: | ||
| - Daniel Golle <[email protected]> | ||
|
|
||
| allOf: | ||
| - $ref: partition.yaml# | ||
|
|
||
| properties: | ||
| compatible: | ||
| const: linux,ubi | ||
|
|
||
| volumes: | ||
| type: object | ||
| description: UBI Volumes | ||
|
|
||
| patternProperties: | ||
| "^ubi-volume-.*$": | ||
| $ref: /schemas/mtd/partitions/ubi-volume.yaml# | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| required: | ||
| - compatible | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| partition@0 { | ||
| reg = <0x0 0x100000>; | ||
| label = "bootloader"; | ||
| read-only; | ||
| }; | ||
| partition@100000 { | ||
| reg = <0x100000 0x1ff00000>; | ||
| label = "ubi"; | ||
| compatible = "linux,ubi"; | ||
| volumes { | ||
| ubi-volume-caldata { | ||
| volid = <2>; | ||
| volname = "rf"; | ||
| nvmem-layout { | ||
| compatible = "fixed-layout"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| eeprom@0 { | ||
| reg = <0x0 0x1000>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
40 changes: 40 additions & 0 deletions
40
Documentation/devicetree/bindings/mtd/partitions/ubi-volume.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/mtd/partitions/ubi-volume.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: UBI volume | ||
|
|
||
| description: | | ||
| This binding describes a single UBI volume. Volumes can be matches either | ||
| by their ID or their name, or both. | ||
| maintainers: | ||
| - Daniel Golle <[email protected]> | ||
|
|
||
| properties: | ||
| volid: | ||
| $ref: /schemas/types.yaml#/definitions/uint32 | ||
| description: | ||
| Match UBI volume ID | ||
|
|
||
| volname: | ||
| $ref: /schemas/types.yaml#/definitions/string | ||
| description: | ||
| Match UBI volume ID | ||
|
|
||
| nvmem-layout: | ||
| $ref: /schemas/nvmem/layouts/nvmem-layout.yaml# | ||
| description: | ||
| This container may reference an NVMEM layout parser. | ||
|
|
||
| anyOf: | ||
| - required: | ||
| - volid | ||
|
|
||
| - required: | ||
| - volname | ||
|
|
||
| # This is a generic file other binding inherit from and extend | ||
| additionalProperties: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.