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

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

Pull devicetree fixes from Rob Herring:

- Fix handling of HOST_EXTRACFLAGS for dtc

- Several warning fixes for DT bindings

* tag 'devicetree-fixes-for-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting
dt-bindings: Fix 'reg' size issues in zynqmp examples
ARM: dts: bcm2835: Change firmware compatible from simple-bus to simple-mfd
dt-bindings: leds: cznic,turris-omnia-leds: fix error in binding
dt-bindings: crypto: sa2ul: fix a DT binding check warning

Linus Torvalds 02de58b2 90fb7027

+11 -11
+2 -2
Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
··· 23 23 compatible: 24 24 items: 25 25 - const: raspberrypi,bcm2835-firmware 26 - - const: simple-bus 26 + - const: simple-mfd 27 27 28 28 mboxes: 29 29 $ref: '/schemas/types.yaml#/definitions/phandle' ··· 57 57 examples: 58 58 - | 59 59 firmware { 60 - compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; 60 + compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; 61 61 mboxes = <&mailbox>; 62 62 63 63 firmware_clocks: clocks {
+1 -1
Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml
··· 67 67 68 68 main_crypto: crypto@4e00000 { 69 69 compatible = "ti,j721-sa2ul"; 70 - reg = <0x0 0x4e00000 0x0 0x1200>; 70 + reg = <0x4e00000 0x1200>; 71 71 power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; 72 72 dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, 73 73 <&main_udmap 0x4001>;
+4 -4
Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml
··· 145 145 146 146 display@fd4a0000 { 147 147 compatible = "xlnx,zynqmp-dpsub-1.7"; 148 - reg = <0x0 0xfd4a0000 0x0 0x1000>, 149 - <0x0 0xfd4aa000 0x0 0x1000>, 150 - <0x0 0xfd4ab000 0x0 0x1000>, 151 - <0x0 0xfd4ac000 0x0 0x1000>; 148 + reg = <0xfd4a0000 0x1000>, 149 + <0xfd4aa000 0x1000>, 150 + <0xfd4ab000 0x1000>, 151 + <0xfd4ac000 0x1000>; 152 152 reg-names = "dp", "blend", "av_buf", "aud"; 153 153 interrupts = <0 119 4>; 154 154 interrupt-parent = <&gic>;
+1 -1
Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml
··· 57 57 58 58 dma: dma-controller@fd4c0000 { 59 59 compatible = "xlnx,zynqmp-dpdma"; 60 - reg = <0x0 0xfd4c0000 0x0 0x1000>; 60 + reg = <0xfd4c0000 0x1000>; 61 61 interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; 62 62 interrupt-parent = <&gic>; 63 63 clocks = <&dpdma_clk>;
+1 -1
Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
··· 30 30 const: 0 31 31 32 32 patternProperties: 33 - "^multi-led[0-9a-f]$": 33 + "^multi-led@[0-9a-b]$": 34 34 type: object 35 35 allOf: 36 36 - $ref: leds-class-multicolor.yaml#
+1 -1
arch/arm/boot/dts/bcm2835-rpi.dtsi
··· 13 13 14 14 soc { 15 15 firmware: firmware { 16 - compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; 16 + compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; 17 17 #address-cells = <1>; 18 18 #size-cells = <1>; 19 19
+1 -1
scripts/dtc/Makefile
··· 9 9 dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o 10 10 11 11 # Source files need to get at the userspace version of libfdt_env.h to compile 12 - HOST_EXTRACFLAGS := -I $(srctree)/$(src)/libfdt 12 + HOST_EXTRACFLAGS += -I $(srctree)/$(src)/libfdt 13 13 14 14 ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),) 15 15 ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),)