tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'devicetree-fixes-for-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

- Fix potential memory leak in of_changeset_action()

- Fix some i.MX binding warnings

- Fix typo in renesas,vin binding field-even-active property

- Fix andestech,ax45mp-cache example unit-address

- Add missing additionalProperties on RiscV CPU interrupt-controller
node

- Add missing unevaluatedProperties on media bindings

- Fix brcm,iproc-pcie binding 'msi' child node schema

- Fix MEMSIC MXC4005 compatible string

* tag 'devicetree-fixes-for-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string
dt-bindings: PCI: brcm,iproc-pcie: Fix 'msi' child node schema
dt-bindings: PCI: brcm,iproc-pcie: Drop common pci-bus properties
dt-bindings: PCI: brcm,iproc-pcie: Fix example indentation
media: dt-bindings: Add missing unevaluatedProperties on child node schemas
dt-bindings: bus: fsl,imx8qxp-pixel-link-msi-bus: Drop child 'reg' property
media: dt-bindings: imx7-csi: Make power-domains not required for imx8mq
dt-bindings: media: renesas,vin: Fix field-even-active spelling
dt-bindings: cache: andestech,ax45mp-cache: Fix unit address in example
of: overlay: Reorder struct fragment fields kerneldoc
dt-bindings: display: fsl,imx6-hdmi: Change to 'unevaluatedProperties: false'
dt-bindings: riscv: cpus: Add missing additionalProperties on interrupt-controller node
of: dynamic: Fix potential memory leak in of_changeset_action()

Linus Torvalds 5e5558f5 22823378

+76 -86
+1 -1
Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
··· 69 69 - | 70 70 #include <dt-bindings/interrupt-controller/irq.h> 71 71 72 - cache-controller@2010000 { 72 + cache-controller@13400000 { 73 73 compatible = "andestech,ax45mp-cache", "cache"; 74 74 reg = <0x13400000 0x100000>; 75 75 interrupts = <508 IRQ_TYPE_LEVEL_HIGH>;
+1 -1
Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml
··· 87 87 - interrupts 88 88 - ports 89 89 90 - additionalProperties: false 90 + unevaluatedProperties: false 91 91 92 92 examples: 93 93 - |
+1
Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml
··· 54 54 55 55 port: 56 56 $ref: /schemas/graph.yaml#/$defs/port-base 57 + unevaluatedProperties: false 57 58 58 59 properties: 59 60 endpoint:
+2
Documentation/devicetree/bindings/media/i2c/toshiba,tc358746.yaml
··· 69 69 properties: 70 70 port@0: 71 71 $ref: /schemas/graph.yaml#/$defs/port-base 72 + unevaluatedProperties: false 72 73 description: Input port 73 74 74 75 properties: ··· 90 89 91 90 port@1: 92 91 $ref: /schemas/graph.yaml#/$defs/port-base 92 + unevaluatedProperties: false 93 93 description: Output port 94 94 95 95 properties:
-1
Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
··· 59 59 compatible: 60 60 contains: 61 61 enum: 62 - - fsl,imx8mq-csi 63 62 - fsl,imx8mm-csi 64 63 then: 65 64 required:
+2 -2
Documentation/devicetree/bindings/media/renesas,vin.yaml
··· 95 95 synchronization is selected. 96 96 default: 1 97 97 98 - field-active-even: true 98 + field-even-active: true 99 99 100 100 bus-width: true 101 101 ··· 144 144 synchronization is selected. 145 145 default: 1 146 146 147 - field-active-even: true 147 + field-even-active: true 148 148 149 149 bus-width: true 150 150
+1
Documentation/devicetree/bindings/media/samsung,fimc.yaml
··· 57 57 patternProperties: 58 58 "^port@[01]$": 59 59 $ref: /schemas/graph.yaml#/$defs/port-base 60 + unevaluatedProperties: false 60 61 description: 61 62 Camera A and camera B inputs. 62 63
+62 -73
Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml
··· 12 12 13 13 allOf: 14 14 - $ref: /schemas/pci/pci-bus.yaml# 15 - - $ref: /schemas/interrupt-controller/msi-controller.yaml# 16 15 17 16 properties: 18 17 compatible: ··· 33 34 description: > 34 35 Base address and length of the PCIe controller I/O register space 35 36 36 - interrupt-map: true 37 - 38 - interrupt-map-mask: true 39 - 40 - "#interrupt-cells": 41 - const: 1 42 - 43 37 ranges: 44 38 minItems: 1 45 39 maxItems: 2 ··· 46 54 items: 47 55 - const: pcie-phy 48 56 49 - bus-range: true 50 - 51 57 dma-coherent: true 52 - 53 - "#address-cells": true 54 - 55 - "#size-cells": true 56 - 57 - device_type: true 58 58 59 59 brcm,pcie-ob: 60 60 type: boolean ··· 62 78 63 79 msi: 64 80 type: object 81 + $ref: /schemas/interrupt-controller/msi-controller.yaml# 82 + unevaluatedProperties: false 83 + 65 84 properties: 66 85 compatible: 67 86 items: 68 87 - const: brcm,iproc-msi 69 88 89 + interrupts: 90 + maxItems: 4 91 + 92 + brcm,pcie-msi-inten: 93 + type: boolean 94 + description: 95 + Needs to be present for some older iProc platforms that require the 96 + interrupt enable registers to be set explicitly to enable MSI 97 + 70 98 msi-parent: true 71 - 72 - msi-controller: true 73 - 74 - brcm,pcie-msi-inten: 75 - type: boolean 76 - description: > 77 - Needs to be present for some older iProc platforms that require the 78 - interrupt enable registers to be set explicitly to enable MSI 79 99 80 100 dependencies: 81 101 brcm,pcie-ob-axi-offset: ["brcm,pcie-ob"] ··· 105 117 106 118 examples: 107 119 - | 108 - #include <dt-bindings/interrupt-controller/arm-gic.h> 120 + #include <dt-bindings/interrupt-controller/arm-gic.h> 109 121 110 - bus { 111 - #address-cells = <1>; 112 - #size-cells = <1>; 113 - pcie0: pcie@18012000 { 114 - compatible = "brcm,iproc-pcie"; 115 - reg = <0x18012000 0x1000>; 122 + gic: interrupt-controller { 123 + interrupt-controller; 124 + #interrupt-cells = <3>; 125 + }; 116 126 117 - #interrupt-cells = <1>; 118 - interrupt-map-mask = <0 0 0 0>; 119 - interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; 127 + pcie@18012000 { 128 + compatible = "brcm,iproc-pcie"; 129 + reg = <0x18012000 0x1000>; 120 130 121 - linux,pci-domain = <0>; 131 + #interrupt-cells = <1>; 132 + interrupt-map-mask = <0 0 0 0>; 133 + interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; 122 134 123 - bus-range = <0x00 0xff>; 135 + linux,pci-domain = <0>; 124 136 125 - #address-cells = <3>; 126 - #size-cells = <2>; 127 - device_type = "pci"; 128 - ranges = <0x81000000 0 0 0x28000000 0 0x00010000>, 129 - <0x82000000 0 0x20000000 0x20000000 0 0x04000000>; 137 + bus-range = <0x00 0xff>; 130 138 131 - phys = <&phy 0 5>; 132 - phy-names = "pcie-phy"; 139 + #address-cells = <3>; 140 + #size-cells = <2>; 141 + device_type = "pci"; 142 + ranges = <0x81000000 0 0 0x28000000 0 0x00010000>, 143 + <0x82000000 0 0x20000000 0x20000000 0 0x04000000>; 133 144 134 - brcm,pcie-ob; 135 - brcm,pcie-ob-axi-offset = <0x00000000>; 145 + phys = <&phy 0 5>; 146 + phy-names = "pcie-phy"; 136 147 137 - msi-parent = <&msi0>; 148 + brcm,pcie-ob; 149 + brcm,pcie-ob-axi-offset = <0x00000000>; 138 150 139 - /* iProc event queue based MSI */ 140 - msi0: msi { 141 - compatible = "brcm,iproc-msi"; 142 - msi-controller; 143 - interrupt-parent = <&gic>; 144 - interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>, 145 - <GIC_SPI 97 IRQ_TYPE_NONE>, 146 - <GIC_SPI 98 IRQ_TYPE_NONE>, 147 - <GIC_SPI 99 IRQ_TYPE_NONE>; 148 - }; 149 - }; 151 + msi-parent = <&msi0>; 150 152 151 - pcie1: pcie@18013000 { 152 - compatible = "brcm,iproc-pcie"; 153 - reg = <0x18013000 0x1000>; 153 + /* iProc event queue based MSI */ 154 + msi0: msi { 155 + compatible = "brcm,iproc-msi"; 156 + msi-controller; 157 + interrupt-parent = <&gic>; 158 + interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>, 159 + <GIC_SPI 97 IRQ_TYPE_NONE>, 160 + <GIC_SPI 98 IRQ_TYPE_NONE>, 161 + <GIC_SPI 99 IRQ_TYPE_NONE>; 162 + }; 163 + }; 164 + - | 165 + pcie@18013000 { 166 + compatible = "brcm,iproc-pcie"; 167 + reg = <0x18013000 0x1000>; 154 168 155 - #interrupt-cells = <1>; 156 - interrupt-map-mask = <0 0 0 0>; 157 - interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; 169 + #interrupt-cells = <1>; 170 + interrupt-map-mask = <0 0 0 0>; 171 + interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; 158 172 159 - linux,pci-domain = <1>; 173 + linux,pci-domain = <1>; 160 174 161 - bus-range = <0x00 0xff>; 175 + bus-range = <0x00 0xff>; 162 176 163 - #address-cells = <3>; 164 - #size-cells = <2>; 165 - device_type = "pci"; 166 - ranges = <0x81000000 0 0 0x48000000 0 0x00010000>, 167 - <0x82000000 0 0x40000000 0x40000000 0 0x04000000>; 177 + #address-cells = <3>; 178 + #size-cells = <2>; 179 + device_type = "pci"; 180 + ranges = <0x81000000 0 0 0x48000000 0 0x00010000>, 181 + <0x82000000 0 0x40000000 0x40000000 0 0x04000000>; 168 182 169 - phys = <&phy 1 6>; 170 - phy-names = "pcie-phy"; 171 - }; 183 + phys = <&phy 1 6>; 184 + phy-names = "pcie-phy"; 172 185 };
+1
Documentation/devicetree/bindings/riscv/cpus.yaml
··· 91 91 92 92 interrupt-controller: 93 93 type: object 94 + additionalProperties: false 94 95 description: Describes the CPU's local interrupt controller 95 96 96 97 properties:
+1 -1
Documentation/devicetree/bindings/trivial-devices.yaml
··· 232 232 # MEMSIC magnetometer 233 233 - memsic,mmc35240 234 234 # MEMSIC 3-axis accelerometer 235 - - memsic,mx4005 235 + - memsic,mxc4005 236 236 # MEMSIC 2-axis 8-bit digital accelerometer 237 237 - memsic,mxc6225 238 238 # MEMSIC 2-axis 8-bit digital accelerometer
+3 -3
drivers/of/dynamic.c
··· 890 890 { 891 891 struct of_changeset_entry *ce; 892 892 893 + if (WARN_ON(action >= ARRAY_SIZE(action_names))) 894 + return -EINVAL; 895 + 893 896 ce = kzalloc(sizeof(*ce), GFP_KERNEL); 894 897 if (!ce) 895 898 return -ENOMEM; 896 - 897 - if (WARN_ON(action >= ARRAY_SIZE(action_names))) 898 - return -EINVAL; 899 899 900 900 /* get a reference to the node */ 901 901 ce->action = action;
+1 -1
drivers/of/overlay.c
··· 45 45 46 46 /** 47 47 * struct fragment - info about fragment nodes in overlay expanded device tree 48 - * @target: target of the overlay operation 49 48 * @overlay: pointer to the __overlay__ node 49 + * @target: target of the overlay operation 50 50 */ 51 51 struct fragment { 52 52 struct device_node *overlay;