mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
Devicetree fixes for v5.13-rc:
- Several Renesas binding fixes to fix warnings - Remove duplicate compatibles in 8250 binding - Remove orphaned Sigma Designs Tango bindings - Fix bcm2711-hdmi binding to use 'additionalProperties' - Fix idt,32434-pic warning for missing 'interrupts' property - Fix 'stored but not read' warnings in DT overlay code -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmCTHlsQHHJvYmhAa2Vy bmVsLm9yZwAKCRD6+121jbxhw8zuD/0d7SB3OBDvZSd2YGGJ5MQvenDRESroh1NJ DqJt7yo6ZxnJBUQGZKa+dHRTWxgHALTVXQoT5C6dWwuELuYMqs4GUUAHKaXeLJY8 lGGAjjiedLXcxy1r2yWP6oPeNmHwGy+n27jA+KFYS2x/fR25B+Wlk3v7g1vn/GeO ucG2Zl0xyibJYfw3NL7bJQ6rtucDwsBQXiIWl8zmyGXm2rlssVSfXAeCmUPs5mCj FcetHkqr5/2xCJGlpvoVEg42Z0LOtwDeR3nTiDBrSQfX7a5lhPDTrRkl/ruv2HRy U960Mmuk7q/0j4UTuuh5iUx+0lhshvTYt3CsalXfzxOf7b0W5EVb+npM9i4JHFCb 5dXBWt+GWSk7oxIYoZc5JI+LWLktuFfkxAQ725d8USJUd/0MJusrXBHtWDc3w6q2 TSAFFQGi8/lU1HlkLKcJkGmUzchbqivQkC04La8TU4RwLmIAP+UrwUOp2ijvK6P7 s97SUzVw5+WaJ8WlF5mSEHr0ebxH3Jx6evF7QWhpUpEsA0MdMQJ2XNutZibpzikT meijyTwceyboI6bqQF1I0IDtOAF4PfucNAoBMtMgAAZ1VbD76hJpVgMqxqTe6Ws9 JpVWz2V+F7kIB1LAPVu3bl7FoskQxfJIQH0AlBftdBSXLbwGIQJDh5X1P2wqseDg QDagRM3V5w== =r+R5 -----END PGP SIGNATURE----- Merge tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull devicetree fixes from Rob Herring: - Several Renesas binding fixes to fix warnings - Remove duplicate compatibles in 8250 binding - Remove orphaned Sigma Designs Tango bindings - Fix bcm2711-hdmi binding to use 'additionalProperties' - Fix idt,32434-pic warning for missing 'interrupts' property - Fix 'stored but not read' warnings in DT overlay code * tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: net: renesas,etheravb: Fix optional second clock name dt-bindings: display: renesas,du: Add missing power-domains property dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1 dt-bindings: PCI: rcar-pci-host: Document missing R-Car H1 support of: overlay: Remove redundant assignment to ret dt-bindings: serial: 8250: Remove duplicated compatible strings dt-bindings: Remove unused Sigma Designs Tango bindings dt-bindings: bcm2711-hdmi: Fix broken schema dt-bindings: interrupt-controller: idt,32434-pic: Add missing interrupts property
This commit is contained in:
Linus Torvalds
commit
2423e142b3
@ -109,7 +109,7 @@ required:
|
||||
- resets
|
||||
- ddc
|
||||
|
||||
unevaluatedProperties: false
|
||||
additionalProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
|
||||
@ -51,6 +51,9 @@ properties:
|
||||
resets: true
|
||||
reset-names: true
|
||||
|
||||
power-domains:
|
||||
maxItems: 1
|
||||
|
||||
ports:
|
||||
$ref: /schemas/graph.yaml#/properties/port
|
||||
description: |
|
||||
|
||||
@ -22,6 +22,9 @@ properties:
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
interrupt-controller: true
|
||||
|
||||
required:
|
||||
@ -29,6 +32,7 @@ required:
|
||||
- compatible
|
||||
- reg
|
||||
- interrupt-controller
|
||||
- interrupts
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
|
||||
@ -193,23 +193,35 @@ required:
|
||||
- interrupts
|
||||
- clocks
|
||||
- power-domains
|
||||
- resets
|
||||
|
||||
if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- renesas,vin-r8a7778
|
||||
- renesas,vin-r8a7779
|
||||
- renesas,rcar-gen2-vin
|
||||
then:
|
||||
required:
|
||||
- port
|
||||
else:
|
||||
required:
|
||||
- renesas,id
|
||||
- ports
|
||||
allOf:
|
||||
- if:
|
||||
not:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- renesas,vin-r8a7778
|
||||
- renesas,vin-r8a7779
|
||||
then:
|
||||
required:
|
||||
- resets
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- renesas,vin-r8a7778
|
||||
- renesas,vin-r8a7779
|
||||
- renesas,rcar-gen2-vin
|
||||
then:
|
||||
required:
|
||||
- port
|
||||
else:
|
||||
required:
|
||||
- renesas,id
|
||||
- ports
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
Sigma Designs Tango4 NAND Flash Controller (NFC)
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible: "sigma,smp8758-nand"
|
||||
- reg: address/size of nfc_reg, nfc_mem, and pbus_reg
|
||||
- dmas: reference to the DMA channel used by the controller
|
||||
- dma-names: "rxtx"
|
||||
- clocks: reference to the system clock
|
||||
- #address-cells: <1>
|
||||
- #size-cells: <0>
|
||||
|
||||
Children nodes represent the available NAND chips.
|
||||
See Documentation/devicetree/bindings/mtd/nand-controller.yaml for generic bindings.
|
||||
|
||||
Example:
|
||||
|
||||
nandc: nand-controller@2c000 {
|
||||
compatible = "sigma,smp8758-nand";
|
||||
reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;
|
||||
dmas = <&dma0 3>;
|
||||
dma-names = "rxtx";
|
||||
clocks = <&clkgen SYS_CLK>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
nand@0 {
|
||||
reg = <0>; /* CS0 */
|
||||
nand-ecc-strength = <14>;
|
||||
nand-ecc-step-size = <1024>;
|
||||
};
|
||||
|
||||
nand@1 {
|
||||
reg = <1>; /* CS1 */
|
||||
nand-ecc-strength = <14>;
|
||||
nand-ecc-step-size = <1024>;
|
||||
};
|
||||
};
|
||||
@ -51,12 +51,12 @@ properties:
|
||||
|
||||
clocks:
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
items:
|
||||
- description: AVB functional clock
|
||||
- description: Optional TXC reference clock
|
||||
|
||||
clock-names:
|
||||
minItems: 1
|
||||
items:
|
||||
- const: fck
|
||||
- const: refclk
|
||||
|
||||
@ -17,6 +17,7 @@ allOf:
|
||||
properties:
|
||||
compatible:
|
||||
oneOf:
|
||||
- const: renesas,pcie-r8a7779 # R-Car H1
|
||||
- items:
|
||||
- enum:
|
||||
- renesas,pcie-r8a7742 # RZ/G1H
|
||||
@ -74,7 +75,16 @@ required:
|
||||
- clocks
|
||||
- clock-names
|
||||
- power-domains
|
||||
- resets
|
||||
|
||||
if:
|
||||
not:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: renesas,pcie-r8a7779
|
||||
then:
|
||||
required:
|
||||
- resets
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
Sigma Designs Tango PCIe controller
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible: "sigma,smp8759-pcie"
|
||||
- reg: address/size of PCI configuration space, address/size of register area
|
||||
- bus-range: defined by size of PCI configuration space
|
||||
- device_type: "pci"
|
||||
- #size-cells: <2>
|
||||
- #address-cells: <3>
|
||||
- msi-controller
|
||||
- ranges: translation from system to bus addresses
|
||||
- interrupts: spec for misc interrupts, spec for MSI
|
||||
|
||||
Example:
|
||||
|
||||
pcie@2e000 {
|
||||
compatible = "sigma,smp8759-pcie";
|
||||
reg = <0x50000000 0x400000>, <0x2e000 0x100>;
|
||||
bus-range = <0 3>;
|
||||
device_type = "pci";
|
||||
#size-cells = <2>;
|
||||
#address-cells = <3>;
|
||||
msi-controller;
|
||||
ranges = <0x02000000 0x0 0x00400000 0x50400000 0x0 0x3c00000>;
|
||||
interrupts =
|
||||
<54 IRQ_TYPE_LEVEL_HIGH>, /* misc interrupts */
|
||||
<55 IRQ_TYPE_LEVEL_HIGH>; /* MSI */
|
||||
};
|
||||
@ -99,11 +99,6 @@ properties:
|
||||
- mediatek,mt7622-btif
|
||||
- mediatek,mt7623-btif
|
||||
- const: mediatek,mtk-btif
|
||||
- items:
|
||||
- enum:
|
||||
- mediatek,mt7622-btif
|
||||
- mediatek,mt7623-btif
|
||||
- const: mediatek,mtk-btif
|
||||
- items:
|
||||
- const: mrvl,mmp-uart
|
||||
- const: intel,xscale-uart
|
||||
|
||||
@ -1024,7 +1024,6 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
|
||||
struct device_node *overlay_root = NULL;
|
||||
|
||||
*ovcs_id = 0;
|
||||
ret = 0;
|
||||
|
||||
if (overlay_fdt_size < sizeof(struct fdt_header) ||
|
||||
fdt_check_header(overlay_fdt)) {
|
||||
@ -1195,8 +1194,6 @@ int of_overlay_remove(int *ovcs_id)
|
||||
struct overlay_changeset *ovcs;
|
||||
int ret, ret_apply, ret_tmp;
|
||||
|
||||
ret = 0;
|
||||
|
||||
if (devicetree_corrupt()) {
|
||||
pr_err("suspect devicetree state, refuse to remove overlay\n");
|
||||
ret = -EBUSY;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user