Commit 02de58b2 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 90fb7027 efe84d40
...@@ -23,7 +23,7 @@ properties: ...@@ -23,7 +23,7 @@ properties:
compatible: compatible:
items: items:
- const: raspberrypi,bcm2835-firmware - const: raspberrypi,bcm2835-firmware
- const: simple-bus - const: simple-mfd
mboxes: mboxes:
$ref: '/schemas/types.yaml#/definitions/phandle' $ref: '/schemas/types.yaml#/definitions/phandle'
...@@ -57,7 +57,7 @@ required: ...@@ -57,7 +57,7 @@ required:
examples: examples:
- | - |
firmware { firmware {
compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
mboxes = <&mailbox>; mboxes = <&mailbox>;
firmware_clocks: clocks { firmware_clocks: clocks {
......
...@@ -67,7 +67,7 @@ examples: ...@@ -67,7 +67,7 @@ examples:
main_crypto: crypto@4e00000 { main_crypto: crypto@4e00000 {
compatible = "ti,j721-sa2ul"; compatible = "ti,j721-sa2ul";
reg = <0x0 0x4e00000 0x0 0x1200>; reg = <0x4e00000 0x1200>;
power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
<&main_udmap 0x4001>; <&main_udmap 0x4001>;
......
...@@ -145,10 +145,10 @@ examples: ...@@ -145,10 +145,10 @@ examples:
display@fd4a0000 { display@fd4a0000 {
compatible = "xlnx,zynqmp-dpsub-1.7"; compatible = "xlnx,zynqmp-dpsub-1.7";
reg = <0x0 0xfd4a0000 0x0 0x1000>, reg = <0xfd4a0000 0x1000>,
<0x0 0xfd4aa000 0x0 0x1000>, <0xfd4aa000 0x1000>,
<0x0 0xfd4ab000 0x0 0x1000>, <0xfd4ab000 0x1000>,
<0x0 0xfd4ac000 0x0 0x1000>; <0xfd4ac000 0x1000>;
reg-names = "dp", "blend", "av_buf", "aud"; reg-names = "dp", "blend", "av_buf", "aud";
interrupts = <0 119 4>; interrupts = <0 119 4>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
...@@ -57,7 +57,7 @@ examples: ...@@ -57,7 +57,7 @@ examples:
dma: dma-controller@fd4c0000 { dma: dma-controller@fd4c0000 {
compatible = "xlnx,zynqmp-dpdma"; compatible = "xlnx,zynqmp-dpdma";
reg = <0x0 0xfd4c0000 0x0 0x1000>; reg = <0xfd4c0000 0x1000>;
interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
clocks = <&dpdma_clk>; clocks = <&dpdma_clk>;
......
...@@ -30,7 +30,7 @@ properties: ...@@ -30,7 +30,7 @@ properties:
const: 0 const: 0
patternProperties: patternProperties:
"^multi-led[0-9a-f]$": "^multi-led@[0-9a-b]$":
type: object type: object
allOf: allOf:
- $ref: leds-class-multicolor.yaml# - $ref: leds-class-multicolor.yaml#
......
...@@ -13,7 +13,7 @@ act { ...@@ -13,7 +13,7 @@ act {
soc { soc {
firmware: firmware { firmware: firmware {
compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -9,7 +9,7 @@ dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \ ...@@ -9,7 +9,7 @@ dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o
# Source files need to get at the userspace version of libfdt_env.h to compile # Source files need to get at the userspace version of libfdt_env.h to compile
HOST_EXTRACFLAGS := -I $(srctree)/$(src)/libfdt HOST_EXTRACFLAGS += -I $(srctree)/$(src)/libfdt
ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),) ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),)
ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),) ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment