Merge branch 'dt/linus' into dt/next · tjh.dev/kernel@28650a5

-1

Documentation/devicetree/bindings/gpio/sifive,gpio.yaml

··· 7 7 title: SiFive GPIO controller 8 8 9 9 maintainers: 10 - - Yash Shah <yash.shah@sifive.com> 11 10 - Paul Walmsley <paul.walmsley@sifive.com> 12 11 13 12 properties:

+2 -2

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

··· 39 39 '^phy@[a-f0-9]+$': 40 40 $ref: ../phy/bcm-ns-usb2-phy.yaml 41 41 42 - '^pin-controller@[a-f0-9]+$': 42 + '^pinctrl@[a-f0-9]+$': 43 43 $ref: ../pinctrl/brcm,ns-pinmux.yaml 44 44 45 45 '^syscon@[a-f0-9]+$': ··· 94 94 reg = <0x180 0x4>; 95 95 }; 96 96 97 - pin-controller@1c0 { 97 + pinctrl@1c0 { 98 98 compatible = "brcm,bcm4708-pinmux"; 99 99 reg = <0x1c0 0x24>; 100 100 reg-names = "cru_gpio_control";

+3 -3

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml

··· 126 126 clock-frequency: 127 127 const: 12288000 128 128 129 - lochnagar-pinctrl: 129 + pinctrl: 130 130 type: object 131 131 $ref: /schemas/pinctrl/cirrus,lochnagar.yaml# 132 132 ··· 255 255 - reg 256 256 - reset-gpios 257 257 - lochnagar-clk 258 - - lochnagar-pinctrl 258 + - pinctrl 259 259 260 260 additionalProperties: false 261 261 ··· 293 293 clock-frequency = <32768>; 294 294 }; 295 295 296 - lochnagar-pinctrl { 296 + pinctrl { 297 297 compatible = "cirrus,lochnagar-pinctrl"; 298 298 299 299 gpio-controller;

+1 -1

Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml

··· 20 20 21 21 maintainers: 22 22 - Kishon Vijay Abraham I <kishon@ti.com> 23 - - Roger Quadros <rogerq@ti.com 23 + - Roger Quadros <rogerq@kernel.org> 24 24 25 25 properties: 26 26 compatible:

+1 -1

Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml

··· 8 8 9 9 maintainers: 10 10 - Kishon Vijay Abraham I <kishon@ti.com> 11 - - Roger Quadros <rogerq@ti.com> 11 + - Roger Quadros <rogerq@kernel.org> 12 12 13 13 properties: 14 14 compatible:

+7

Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml

··· 37 37 max bit rate supported in bps 38 38 minimum: 1 39 39 40 + mux-states: 41 + description: 42 + mux controller node to route the signals from controller to 43 + transceiver. 44 + maxItems: 1 45 + 40 46 required: 41 47 - compatible 42 48 - '#phy-cells' ··· 59 53 max-bitrate = <5000000>; 60 54 standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>; 61 55 enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>; 56 + mux-states = <&mux0 1>; 62 57 };

-3

Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml

··· 107 107 108 108 additionalProperties: false 109 109 110 - allOf: 111 - - $ref: "pinctrl.yaml#" 112 - 113 110 required: 114 111 - pinctrl-0 115 112 - pinctrl-names

-1

Documentation/devicetree/bindings/pwm/pwm-sifive.yaml

··· 8 8 title: SiFive PWM controller 9 9 10 10 maintainers: 11 - - Yash Shah <yash.shah@sifive.com> 12 11 - Sagar Kadam <sagar.kadam@sifive.com> 13 12 - Paul Walmsley <paul.walmsley@sifive.com> 14 13

-1

Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml

··· 9 9 10 10 maintainers: 11 11 - Sagar Kadam <sagar.kadam@sifive.com> 12 - - Yash Shah <yash.shah@sifive.com> 13 12 - Paul Walmsley <paul.walmsley@sifive.com> 14 13 15 14 description:

+1 -1

Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml

··· 7 7 title: Bindings for the TI wrapper module for the Cadence USBSS-DRD controller 8 8 9 9 maintainers: 10 - - Roger Quadros <rogerq@ti.com> 10 + - Roger Quadros <rogerq@kernel.org> 11 11 12 12 properties: 13 13 compatible:

+1 -1

Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml

··· 7 7 title: TI Keystone Soc USB Controller 8 8 9 9 maintainers: 10 - - Roger Quadros <rogerq@ti.com> 10 + - Roger Quadros <rogerq@kernel.org> 11 11 12 12 properties: 13 13 compatible:

-6

MAINTAINERS

··· 7007 7007 S: Maintained 7008 7008 F: drivers/edac/sb_edac.c 7009 7009 7010 - EDAC-SIFIVE 7011 - M: Yash Shah <yash.shah@sifive.com> 7012 - L: linux-edac@vger.kernel.org 7013 - S: Supported 7014 - F: drivers/edac/sifive_edac.c 7015 - 7016 7010 EDAC-SKYLAKE 7017 7011 M: Tony Luck <tony.luck@intel.com> 7018 7012 L: linux-edac@vger.kernel.org

+1 -1

drivers/of/fdt.c

··· 648 648 } 649 649 650 650 fdt_scan_reserved_mem(); 651 - fdt_init_reserved_mem(); 652 651 fdt_reserve_elfcorehdr(); 652 + fdt_init_reserved_mem(); 653 653 } 654 654 655 655 /**

+8 -8

drivers/of/unittest.c

··· 513 513 memset(&args, 0, sizeof(args)); 514 514 515 515 EXPECT_BEGIN(KERN_INFO, 516 - "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found -1"); 516 + "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found 1"); 517 517 518 518 rc = of_parse_phandle_with_args(np, "phandle-list-bad-args", 519 519 "#phandle-cells", 1, &args); 520 520 521 521 EXPECT_END(KERN_INFO, 522 - "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found -1"); 522 + "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found 1"); 523 523 524 524 unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc); 525 525 526 526 EXPECT_BEGIN(KERN_INFO, 527 - "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found -1"); 527 + "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found 1"); 528 528 529 529 rc = of_count_phandle_with_args(np, "phandle-list-bad-args", 530 530 "#phandle-cells"); 531 531 532 532 EXPECT_END(KERN_INFO, 533 - "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found -1"); 533 + "OF: /testcase-data/phandle-tests/consumer-a: #phandle-cells = 3 found 1"); 534 534 535 535 unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc); 536 536 } ··· 670 670 memset(&args, 0, sizeof(args)); 671 671 672 672 EXPECT_BEGIN(KERN_INFO, 673 - "OF: /testcase-data/phandle-tests/consumer-b: #phandle-cells = 2 found -1"); 673 + "OF: /testcase-data/phandle-tests/consumer-b: #phandle-cells = 2 found 1"); 674 674 675 675 rc = of_parse_phandle_with_args_map(np, "phandle-list-bad-args", 676 676 "phandle", 1, &args); 677 677 EXPECT_END(KERN_INFO, 678 - "OF: /testcase-data/phandle-tests/consumer-b: #phandle-cells = 2 found -1"); 678 + "OF: /testcase-data/phandle-tests/consumer-b: #phandle-cells = 2 found 1"); 679 679 680 680 unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc); 681 681 } ··· 1257 1257 unittest(pdev, "device 2 creation failed\n"); 1258 1258 1259 1259 EXPECT_BEGIN(KERN_INFO, 1260 - "platform testcase-data:testcase-device2: IRQ index 0 not found"); 1260 + "platform testcase-data:testcase-device2: error -ENXIO: IRQ index 0 not found"); 1261 1261 1262 1262 irq = platform_get_irq(pdev, 0); 1263 1263 1264 1264 EXPECT_END(KERN_INFO, 1265 - "platform testcase-data:testcase-device2: IRQ index 0 not found"); 1265 + "platform testcase-data:testcase-device2: error -ENXIO: IRQ index 0 not found"); 1266 1266 1267 1267 unittest(irq < 0 && irq != -EPROBE_DEFER, 1268 1268 "device parsing error failed - %d\n", irq);

Configure Feed

Configure Feed