Merge branch 'dt/linus' into dt/next · tjh.dev/kernel@7e5ff59

··· 42 42 description: 43 43 See section 2.3.9 of the DeviceTree Specification. 44 44 45 45 + '#address-cells': true 46 46 + 47 47 + '#size-cells': true 48 48 + 45 49 required: 46 50 - "#interconnect-cells" 47 51 - compatible ··· 63 59 compatible = "allwinner,sun5i-a13-mbus"; 64 60 reg = <0x01c01000 0x1000>; 65 61 clocks = <&ccu CLK_MBUS>; 62 62 + #address-cells = <1>; 63 63 + #size-cells = <1>; 66 64 dma-ranges = <0x00000000 0x40000000 0x20000000>; 67 65 #interconnect-cells = <1>; 68 66 };

+1 -1

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

reviewed

··· 91 91 92 92 examples: 93 93 - | 94 94 - vco1: clock@00 { 94 94 + vco1: clock { 95 95 compatible = "arm,impd1-vco1"; 96 96 #clock-cells = <0>; 97 97 lock-offset = <0x08>;

+2 -2

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

reviewed

··· 1 1 - Analog Device ADV7123 Video DAC 2 2 - ------------------------------- 1 1 + Analog Devices ADV7123 Video DAC 2 2 + -------------------------------- 3 3 4 4 The ADV7123 is a digital-to-analog converter that outputs VGA signals from a 5 5 parallel video input.

+2 -2

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

reviewed

··· 1 1 - Analog Device ADV7511(W)/13/33/35 HDMI Encoders 2 2 - ----------------------------------------- 1 1 + Analog Devices ADV7511(W)/13/33/35 HDMI Encoders 2 2 + ------------------------------------------------ 3 3 4 4 The ADV7511, ADV7511W, ADV7513, ADV7533 and ADV7535 are HDMI audio and video 5 5 transmitters compatible with HDMI 1.4 and DVI 1.0. They support color space

+1 -1

Documentation/devicetree/bindings/dma/adi,axi-dmac.txt

reviewed

··· 1 1 - Analog Device AXI-DMAC DMA controller 1 1 + Analog Devices AXI-DMAC DMA controller 2 2 3 3 Required properties: 4 4 - compatible: Must be "adi,axi-dmac-1.00.a".

+2 -2

Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml

reviewed

··· 2 2 # Copyright 2019 Analog Devices Inc. 3 3 %YAML 1.2 4 4 --- 5 5 - $id: http://devicetree.org/schemas/bindings/hwmon/adi,axi-fan-control.yaml# 5 5 + $id: http://devicetree.org/schemas/hwmon/adi,axi-fan-control.yaml# 6 6 $schema: http://devicetree.org/meta-schemas/core.yaml# 7 7 8 8 title: Analog Devices AXI FAN Control Device Tree Bindings ··· 47 47 48 48 examples: 49 49 - | 50 50 - fpga_axi: fpga-axi@0 { 50 50 + fpga_axi: fpga-axi { 51 51 #address-cells = <0x2>; 52 52 #size-cells = <0x1>; 53 53

+1 -1

Documentation/devicetree/bindings/hwmon/adt7475.yaml

reviewed

··· 1 1 # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) 2 2 %YAML 1.2 3 3 --- 4 4 - $id: http://devicetree.org/schemas/adt7475.yaml# 4 4 + $id: http://devicetree.org/schemas/hwmon/adt7475.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 7 title: ADT7475 hwmon sensor

+1 -1

Documentation/devicetree/bindings/iio/dac/ad5755.txt

reviewed

··· 1 1 - * Analog Device AD5755 IIO Multi-Channel DAC Linux Driver 1 1 + * Analog Devices AD5755 IIO Multi-Channel DAC Linux Driver 2 2 3 3 Required properties: 4 4 - compatible: Has to contain one of the following:

+46 -51

Documentation/devicetree/bindings/iio/dac/adi,ad5770r.yaml

reviewed

··· 2 2 # Copyright 2020 Analog Devices Inc. 3 3 %YAML 1.2 4 4 --- 5 5 - $id: http://devicetree.org/schemas/bindings/iio/dac/adi,ad5770r.yaml# 5 5 + $id: http://devicetree.org/schemas/iio/dac/adi,ad5770r.yaml# 6 6 $schema: http://devicetree.org/meta-schemas/core.yaml# 7 7 8 8 title: Analog Devices AD5770R DAC device driver ··· 49 49 asserted during driver probe. 50 50 maxItems: 1 51 51 52 52 - channel0: 52 52 + channel@0: 53 53 description: Represents an external channel which are 54 54 connected to the DAC. Channel 0 can act both as a current 55 55 source and sink. 56 56 type: object 57 57 58 58 properties: 59 59 - num: 59 59 + reg: 60 60 description: This represents the channel number. 61 61 - items: 62 62 - const: 0 61 61 + const: 0 63 62 64 63 adi,range-microamp: 65 64 description: Output range of the channel. 66 65 oneOf: 67 67 - - $ref: /schemas/types.yaml#/definitions/int32-array 68 66 - items: 69 69 - - enum: [0 300000] 70 70 - - enum: [-60000 0] 71 71 - - enum: [-60000 300000] 67 67 + - const: 0 68 68 + - const: 300000 69 69 + - items: 70 70 + - const: -60000 71 71 + - const: 0 72 72 + - items: 73 73 + - const: -60000 74 74 + - const: 300000 72 75 73 73 - channel1: 76 76 + channel@1: 74 77 description: Represents an external channel which are 75 78 connected to the DAC. 76 79 type: object 77 80 78 81 properties: 79 79 - num: 82 82 + reg: 80 83 description: This represents the channel number. 81 81 - items: 82 82 - const: 1 84 84 + const: 1 83 85 84 86 adi,range-microamp: 85 87 description: Output range of the channel. 86 86 - oneOf: 87 87 - - $ref: /schemas/types.yaml#/definitions/uint32-array 88 88 - - items: 89 89 - - enum: [0 140000] 90 90 - - enum: [0 250000] 88 88 + items: 89 89 + - const: 0 90 90 + - enum: [ 140000, 250000 ] 91 91 92 92 - channel2: 92 92 + channel@2: 93 93 description: Represents an external channel which are 94 94 connected to the DAC. 95 95 type: object 96 96 97 97 properties: 98 98 - num: 98 98 + reg: 99 99 description: This represents the channel number. 100 100 - items: 101 101 - const: 2 100 100 + const: 2 102 101 103 102 adi,range-microamp: 104 103 description: Output range of the channel. 105 105 - oneOf: 106 106 - - $ref: /schemas/types.yaml#/definitions/uint32-array 107 107 - - items: 108 108 - - enum: [0 140000] 109 109 - - enum: [0 250000] 104 104 + items: 105 105 + - const: 0 106 106 + - enum: [ 55000, 150000 ] 110 107 111 108 patternProperties: 112 109 "^channel@([3-5])$": 113 110 type: object 114 111 description: Represents the external channels which are connected to the DAC. 115 112 properties: 116 116 - num: 113 113 + reg: 117 114 description: This represents the channel number. 118 118 - items: 119 119 - minimum: 3 120 120 - maximum: 5 115 115 + minimum: 3 116 116 + maximum: 5 121 117 122 118 adi,range-microamp: 123 119 description: Output range of the channel. 124 124 - oneOf: 125 125 - - $ref: /schemas/types.yaml#/definitions/uint32-array 126 126 - - items: 127 127 - - enum: [0 45000] 128 128 - - enum: [0 100000] 120 120 + items: 121 121 + - const: 0 122 122 + - enum: [ 45000, 100000 ] 129 123 130 124 required: 131 125 - reg 132 132 - - diff-channels 133 133 - - channel0 134 134 - - channel1 135 135 - - channel2 136 136 - - channel3 137 137 - - channel4 138 138 - - channel5 126 126 + - channel@0 127 127 + - channel@1 128 128 + - channel@2 129 129 + - channel@3 130 130 + - channel@4 131 131 + - channel@5 139 132 140 133 examples: 141 134 - | ··· 137 144 #size-cells = <0>; 138 145 139 146 ad5770r@0 { 140 140 - compatible = "ad5770r"; 147 147 + compatible = "adi,ad5770r"; 141 148 reg = <0>; 142 149 spi-max-frequency = <1000000>; 143 150 vref-supply = <&vref>; 144 151 adi,external-resistor; 145 152 reset-gpios = <&gpio 22 0>; 153 153 + #address-cells = <1>; 154 154 + #size-cells = <0>; 146 155 147 156 channel@0 { 148 148 - num = <0>; 149 149 - adi,range-microamp = <(-60000) 300000>; 157 157 + reg = <0>; 158 158 + adi,range-microamp = <0 300000>; 150 159 }; 151 160 152 161 channel@1 { 153 153 - num = <1>; 162 162 + reg = <1>; 154 163 adi,range-microamp = <0 140000>; 155 164 }; 156 165 157 166 channel@2 { 158 158 - num = <2>; 167 167 + reg = <2>; 159 168 adi,range-microamp = <0 55000>; 160 169 }; 161 170 162 171 channel@3 { 163 163 - num = <3>; 172 172 + reg = <3>; 164 173 adi,range-microamp = <0 45000>; 165 174 }; 166 175 167 176 channel@4 { 168 168 - num = <4>; 177 177 + reg = <4>; 169 178 adi,range-microamp = <0 45000>; 170 179 }; 171 180 172 181 channel@5 { 173 173 - num = <5>; 182 182 + reg = <5>; 174 183 adi,range-microamp = <0 45000>; 175 184 }; 176 185 };

+1 -1

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

reviewed

··· 109 109 - | 110 110 #include <dt-bindings/gpio/gpio.h> 111 111 #include <dt-bindings/interrupt-controller/arm-gic.h> 112 112 - i2c@00000000 { 112 112 + i2c { 113 113 #address-cells = <1>; 114 114 #size-cells = <0>; 115 115 edt-ft5x06@38 {

+2 -3

Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml

reviewed

··· 56 56 cell with zero. 57 57 allOf: 58 58 - $ref: /schemas/types.yaml#/definitions/uint32-array 59 59 - - items: 60 60 - minItems: 4 61 61 - maxItems: 4 59 59 + - minItems: 4 60 60 + maxItems: 4 62 61 63 62 64 63 required:

+23 -18

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

reviewed

··· 97 97 #include <dt-bindings/clock/tegra186-clock.h> 98 98 #include <dt-bindings/interrupt-controller/arm-gic.h> 99 99 100 100 - memory-controller@2c00000 { 101 101 - compatible = "nvidia,tegra186-mc"; 102 102 - reg = <0x0 0x02c00000 0x0 0xb0000>; 103 103 - interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>; 104 104 - 100 100 + bus { 105 101 #address-cells = <2>; 106 102 #size-cells = <2>; 107 103 108 108 - ranges = <0x0 0x02c00000 0x02c00000 0x0 0xb0000>; 104 104 + memory-controller@2c00000 { 105 105 + compatible = "nvidia,tegra186-mc"; 106 106 + reg = <0x0 0x02c00000 0x0 0xb0000>; 107 107 + interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>; 109 108 110 110 - /* 111 111 - * Memory clients have access to all 40 bits that the memory 112 112 - * controller can address. 113 113 - */ 114 114 - dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x0>; 109 109 + #address-cells = <2>; 110 110 + #size-cells = <2>; 115 111 116 116 - external-memory-controller@2c60000 { 117 117 - compatible = "nvidia,tegra186-emc"; 118 118 - reg = <0x0 0x02c60000 0x0 0x50000>; 119 119 - interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; 120 120 - clocks = <&bpmp TEGRA186_CLK_EMC>; 121 121 - clock-names = "emc"; 112 112 + ranges = <0x0 0x02c00000 0x0 0x02c00000 0x0 0xb0000>; 122 113 123 123 - nvidia,bpmp = <&bpmp>; 114 114 + /* 115 115 + * Memory clients have access to all 40 bits that the memory 116 116 + * controller can address. 117 117 + */ 118 118 + dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x0>; 119 119 + 120 120 + external-memory-controller@2c60000 { 121 121 + compatible = "nvidia,tegra186-emc"; 122 122 + reg = <0x0 0x02c60000 0x0 0x50000>; 123 123 + interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; 124 124 + clocks = <&bpmp TEGRA186_CLK_EMC>; 125 125 + clock-names = "emc"; 126 126 + 127 127 + nvidia,bpmp = <&bpmp>; 128 128 + }; 124 129 }; 125 130 }; 126 131

+3 -1

Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml

reviewed

··· 123 123 #include <dt-bindings/leds/common.h> 124 124 125 125 i2c { 126 126 - pmic: pmic@4b { 126 126 + #address-cells = <1>; 127 127 + #size-cells = <0>; 128 128 + pmic: pmic@4b { 127 129 compatible = "rohm,bd71837"; 128 130 reg = <0x4b>; 129 131 interrupt-parent = <&gpio1>;

+3 -1

Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml

reviewed

··· 128 128 #include <dt-bindings/leds/common.h> 129 129 130 130 i2c { 131 131 - pmic: pmic@4b { 131 131 + #address-cells = <1>; 132 132 + #size-cells = <0>; 133 133 + pmic: pmic@4b { 132 134 compatible = "rohm,bd71847"; 133 135 reg = <0x4b>; 134 136 interrupt-parent = <&gpio1>;

+1 -1

Documentation/devicetree/bindings/mfd/st,stpmic1.yaml

reviewed

··· 274 274 - | 275 275 #include <dt-bindings/mfd/st,stpmic1.h> 276 276 #include <dt-bindings/interrupt-controller/arm-gic.h> 277 277 - i2c@0 { 277 277 + i2c { 278 278 #address-cells = <1>; 279 279 #size-cells = <0>; 280 280 pmic@33 {

Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml

reviewed

··· 48 48 49 49 switch@10 { 50 50 compatible = "qca,qca8337"; 51 51 + reg = <0x10>; 51 52 /* ... */ 52 53 }; 53 54 };

+1 -1

Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt

reviewed

··· 29 29 30 30 Optional properties for compatible string qcom,wcn399x-bt: 31 31 32 32 - - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt 32 32 + - max-speed: see Documentation/devicetree/bindings/serial/serial.yaml 33 33 - firmware-name: specify the name of nvm firmware to load 34 34 - clocks: clock provided to the controller 35 35

+1 -1

Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml

reviewed

··· 146 146 bindings specified in 147 147 Documentation/devicetree/bindings/phy/phy-cadence-sierra.txt 148 148 Torrent SERDES should follow the bindings specified in 149 149 - Documentation/devicetree/bindings/phy/phy-cadence-dp.txt 149 149 + Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml 150 150 151 151 required: 152 152 - compatible

+12 -5

Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml

reviewed

··· 31 31 32 32 examples: 33 33 - | 34 34 - cros-ec@0 { 35 35 - compatible = "google,cros-ec-spi"; 36 36 - cros_ec_pwm: ec-pwm { 37 37 - compatible = "google,cros-ec-pwm"; 38 38 - #pwm-cells = <1>; 34 34 + spi { 35 35 + #address-cells = <1>; 36 36 + #size-cells = <0>; 37 37 + 38 38 + cros-ec@0 { 39 39 + compatible = "google,cros-ec-spi"; 40 40 + reg = <0>; 41 41 + 42 42 + cros_ec_pwm: ec-pwm { 43 43 + compatible = "google,cros-ec-pwm"; 44 44 + #pwm-cells = <1>; 45 45 + }; 39 46 }; 40 47 };

+1 -1

Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml

reviewed

··· 39 39 40 40 examples: 41 41 - | 42 42 - rng { 42 42 + rng@7e104000 { 43 43 compatible = "brcm,bcm2835-rng"; 44 44 reg = <0x7e104000 0x10>; 45 45 interrupts = <2 29>;

+1 -1

Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml

reviewed

··· 61 61 #include <dt-bindings/clock/qcom,gcc-sdm845.h> 62 62 #include <dt-bindings/interrupt-controller/arm-gic.h> 63 63 64 64 - soc: soc@0 { 64 64 + soc: soc { 65 65 #address-cells = <2>; 66 66 #size-cells = <2>; 67 67

+1 -1

Documentation/devicetree/bindings/usb/ingenic,musb.yaml

reviewed

··· 56 56 examples: 57 57 - | 58 58 #include <dt-bindings/clock/jz4740-cgu.h> 59 59 - usb_phy: usb-phy@0 { 59 59 + usb_phy: usb-phy { 60 60 compatible = "usb-nop-xceiv"; 61 61 #phy-cells = <0>; 62 62 };

+2 -2

Documentation/devicetree/bindings/usb/qcom,dwc3.txt

reviewed

··· 52 52 the node is not important. The content of the node is defined in dwc3.txt. 53 53 54 54 Phy documentation is provided in the following places: 55 55 - Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt - USB3 QMP PHY 56 56 - Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt - USB2 QUSB2 PHY 55 55 + Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt - USB3 QMP PHY 56 56 + Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml - USB2 QUSB2 PHY 57 57 58 58 Example device nodes: 59 59

+1 -1

Documentation/devicetree/bindings/usb/rockchip,dwc3.txt

reviewed

··· 16 16 the node is not important. The content of the node is defined in dwc3.txt. 17 17 18 18 Phy documentation is provided in the following places: 19 19 - Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY 19 19 + Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml - USB2.0 PHY 20 20 Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt - Type-C PHY 21 21 22 22 Example device nodes:

+5 -2

MAINTAINERS

reviewed

··· 1323 1323 M: Linus Walleij <linus.walleij@linaro.org> 1324 1324 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1325 1325 S: Maintained 1326 1326 - F: Documentation/devicetree/bindings/arm/arm-boards 1326 1326 + F: Documentation/devicetree/bindings/arm/arm,integrator.yaml 1327 1327 + F: Documentation/devicetree/bindings/arm/arm,realview.yaml 1328 1328 + F: Documentation/devicetree/bindings/arm/arm,versatile.yaml 1329 1329 + F: Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml 1327 1330 F: Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt 1328 1331 F: Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml 1329 1332 F: Documentation/devicetree/bindings/i2c/i2c-versatile.txt ··· 5555 5552 L: dri-devel@lists.freedesktop.org 5556 5553 S: Supported 5557 5554 T: git git://anongit.freedesktop.org/drm/drm-misc 5558 5558 - F: Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt 5555 5555 + F: Documentation/devicetree/bindings/display/allwinner* 5559 5556 F: drivers/gpu/drm/sun4i/ 5560 5557 5561 5558 DRM DRIVERS FOR AMLOGIC SOCS

drivers/of/overlay.c

reviewed

··· 261 261 262 262 of_property_set_flag(new_prop, OF_DYNAMIC); 263 263 264 264 + kfree(target_path); 265 265 + 264 266 return new_prop; 265 267 266 268 err_free_new_prop:

+19 -4

drivers/of/unittest-data/overlay_bad_add_dup_prop.dts

reviewed

··· 3 3 /plugin/; 4 4 5 5 /* 6 6 - * &electric_1/motor-1 and &spin_ctrl_1 are the same node: 7 7 - * /testcase-data-2/substation@100/motor-1 6 6 + * &electric_1/motor-1/electric and &spin_ctrl_1/electric are the same node: 7 7 + * /testcase-data-2/substation@100/motor-1/electric 8 8 * 9 9 * Thus the property "rpm_avail" in each fragment will 10 10 * result in an attempt to update the same property twice. 11 11 * This will result in an error and the overlay apply 12 12 * will fail. 13 13 + * 14 14 + * The previous version of this test did not include the extra 15 15 + * level of node 'electric'. That resulted in the 'rpm_avail' 16 16 + * property being located in the pre-existing node 'motor-1'. 17 17 + * Modifying a property results in a WARNING that a memory leak 18 18 + * will occur if the overlay is removed. Since the overlay apply 19 19 + * fails, the memory leak does actually occur, and kmemleak will 20 20 + * further report the memory leak if CONFIG_DEBUG_KMEMLEAK is 21 21 + * enabled. Adding the overlay node 'electric' avoids the 22 22 + * memory leak and thus people who use kmemleak will not 23 23 + * have to debug this non-problem again. 13 24 */ 14 25 15 26 &electric_1 { 16 27 17 28 motor-1 { 18 18 - rpm_avail = < 100 >; 29 29 + electric { 30 30 + rpm_avail = < 100 >; 31 31 + }; 19 32 }; 20 33 }; 21 34 22 35 &spin_ctrl_1 { 23 23 - rpm_avail = < 100 200 >; 36 36 + electric { 37 37 + rpm_avail = < 100 200 >; 38 38 + }; 24 39 };

+19 -9

drivers/of/unittest.c

reviewed

··· 861 861 unittest(!of_changeset_revert(&chgset), "revert failed\n"); 862 862 863 863 of_changeset_destroy(&chgset); 864 864 + 865 865 + of_node_put(n1); 866 866 + of_node_put(n2); 867 867 + of_node_put(n21); 864 868 #endif 865 869 } 866 870 ··· 1247 1243 1248 1244 of_platform_populate(np, match, NULL, &test_bus->dev); 1249 1245 for_each_child_of_node(np, child) { 1250 1250 - for_each_child_of_node(child, grandchild) 1251 1251 - unittest(of_find_device_by_node(grandchild), 1246 1246 + for_each_child_of_node(child, grandchild) { 1247 1247 + pdev = of_find_device_by_node(grandchild); 1248 1248 + unittest(pdev, 1252 1249 "Could not create device for node '%pOFn'\n", 1253 1250 grandchild); 1251 1251 + of_dev_put(pdev); 1252 1252 + } 1254 1253 } 1255 1254 1256 1255 of_platform_depopulate(&test_bus->dev); ··· 3094 3087 goto err_unlock; 3095 3088 } 3096 3089 if (__of_add_property(of_symbols, new_prop)) { 3090 3090 + kfree(new_prop->name); 3091 3091 + kfree(new_prop->value); 3092 3092 + kfree(new_prop); 3097 3093 /* "name" auto-generated by unflatten */ 3098 3098 - if (!strcmp(new_prop->name, "name")) 3094 3094 + if (!strcmp(prop->name, "name")) 3099 3095 continue; 3100 3096 unittest(0, "duplicate property '%s' in overlay_base node __symbols__", 3101 3097 prop->name); ··· 3181 3171 "OF: overlay: ERROR: multiple fragments add and/or delete node /testcase-data-2/substation@100/motor-1/controller"); 3182 3172 3183 3173 EXPECT_BEGIN(KERN_ERR, 3184 3184 - "OF: overlay: WARNING: memory leak will occur if overlay removed, property: /testcase-data-2/substation@100/motor-1/rpm_avail"); 3174 3174 + "OF: overlay: ERROR: multiple fragments add and/or delete node /testcase-data-2/substation@100/motor-1/electric"); 3185 3175 EXPECT_BEGIN(KERN_ERR, 3186 3186 - "OF: overlay: WARNING: memory leak will occur if overlay removed, property: /testcase-data-2/substation@100/motor-1/rpm_avail"); 3176 3176 + "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/electric/rpm_avail"); 3187 3177 EXPECT_BEGIN(KERN_ERR, 3188 3188 - "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/rpm_avail"); 3178 3178 + "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/electric/name"); 3189 3179 3190 3180 unittest(overlay_data_apply("overlay_bad_add_dup_prop", NULL), 3191 3181 "Adding overlay 'overlay_bad_add_dup_prop' failed\n"); 3192 3182 3193 3183 EXPECT_END(KERN_ERR, 3194 3194 - "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/rpm_avail"); 3184 3184 + "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/electric/name"); 3195 3185 EXPECT_END(KERN_ERR, 3196 3196 - "OF: overlay: WARNING: memory leak will occur if overlay removed, property: /testcase-data-2/substation@100/motor-1/rpm_avail"); 3186 3186 + "OF: overlay: ERROR: multiple fragments add, update, and/or delete property /testcase-data-2/substation@100/motor-1/electric/rpm_avail"); 3197 3187 EXPECT_END(KERN_ERR, 3198 3198 - "OF: overlay: WARNING: memory leak will occur if overlay removed, property: /testcase-data-2/substation@100/motor-1/rpm_avail"); 3188 3188 + "OF: overlay: ERROR: multiple fragments add and/or delete node /testcase-data-2/substation@100/motor-1/electric"); 3199 3189 3200 3190 unittest(overlay_data_apply("overlay_bad_phandle", NULL), 3201 3191 "Adding overlay 'overlay_bad_phandle' failed\n");

+1 -1

scripts/dtc/Makefile

reviewed

··· 13 13 HOST_EXTRACFLAGS := -I $(srctree)/$(src)/libfdt 14 14 15 15 ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),) 16 16 - ifneq ($(CHECK_DTBS),) 16 16 + ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),) 17 17 $(error dtc needs libyaml for DT schema validation support. \ 18 18 Install the necessary libyaml development package.) 19 19 endif