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

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 <geert+renesas@glider.be>
Acked-by : Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

authored by

Geert Uytterhoeven and committed by
Grant Likely
ae107d06 a798c10f

+20 -20
+1 -1
Documentation/devicetree/bindings/net/socfpga-dwmac.txt
··· 23 23 interrupt-names = "macirq"; 24 24 mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ 25 25 clocks = <&emac_0_clk>; 26 - clocks-names = "stmmaceth"; 26 + clock-names = "stmmaceth"; 27 27 };
+1 -1
Documentation/devicetree/bindings/net/stmmac.txt
··· 33 33 - max-frame-size: See ethernet.txt file in the same directory 34 34 - clocks: If present, the first clock should be the GMAC main clock, 35 35 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 37 37 first one should be "stmmaceth". 38 38 39 39 Examples:
+2 -2
Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
··· 83 83 reg = <0xfe61f080 0x4>; 84 84 reg-names = "irqmux"; 85 85 interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; 86 - interrupts-names = "irqmux"; 86 + interrupt-names = "irqmux"; 87 87 ranges = <0 0xfe610000 0x5000>; 88 88 89 89 PIO0: gpio@fe610000 { ··· 165 165 interrupt-parent = <&PIO3>; 166 166 #interrupt-cells = <2>; 167 167 interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */ 168 - interrupts-names = "card-detect"; 168 + interrupt-names = "card-detect"; 169 169 pinctrl-names = "default"; 170 170 pinctrl-0 = <&pinctrl_mmc>; 171 171 };
+1 -1
Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
··· 47 47 reg = <0x100000 0x3000>; 48 48 reg-names "mpu"; 49 49 interrupts = <82>, <83>; 50 - interrupts-names = "tx", "rx"; 50 + interrupt-names = "tx", "rx"; 51 51 op-mode = <0>; /* MCASP_IIS_MODE */ 52 52 tdm-slots = <2>; 53 53 serial-dir = <
+2 -2
arch/arm/boot/dts/am33xx.dtsi
··· 802 802 <0x46000000 0x400000>; 803 803 reg-names = "mpu", "dat"; 804 804 interrupts = <80>, <81>; 805 - interrupts-names = "tx", "rx"; 805 + interrupt-names = "tx", "rx"; 806 806 status = "disabled"; 807 807 dmas = <&edma 8>, 808 808 <&edma 9>; ··· 816 816 <0x46400000 0x400000>; 817 817 reg-names = "mpu", "dat"; 818 818 interrupts = <82>, <83>; 819 - interrupts-names = "tx", "rx"; 819 + interrupt-names = "tx", "rx"; 820 820 status = "disabled"; 821 821 dmas = <&edma 10>, 822 822 <&edma 11>;
+2 -2
arch/arm/boot/dts/am4372.dtsi
··· 691 691 <0x46000000 0x400000>; 692 692 reg-names = "mpu", "dat"; 693 693 interrupts = <80>, <81>; 694 - interrupts-names = "tx", "rx"; 694 + interrupt-names = "tx", "rx"; 695 695 status = "disabled"; 696 696 dmas = <&edma 8>, 697 697 <&edma 9>; ··· 705 705 <0x46400000 0x400000>; 706 706 reg-names = "mpu", "dat"; 707 707 interrupts = <82>, <83>; 708 - interrupts-names = "tx", "rx"; 708 + interrupt-names = "tx", "rx"; 709 709 status = "disabled"; 710 710 dmas = <&edma 10>, 711 711 <&edma 11>;
+5 -5
arch/arm/boot/dts/stih415-pinctrl.dtsi
··· 49 49 reg = <0xfe61f080 0x4>; 50 50 reg-names = "irqmux"; 51 51 interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; 52 - interrupts-names = "irqmux"; 52 + interrupt-names = "irqmux"; 53 53 ranges = <0 0xfe610000 0x5000>; 54 54 55 55 PIO0: gpio@fe610000 { ··· 187 187 reg = <0xfee0f080 0x4>; 188 188 reg-names = "irqmux"; 189 189 interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; 190 - interrupts-names = "irqmux"; 190 + interrupt-names = "irqmux"; 191 191 ranges = <0 0xfee00000 0x8000>; 192 192 193 193 PIO5: gpio@fee00000 { ··· 282 282 reg = <0xfe82f080 0x4>; 283 283 reg-names = "irqmux"; 284 284 interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; 285 - interrupts-names = "irqmux"; 285 + interrupt-names = "irqmux"; 286 286 ranges = <0 0xfe820000 0x8000>; 287 287 288 288 PIO13: gpio@fe820000 { ··· 423 423 reg = <0xfd6bf080 0x4>; 424 424 reg-names = "irqmux"; 425 425 interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; 426 - interrupts-names = "irqmux"; 426 + interrupt-names = "irqmux"; 427 427 ranges = <0 0xfd6b0000 0x3000>; 428 428 429 429 PIO100: gpio@fd6b0000 { ··· 460 460 reg = <0xfd33f080 0x4>; 461 461 reg-names = "irqmux"; 462 462 interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; 463 - interrupts-names = "irqmux"; 463 + interrupt-names = "irqmux"; 464 464 ranges = <0 0xfd330000 0x5000>; 465 465 466 466 PIO103: gpio@fd330000 {
+5 -5
arch/arm/boot/dts/stih416-pinctrl.dtsi
··· 53 53 reg = <0xfe61f080 0x4>; 54 54 reg-names = "irqmux"; 55 55 interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; 56 - interrupts-names = "irqmux"; 56 + interrupt-names = "irqmux"; 57 57 ranges = <0 0xfe610000 0x6000>; 58 58 59 59 PIO0: gpio@fe610000 { ··· 201 201 reg = <0xfee0f080 0x4>; 202 202 reg-names = "irqmux"; 203 203 interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; 204 - interrupts-names = "irqmux"; 204 + interrupt-names = "irqmux"; 205 205 ranges = <0 0xfee00000 0x10000>; 206 206 207 207 PIO5: gpio@fee00000 { ··· 333 333 reg = <0xfe82f080 0x4>; 334 334 reg-names = "irqmux"; 335 335 interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; 336 - interrupts-names = "irqmux"; 336 + interrupt-names = "irqmux"; 337 337 ranges = <0 0xfe820000 0x6000>; 338 338 339 339 PIO13: gpio@fe820000 { ··· 461 461 reg = <0xfd6bf080 0x4>; 462 462 reg-names = "irqmux"; 463 463 interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; 464 - interrupts-names = "irqmux"; 464 + interrupt-names = "irqmux"; 465 465 ranges = <0 0xfd6b0000 0x3000>; 466 466 467 467 PIO100: gpio@fd6b0000 { ··· 498 498 reg = <0xfd33f080 0x4>; 499 499 reg-names = "irqmux"; 500 500 interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; 501 - interrupts-names = "irqmux"; 501 + interrupt-names = "irqmux"; 502 502 ranges = <0 0xfd330000 0x5000>; 503 503 504 504 PIO103: gpio@fd330000 {
+1 -1
drivers/of/irq.c
··· 364 364 365 365 memset(r, 0, sizeof(*r)); 366 366 /* 367 - * Get optional "interrupts-names" property to add a name 367 + * Get optional "interrupt-names" property to add a name 368 368 * to the resource. 369 369 */ 370 370 of_property_read_string_index(dev, "interrupt-names", index,