Skip to content

Commit 02de58b

Browse files
committed
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
2 parents 90fb702 + efe84d4 commit 02de58b

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
compatible:
2424
items:
2525
- const: raspberrypi,bcm2835-firmware
26-
- const: simple-bus
26+
- const: simple-mfd
2727

2828
mboxes:
2929
$ref: '/schemas/types.yaml#/definitions/phandle'
@@ -57,7 +57,7 @@ required:
5757
examples:
5858
- |
5959
firmware {
60-
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
60+
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
6161
mboxes = <&mailbox>;
6262
6363
firmware_clocks: clocks {

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ examples:
6767
6868
main_crypto: crypto@4e00000 {
6969
compatible = "ti,j721-sa2ul";
70-
reg = <0x0 0x4e00000 0x0 0x1200>;
70+
reg = <0x4e00000 0x1200>;
7171
power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
7272
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
7373
<&main_udmap 0x4001>;

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ examples:
145145
146146
display@fd4a0000 {
147147
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>;
152152
reg-names = "dp", "blend", "av_buf", "aud";
153153
interrupts = <0 119 4>;
154154
interrupt-parent = <&gic>;

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ examples:
5757
5858
dma: dma-controller@fd4c0000 {
5959
compatible = "xlnx,zynqmp-dpdma";
60-
reg = <0x0 0xfd4c0000 0x0 0x1000>;
60+
reg = <0xfd4c0000 0x1000>;
6161
interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
6262
interrupt-parent = <&gic>;
6363
clocks = <&dpdma_clk>;

Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ properties:
3030
const: 0
3131

3232
patternProperties:
33-
"^multi-led[0-9a-f]$":
33+
"^multi-led@[0-9a-b]$":
3434
type: object
3535
allOf:
3636
- $ref: leds-class-multicolor.yaml#

arch/arm/boot/dts/bcm2835-rpi.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
soc {
1515
firmware: firmware {
16-
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
16+
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
1717
#address-cells = <1>;
1818
#size-cells = <1>;
1919

scripts/dtc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
99
dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o
1010

1111
# 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
1313

1414
ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),)
1515
ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),)

0 commit comments

Comments
 (0)