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-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

- Cleanups on properties with standard unit suffixes

- Fix overwriting dma_range_map if there's no 'dma-ranges' property

- Fix a bug when creating a /chosen node from ARM ATAGs

- Add missing properties for TI j721e USB binding

- Several doc reference updates due to DT schema conversions

* tag 'devicetree-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: Cleanup standard unit properties
of/device: Update dma_range_map only when dev has valid dma-ranges
ARM: zImage: atags_to_fdt: Fix node names on added root nodes
dt-bindings: usb: j721e: add ranges and dma-coherent props
dt-bindings:iio:adc: update adc.yaml reference
dt-bindings: memory: mediatek: update mediatek,smi-larb.yaml references
dt-bindings: display: mediatek: update mediatek,dpi.yaml reference
ASoC: audio-graph-card: update audio-graph-card.yaml reference

+49 -67
-1
Documentation/devicetree/bindings/arm/cpus.yaml
··· 232 232 by this cpu (see ./idle-states.yaml). 233 233 234 234 capacity-dmips-mhz: 235 - $ref: '/schemas/types.yaml#/definitions/uint32' 236 235 description: 237 236 u32 value representing CPU capacity (see ./cpu-capacity.txt) in 238 237 DMIPS/MHz, relative to highest capacity-dmips-mhz
+1 -1
Documentation/devicetree/bindings/display/bridge/sii902x.txt
··· 40 40 documents on how to describe the way the sii902x device is 41 41 connected to the rest of the audio system: 42 42 Documentation/devicetree/bindings/sound/simple-card.yaml 43 - Documentation/devicetree/bindings/sound/audio-graph-card.txt 43 + Documentation/devicetree/bindings/sound/audio-graph-card.yaml 44 44 Note: In case of the audio-graph-card binding the used port 45 45 index should be 3. 46 46
+2 -2
Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
··· 23 23 24 24 For a description of the display interface sink function blocks, see 25 25 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt and 26 - Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. 26 + Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml. 27 27 28 28 Required properties (all function blocks): 29 29 - compatible: "mediatek,<chip>-disp-<function>", one of ··· 61 61 "mediatek,<chip>-disp-wdma" 62 62 the supported chips are mt2701, mt8167 and mt8173. 63 63 - larb: Should contain a phandle pointing to the local arbiter device as defined 64 - in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt 64 + in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml 65 65 - iommus: Should point to the respective IOMMU block with master port as 66 66 argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt 67 67 for details.
-1
Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
··· 85 85 wlf,micd-timeout-ms: 86 86 description: 87 87 Timeout for microphone detection, specified in milliseconds. 88 - $ref: "/schemas/types.yaml#/definitions/uint32" 89 88 90 89 wlf,micd-force-micbias: 91 90 description:
-1
Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
··· 49 49 description: 50 50 This property controls the Accumulation Dead band which allows to set the 51 51 level of current below which no accumulation takes place. 52 - $ref: /schemas/types.yaml#/definitions/uint32 53 52 maximum: 255 54 53 default: 0 55 54
+3 -5
Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
··· 73 73 description: | 74 74 Temperature sensor trimming factor. It can be used to manually adjust the 75 75 temperature measurements within 7.130 degrees Celsius. 76 - maxItems: 1 77 - items: 78 - default: 0 79 - minimum: 0 80 - maximum: 7130 76 + default: 0 77 + minimum: 0 78 + maximum: 7130 81 79 82 80 additionalProperties: false 83 81
-1
Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
··· 52 52 ti,bus-range-microvolt: 53 53 description: | 54 54 This is the operating range of the bus voltage in microvolt 55 - $ref: /schemas/types.yaml#/definitions/uint32 56 55 enum: [16000000, 32000000] 57 56 default: 32000000 58 57
-2
Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
··· 39 39 40 40 i2c-gpio,delay-us: 41 41 description: delay between GPIO operations (may depend on each platform) 42 - $ref: /schemas/types.yaml#/definitions/uint32 43 42 44 43 i2c-gpio,timeout-ms: 45 44 description: timeout to get data 46 - $ref: /schemas/types.yaml#/definitions/uint32 47 45 48 46 # Deprecated properties, do not use in new device tree sources: 49 47 gpios:
-3
Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml
··· 66 66 default: 400000 67 67 68 68 i2c-sda-hold-time-ns: 69 - maxItems: 1 70 69 description: | 71 70 The property should contain the SDA hold time in nanoseconds. This option 72 71 is only supported in hardware blocks version 1.11a or newer or on 73 72 Microsemi SoCs. 74 73 75 74 i2c-scl-falling-time-ns: 76 - maxItems: 1 77 75 description: | 78 76 The property should contain the SCL falling time in nanoseconds. 79 77 This value is used to compute the tLOW period. 80 78 default: 300 81 79 82 80 i2c-sda-falling-time-ns: 83 - maxItems: 1 84 81 description: | 85 82 The property should contain the SDA falling time in nanoseconds. 86 83 This value is used to compute the tHIGH period.
+1 -1
Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
··· 80 80 type: boolean 81 81 82 82 bipolar: 83 - description: see Documentation/devicetree/bindings/iio/adc/adc.txt 83 + description: see Documentation/devicetree/bindings/iio/adc/adc.yaml 84 84 type: boolean 85 85 86 86 required:
-1
Documentation/devicetree/bindings/iio/adc/maxim,max9611.yaml
··· 23 23 maxItems: 1 24 24 25 25 shunt-resistor-micro-ohms: 26 - $ref: /schemas/types.yaml#/definitions/uint32 27 26 description: | 28 27 Value in micro Ohms of the shunt resistor connected between the RS+ and 29 28 RS- inputs, across which the current is measured. Value needed to compute
-1
Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
··· 246 246 Resolution (bits) to use for conversions: 247 247 - can be 6, 8, 10 or 12 on stm32f4 248 248 - can be 8, 10, 12, 14 or 16 on stm32h7 and stm32mp1 249 - $ref: /schemas/types.yaml#/definitions/uint32 250 249 251 250 st,adc-channels: 252 251 description: |
-2
Documentation/devicetree/bindings/iio/adc/ti,palmas-gpadc.yaml
··· 42 42 const: 1 43 43 44 44 ti,channel0-current-microamp: 45 - $ref: /schemas/types.yaml#/definitions/uint32 46 45 description: Channel 0 current in uA. 47 46 enum: 48 47 - 0 ··· 50 51 - 20 51 52 52 53 ti,channel3-current-microamp: 53 - $ref: /schemas/types.yaml#/definitions/uint32 54 54 description: Channel 3 current in uA. 55 55 enum: 56 56 - 0
+26 -15
Documentation/devicetree/bindings/iio/dac/adi,ad5758.yaml
··· 46 46 two properties must be present: 47 47 48 48 adi,range-microvolt: 49 - $ref: /schemas/types.yaml#/definitions/int32-array 50 49 description: | 51 50 Voltage output range specified as <minimum, maximum> 52 - enum: 53 - - [[0, 5000000]] 54 - - [[0, 10000000]] 55 - - [[-5000000, 5000000]] 56 - - [[-10000000, 10000000]] 51 + oneOf: 52 + - items: 53 + - const: 0 54 + - enum: [5000000, 10000000] 55 + - items: 56 + - const: -5000000 57 + - const: 5000000 58 + - items: 59 + - const: -10000000 60 + - const: 10000000 57 61 58 62 adi,range-microamp: 59 - $ref: /schemas/types.yaml#/definitions/int32-array 60 63 description: | 61 64 Current output range specified as <minimum, maximum> 62 - enum: 63 - - [[0, 20000]] 64 - - [[0, 24000]] 65 - - [[4, 24000]] 66 - - [[-20000, 20000]] 67 - - [[-24000, 24000]] 68 - - [[-1000, 22000]] 65 + oneOf: 66 + - items: 67 + - const: 0 68 + - enum: [20000, 24000] 69 + - items: 70 + - const: 4 71 + - const: 24000 72 + - items: 73 + - const: -20000 74 + - const: 20000 75 + - items: 76 + - const: -24000 77 + - const: 24000 78 + - items: 79 + - const: -1000 80 + - const: 22000 69 81 70 82 reset-gpios: true 71 83 72 84 adi,dc-dc-ilim-microamp: 73 - $ref: /schemas/types.yaml#/definitions/uint32 74 85 enum: [150000, 200000, 250000, 300000, 350000, 400000] 75 86 description: | 76 87 The dc-to-dc converter current limit.
-1
Documentation/devicetree/bindings/iio/health/maxim,max30100.yaml
··· 21 21 description: Connected to ADC_RDY pin. 22 22 23 23 maxim,led-current-microamp: 24 - $ref: /schemas/types.yaml#/definitions/uint32-array 25 24 minItems: 2 26 25 maxItems: 2 27 26 description: |
-2
Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml
··· 70 70 71 71 touchscreen-x-mm: 72 72 description: horizontal length in mm of the touchscreen 73 - $ref: /schemas/types.yaml#/definitions/uint32 74 73 75 74 touchscreen-y-mm: 76 75 description: vertical length in mm of the touchscreen 77 - $ref: /schemas/types.yaml#/definitions/uint32 78 76 79 77 dependencies: 80 78 touchscreen-size-x: [ touchscreen-size-y ]
+1 -1
Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
··· 16 16 - power-domains: a phandle to the power domain, see 17 17 Documentation/devicetree/bindings/power/power_domain.txt for details. 18 18 - mediatek,larb: must contain the local arbiters in the current Socs, see 19 - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt 19 + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml 20 20 for details. 21 21 - iommus: should point to the respective IOMMU block with master port as 22 22 argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
+1 -1
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
··· 14 14 - power-domains: a phandle to the power domain, see 15 15 Documentation/devicetree/bindings/power/power_domain.txt for details. 16 16 - mediatek,larb: must contain the local arbiters in the current SoCs, see 17 - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt 17 + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml 18 18 for details. 19 19 - iommus: should point to the respective IOMMU block with master port as 20 20 argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
+1 -1
Documentation/devicetree/bindings/media/mediatek-mdp.txt
··· 28 28 argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt 29 29 for details. 30 30 - mediatek,larb: must contain the local arbiters in the current Socs, see 31 - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt 31 + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml 32 32 for details. 33 33 34 34 Example:
-1
Documentation/devicetree/bindings/mmc/mmc-controller.yaml
··· 259 259 waiting for I/O signalling and card power supply to be stable, 260 260 regardless of whether pwrseq-simple is used. Default to 10ms if 261 261 no available. 262 - $ref: /schemas/types.yaml#/definitions/uint32 263 262 default: 10 264 263 265 264 supports-cqe:
-2
Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml
··· 41 41 description: 42 42 Delay in ms after powering the card and de-asserting the 43 43 reset-gpios (if any). 44 - $ref: /schemas/types.yaml#/definitions/uint32 45 44 46 45 power-off-delay-us: 47 46 description: 48 47 Delay in us after asserting the reset-gpios (if any) 49 48 during power off of the card. 50 - $ref: /schemas/types.yaml#/definitions/uint32 51 49 52 50 required: 53 51 - compatible
-2
Documentation/devicetree/bindings/net/ethernet-controller.yaml
··· 122 122 such as flow control thresholds. 123 123 124 124 rx-internal-delay-ps: 125 - $ref: /schemas/types.yaml#/definitions/uint32 126 125 description: | 127 126 RGMII Receive Clock Delay defined in pico seconds. 128 127 This is used for controllers that have configurable RX internal delays. ··· 139 140 is used for components that can have configurable fifo sizes. 140 141 141 142 tx-internal-delay-ps: 142 - $ref: /schemas/types.yaml#/definitions/uint32 143 143 description: | 144 144 RGMII Transmit Clock Delay defined in pico seconds. 145 145 This is used for controllers that have configurable TX internal delays.
-1
Documentation/devicetree/bindings/net/snps,dwmac.yaml
··· 212 212 Triplet of delays. The 1st cell is reset pre-delay in micro 213 213 seconds. The 2nd cell is reset pulse in micro seconds. The 3rd 214 214 cell is reset post-delay in micro seconds. 215 - $ref: /schemas/types.yaml#/definitions/uint32-array 216 215 minItems: 3 217 216 maxItems: 3 218 217
-3
Documentation/devicetree/bindings/power/supply/battery.yaml
··· 83 83 for each of the battery capacity lookup table. 84 84 85 85 operating-range-celsius: 86 - $ref: /schemas/types.yaml#/definitions/uint32-array 87 86 description: operating temperature range of a battery 88 87 items: 89 88 - description: minimum temperature at which battery can operate 90 89 - description: maximum temperature at which battery can operate 91 90 92 91 ambient-celsius: 93 - $ref: /schemas/types.yaml#/definitions/uint32-array 94 92 description: safe range of ambient temperature 95 93 items: 96 94 - description: alert when ambient temperature is lower than this value 97 95 - description: alert when ambient temperature is higher than this value 98 96 99 97 alert-celsius: 100 - $ref: /schemas/types.yaml#/definitions/uint32-array 101 98 description: safe range of battery temperature 102 99 items: 103 100 - description: alert when battery temperature is lower than this value
-1
Documentation/devicetree/bindings/power/supply/bq2515x.yaml
··· 50 50 maxItems: 1 51 51 52 52 input-current-limit-microamp: 53 - $ref: /schemas/types.yaml#/definitions/uint32 54 53 description: Maximum input current in micro Amps. 55 54 minimum: 50000 56 55 maximum: 500000
-1
Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
··· 62 62 description: IRQ line information. 63 63 64 64 dlg,irq-polling-delay-passive-ms: 65 - $ref: "/schemas/types.yaml#/definitions/uint32" 66 65 minimum: 1000 67 66 maximum: 10000 68 67 description: |
-2
Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
··· 72 72 73 73 startup-delay-us: 74 74 description: startup time in microseconds 75 - $ref: /schemas/types.yaml#/definitions/uint32 76 75 77 76 off-on-delay-us: 78 77 description: off delay time in microseconds 79 - $ref: /schemas/types.yaml#/definitions/uint32 80 78 81 79 enable-active-high: 82 80 description:
-2
Documentation/devicetree/bindings/rtc/rtc.yaml
··· 27 27 1: chargeable 28 28 29 29 quartz-load-femtofarads: 30 - $ref: /schemas/types.yaml#/definitions/uint32 31 30 description: 32 31 The capacitive load of the quartz(x-tal), expressed in femto 33 32 Farad (fF). The default value shall be listed (if optional), ··· 46 47 deprecated: true 47 48 48 49 trickle-resistor-ohms: 49 - $ref: /schemas/types.yaml#/definitions/uint32 50 50 description: 51 51 Selected resistor for trickle charger. Should be given 52 52 if trickle charger should be enabled.
-2
Documentation/devicetree/bindings/serial/pl011.yaml
··· 88 88 description: 89 89 Rate at which poll occurs when auto-poll is set. 90 90 default 100ms. 91 - $ref: /schemas/types.yaml#/definitions/uint32 92 91 default: 100 93 92 94 93 poll-timeout-ms: 95 94 description: 96 95 Poll timeout when auto-poll is set, default 97 96 3000ms. 98 - $ref: /schemas/types.yaml#/definitions/uint32 99 97 default: 3000 100 98 101 99 required:
-2
Documentation/devicetree/bindings/sound/sgtl5000.yaml
··· 41 41 values of 2k, 4k or 8k. If set to 0 it will be off. If this node is not 42 42 mentioned or if the value is unknown, then micbias resistor is set to 43 43 4k. 44 - $ref: "/schemas/types.yaml#/definitions/uint32" 45 44 enum: [ 0, 2, 4, 8 ] 46 45 47 46 micbias-voltage-m-volts: 48 47 description: The bias voltage to be used in mVolts. The voltage can take 49 48 values from 1.25V to 3V by 250mV steps. If this node is not mentioned 50 49 or the value is unknown, then the value is set to 1.25V. 51 - $ref: "/schemas/types.yaml#/definitions/uint32" 52 50 enum: [ 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000 ] 53 51 54 52 lrclk-strength:
+4
Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml
··· 21 21 reg: 22 22 description: module registers 23 23 24 + ranges: true 25 + 24 26 power-domains: 25 27 description: 26 28 PM domain provider node and an args specifier containing ··· 63 61 64 62 '#size-cells': 65 63 const: 2 64 + 65 + dma-coherent: true 66 66 67 67 patternProperties: 68 68 "^usb@":
-1
Documentation/devicetree/bindings/watchdog/watchdog.yaml
··· 19 19 pattern: "^watchdog(@.*|-[0-9a-f])?$" 20 20 21 21 timeout-sec: 22 - $ref: /schemas/types.yaml#/definitions/uint32 23 22 description: 24 23 Contains the watchdog timeout in seconds. 25 24
+2 -1
arch/arm/boot/compressed/atags_to_fdt.c
··· 15 15 { 16 16 int offset = fdt_path_offset(fdt, node_path); 17 17 if (offset == -FDT_ERR_NOTFOUND) 18 - offset = fdt_add_subnode(fdt, 0, node_path); 18 + /* Add the node to root if not found, dropping the leading '/' */ 19 + offset = fdt_add_subnode(fdt, 0, node_path + 1); 19 20 return offset; 20 21 } 21 22
+7 -3
drivers/of/device.c
··· 162 162 mask = DMA_BIT_MASK(ilog2(end) + 1); 163 163 dev->coherent_dma_mask &= mask; 164 164 *dev->dma_mask &= mask; 165 - /* ...but only set bus limit if we found valid dma-ranges earlier */ 166 - if (!ret) 165 + /* ...but only set bus limit and range map if we found valid dma-ranges earlier */ 166 + if (!ret) { 167 167 dev->bus_dma_limit = end; 168 + dev->dma_range_map = map; 169 + } 168 170 169 171 coherent = of_dma_is_coherent(np); 170 172 dev_dbg(dev, "device is%sdma coherent\n", ··· 174 172 175 173 iommu = of_iommu_configure(dev, np, id); 176 174 if (PTR_ERR(iommu) == -EPROBE_DEFER) { 175 + /* Don't touch range map if it wasn't set from a valid dma-ranges */ 176 + if (!ret) 177 + dev->dma_range_map = NULL; 177 178 kfree(map); 178 179 return -EPROBE_DEFER; 179 180 } ··· 186 181 187 182 arch_setup_dma_ops(dev, dma_start, size, iommu, coherent); 188 183 189 - dev->dma_range_map = map; 190 184 return 0; 191 185 } 192 186 EXPORT_SYMBOL_GPL(of_dma_configure_id);