Skip to content

Commit ae107d0

Browse files
geertuglikely
geertu
authored and
glikely
committed
dt: Fix binding typos in clock-names and interrupt-names
s/interrupts-names/interrupt-names/g s/clocks-names/clock-names/g Some of the binding files and device tree files get this wrong and the kernel won't be able to pick it up. Fix them up now so that they don't get widely used. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by : Patrice Chotard <[email protected]> Signed-off-by: Grant Likely <[email protected]>
1 parent a798c10 commit ae107d0

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎Documentation/devicetree/bindings/net/socfpga-dwmac.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 {
2323
interrupt-names = "macirq";
2424
mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
2525
clocks = <&emac_0_clk>;
26-
clocks-names = "stmmaceth";
26+
clock-names = "stmmaceth";
2727
};

‎Documentation/devicetree/bindings/net/stmmac.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Optional properties:
3333
- max-frame-size: See ethernet.txt file in the same directory
3434
- clocks: If present, the first clock should be the GMAC main clock,
3535
further clocks may be specified in derived bindings.
36-
- clocks-names: One name for each entry in the clocks property, the
36+
- clock-names: One name for each entry in the clocks property, the
3737
first one should be "stmmaceth".
3838

3939
Examples:

‎Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Example:
8383
reg = <0xfe61f080 0x4>;
8484
reg-names = "irqmux";
8585
interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
86-
interrupts-names = "irqmux";
86+
interrupt-names = "irqmux";
8787
ranges = <0 0xfe610000 0x5000>;
8888

8989
PIO0: gpio@fe610000 {
@@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{
165165
interrupt-parent = <&PIO3>;
166166
#interrupt-cells = <2>;
167167
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */
168-
interrupts-names = "card-detect";
168+
interrupt-names = "card-detect";
169169
pinctrl-names = "default";
170170
pinctrl-0 = <&pinctrl_mmc>;
171171
};

‎Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 {
4747
reg = <0x100000 0x3000>;
4848
reg-names "mpu";
4949
interrupts = <82>, <83>;
50-
interrupts-names = "tx", "rx";
50+
interrupt-names = "tx", "rx";
5151
op-mode = <0>; /* MCASP_IIS_MODE */
5252
tdm-slots = <2>;
5353
serial-dir = <

‎arch/arm/boot/dts/am33xx.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@
802802
<0x46000000 0x400000>;
803803
reg-names = "mpu", "dat";
804804
interrupts = <80>, <81>;
805-
interrupts-names = "tx", "rx";
805+
interrupt-names = "tx", "rx";
806806
status = "disabled";
807807
dmas = <&edma 8>,
808808
<&edma 9>;
@@ -816,7 +816,7 @@
816816
<0x46400000 0x400000>;
817817
reg-names = "mpu", "dat";
818818
interrupts = <82>, <83>;
819-
interrupts-names = "tx", "rx";
819+
interrupt-names = "tx", "rx";
820820
status = "disabled";
821821
dmas = <&edma 10>,
822822
<&edma 11>;

‎arch/arm/boot/dts/am4372.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@
691691
<0x46000000 0x400000>;
692692
reg-names = "mpu", "dat";
693693
interrupts = <80>, <81>;
694-
interrupts-names = "tx", "rx";
694+
interrupt-names = "tx", "rx";
695695
status = "disabled";
696696
dmas = <&edma 8>,
697697
<&edma 9>;
@@ -705,7 +705,7 @@
705705
<0x46400000 0x400000>;
706706
reg-names = "mpu", "dat";
707707
interrupts = <82>, <83>;
708-
interrupts-names = "tx", "rx";
708+
interrupt-names = "tx", "rx";
709709
status = "disabled";
710710
dmas = <&edma 10>,
711711
<&edma 11>;

‎arch/arm/boot/dts/stih415-pinctrl.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
reg = <0xfe61f080 0x4>;
5050
reg-names = "irqmux";
5151
interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
52-
interrupts-names = "irqmux";
52+
interrupt-names = "irqmux";
5353
ranges = <0 0xfe610000 0x5000>;
5454

5555
PIO0: gpio@fe610000 {
@@ -187,7 +187,7 @@
187187
reg = <0xfee0f080 0x4>;
188188
reg-names = "irqmux";
189189
interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
190-
interrupts-names = "irqmux";
190+
interrupt-names = "irqmux";
191191
ranges = <0 0xfee00000 0x8000>;
192192

193193
PIO5: gpio@fee00000 {
@@ -282,7 +282,7 @@
282282
reg = <0xfe82f080 0x4>;
283283
reg-names = "irqmux";
284284
interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;
285-
interrupts-names = "irqmux";
285+
interrupt-names = "irqmux";
286286
ranges = <0 0xfe820000 0x8000>;
287287

288288
PIO13: gpio@fe820000 {
@@ -423,7 +423,7 @@
423423
reg = <0xfd6bf080 0x4>;
424424
reg-names = "irqmux";
425425
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
426-
interrupts-names = "irqmux";
426+
interrupt-names = "irqmux";
427427
ranges = <0 0xfd6b0000 0x3000>;
428428

429429
PIO100: gpio@fd6b0000 {
@@ -460,7 +460,7 @@
460460
reg = <0xfd33f080 0x4>;
461461
reg-names = "irqmux";
462462
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
463-
interrupts-names = "irqmux";
463+
interrupt-names = "irqmux";
464464
ranges = <0 0xfd330000 0x5000>;
465465

466466
PIO103: gpio@fd330000 {

‎arch/arm/boot/dts/stih416-pinctrl.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
reg = <0xfe61f080 0x4>;
5454
reg-names = "irqmux";
5555
interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;
56-
interrupts-names = "irqmux";
56+
interrupt-names = "irqmux";
5757
ranges = <0 0xfe610000 0x6000>;
5858

5959
PIO0: gpio@fe610000 {
@@ -201,7 +201,7 @@
201201
reg = <0xfee0f080 0x4>;
202202
reg-names = "irqmux";
203203
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
204-
interrupts-names = "irqmux";
204+
interrupt-names = "irqmux";
205205
ranges = <0 0xfee00000 0x10000>;
206206

207207
PIO5: gpio@fee00000 {
@@ -333,7 +333,7 @@
333333
reg = <0xfe82f080 0x4>;
334334
reg-names = "irqmux";
335335
interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
336-
interrupts-names = "irqmux";
336+
interrupt-names = "irqmux";
337337
ranges = <0 0xfe820000 0x6000>;
338338

339339
PIO13: gpio@fe820000 {
@@ -461,7 +461,7 @@
461461
reg = <0xfd6bf080 0x4>;
462462
reg-names = "irqmux";
463463
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
464-
interrupts-names = "irqmux";
464+
interrupt-names = "irqmux";
465465
ranges = <0 0xfd6b0000 0x3000>;
466466

467467
PIO100: gpio@fd6b0000 {
@@ -498,7 +498,7 @@
498498
reg = <0xfd33f080 0x4>;
499499
reg-names = "irqmux";
500500
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
501-
interrupts-names = "irqmux";
501+
interrupt-names = "irqmux";
502502
ranges = <0 0xfd330000 0x5000>;
503503

504504
PIO103: gpio@fd330000 {

‎drivers/of/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
364364

365365
memset(r, 0, sizeof(*r));
366366
/*
367-
* Get optional "interrupts-names" property to add a name
367+
* Get optional "interrupt-names" property to add a name
368368
* to the resource.
369369
*/
370370
of_property_read_string_index(dev, "interrupt-names", index,

0 commit comments

Comments
 (0)