* [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g
@ 2014-04-22 18:40 Geert Uytterhoeven
2014-04-22 18:40 ` [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g Geert Uytterhoeven
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2014-04-22 18:40 UTC (permalink / raw)
To: Rob Herring, devicetree
Cc: linux-kernel, Geert Uytterhoeven, Dinh Nguyen, Arnd Bergmann, netdev
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: netdev@vger.kernel.org
---
.../devicetree/bindings/net/socfpga-dwmac.txt | 2 +-
Documentation/devicetree/bindings/net/stmmac.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
index 636f0ac4e223..2a60cd3e8d5d 100644
--- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
+++ b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
@@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 {
interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
clocks = <&emac_0_clk>;
- clocks-names = "stmmaceth";
+ clock-names = "stmmaceth";
};
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index 80c1fb8bfbb8..a2acd2b26baf 100644
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -33,7 +33,7 @@ Optional properties:
- max-frame-size: See ethernet.txt file in the same directory
- clocks: If present, the first clock should be the GMAC main clock,
further clocks may be specified in derived bindings.
-- clocks-names: One name for each entry in the clocks property, the
+- clock-names: One name for each entry in the clocks property, the
first one should be "stmmaceth".
Examples:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Geert Uytterhoeven @ 2014-04-22 18:40 ` Geert Uytterhoeven 2014-04-23 14:11 ` Linus Walleij 2014-04-22 18:40 ` [PATCH 3/4] ARM: dts: " Geert Uytterhoeven ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2014-04-22 18:40 UTC (permalink / raw) To: Rob Herring, devicetree Cc: linux-kernel, Geert Uytterhoeven, Linus Walleij, Signed-off-by: Mark Brown Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Signed-off-by: Mark Brown <broonie@linaro.org> --- .../devicetree/bindings/pinctrl/pinctrl-st.txt | 4 ++-- .../bindings/sound/davinci-mcasp-audio.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt index 4bd5be0e5e7d..26bcb18f4e60 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt @@ -83,7 +83,7 @@ Example: reg = <0xfe61f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfe610000 0x5000>; PIO0: gpio@fe610000 { @@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{ interrupt-parent = <&PIO3>; #interrupt-cells = <2>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */ - interrupts-names = "card-detect"; + interrupt-names = "card-detect"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mmc>; }; diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index 569b26c4a81e..60ca07996458 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt @@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 { reg = <0x100000 0x3000>; reg-names "mpu"; interrupts = <82>, <83>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; op-mode = <0>; /* MCASP_IIS_MODE */ tdm-slots = <2>; serial-dir = < -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 ` [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g Geert Uytterhoeven @ 2014-04-23 14:11 ` Linus Walleij 2014-04-23 17:35 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Linus Walleij @ 2014-04-23 14:11 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Rob Herring, devicetree, linux-kernel, Signed-off-by: Mark Brown On Tue, Apr 22, 2014 at 8:40 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Signed-off-by: Mark Brown <broonie@linaro.org> > --- > .../devicetree/bindings/pinctrl/pinctrl-st.txt | 4 ++-- > .../bindings/sound/davinci-mcasp-audio.txt | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Acked-by: Linus Walleij <linus.walleij@linaro.org> Maybe Mark can apply this then, as it's mostly sound related. Ideally it should be two patches but who cares about such a petty detail. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g 2014-04-23 14:11 ` Linus Walleij @ 2014-04-23 17:35 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2014-04-23 17:35 UTC (permalink / raw) To: Linus Walleij Cc: Geert Uytterhoeven, Rob Herring, devicetree, linux-kernel, Signed-off-by: Mark Brown Hi Linus, On Wed, Apr 23, 2014 at 4:11 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Tue, Apr 22, 2014 at 8:40 PM, Geert Uytterhoeven > <geert+renesas@glider.be> wrote: >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> Cc: Linus Walleij <linus.walleij@linaro.org> >> Cc: Signed-off-by: Mark Brown <broonie@linaro.org> >> --- >> .../devicetree/bindings/pinctrl/pinctrl-st.txt | 4 ++-- >> .../bindings/sound/davinci-mcasp-audio.txt | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) > > Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks! > Maybe Mark can apply this then, as it's mostly sound related. > Ideally it should be two patches but who cares about such a petty > detail. Opinions about patch granularity differ... Grant Likely replied to one of the other patches in the series: | Applied all, but squashed into a single patch. I'll send it up to Linus | as a fix for 3.15 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/4] ARM: dts: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Geert Uytterhoeven 2014-04-22 18:40 ` [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g Geert Uytterhoeven @ 2014-04-22 18:40 ` Geert Uytterhoeven 2014-04-23 7:03 ` [STLinux Kernel] " Patrice Chotard 2014-04-22 18:40 ` [PATCH 4/4] of/irq: " Geert Uytterhoeven 2014-04-25 15:47 ` [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Dinh Nguyen 3 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2014-04-22 18:40 UTC (permalink / raw) To: Rob Herring, devicetree Cc: linux-kernel, Geert Uytterhoeven, Benoit Cousson, Srinivas Kandagatla, linux-omap, kernel, linux-arm-kernel Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Benoit Cousson <bcousson@baylibre.com> Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> Cc: linux-omap@vger.kernel.org Cc: kernel@stlinux.com Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/am33xx.dtsi | 4 ++-- arch/arm/boot/dts/am4372.dtsi | 4 ++-- arch/arm/boot/dts/stih415-pinctrl.dtsi | 10 +++++----- arch/arm/boot/dts/stih416-pinctrl.dtsi | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 07f283c20eb1..cb6811e5ae5a 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -802,7 +802,7 @@ <0x46000000 0x400000>; reg-names = "mpu", "dat"; interrupts = <80>, <81>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 8>, <&edma 9>; @@ -816,7 +816,7 @@ <0x46400000 0x400000>; reg-names = "mpu", "dat"; interrupts = <82>, <83>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 10>, <&edma 11>; diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 36d523a26831..d1f8707ff1df 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -691,7 +691,7 @@ <0x46000000 0x400000>; reg-names = "mpu", "dat"; interrupts = <80>, <81>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 8>, <&edma 9>; @@ -705,7 +705,7 @@ <0x46400000 0x400000>; reg-names = "mpu", "dat"; interrupts = <82>, <83>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 10>, <&edma 11>; diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi index f09fb10a3791..81df870e5ee6 100644 --- a/arch/arm/boot/dts/stih415-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi @@ -49,7 +49,7 @@ reg = <0xfe61f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfe610000 0x5000>; PIO0: gpio@fe610000 { @@ -187,7 +187,7 @@ reg = <0xfee0f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfee00000 0x8000>; PIO5: gpio@fee00000 { @@ -282,7 +282,7 @@ reg = <0xfe82f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfe820000 0x8000>; PIO13: gpio@fe820000 { @@ -423,7 +423,7 @@ reg = <0xfd6bf080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfd6b0000 0x3000>; PIO100: gpio@fd6b0000 { @@ -460,7 +460,7 @@ reg = <0xfd33f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfd330000 0x5000>; PIO103: gpio@fd330000 { diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index aeea304086eb..250d5ecc951e 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi @@ -53,7 +53,7 @@ reg = <0xfe61f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfe610000 0x6000>; PIO0: gpio@fe610000 { @@ -201,7 +201,7 @@ reg = <0xfee0f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfee00000 0x10000>; PIO5: gpio@fee00000 { @@ -333,7 +333,7 @@ reg = <0xfe82f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfe820000 0x6000>; PIO13: gpio@fe820000 { @@ -461,7 +461,7 @@ reg = <0xfd6bf080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfd6b0000 0x3000>; PIO100: gpio@fd6b0000 { @@ -498,7 +498,7 @@ reg = <0xfd33f080 0x4>; reg-names = "irqmux"; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; - interrupts-names = "irqmux"; + interrupt-names = "irqmux"; ranges = <0 0xfd330000 0x5000>; PIO103: gpio@fd330000 { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [STLinux Kernel] [PATCH 3/4] ARM: dts: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 ` [PATCH 3/4] ARM: dts: " Geert Uytterhoeven @ 2014-04-23 7:03 ` Patrice Chotard 0 siblings, 0 replies; 10+ messages in thread From: Patrice Chotard @ 2014-04-23 7:03 UTC (permalink / raw) To: Geert Uytterhoeven, Rob Herring, devicetree Cc: kernel, Srinivas Kandagatla, linux-kernel, Benoit Cousson, linux-omap, linux-arm-kernel Acked-by : Patrice Chotard <patrice.chotard@st.com> Thanks On 04/22/2014 08:40 PM, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Benoit Cousson <bcousson@baylibre.com> > Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> > Cc: linux-omap@vger.kernel.org > Cc: kernel@stlinux.com > Cc: linux-arm-kernel@lists.infradead.org > --- > arch/arm/boot/dts/am33xx.dtsi | 4 ++-- > arch/arm/boot/dts/am4372.dtsi | 4 ++-- > arch/arm/boot/dts/stih415-pinctrl.dtsi | 10 +++++----- > arch/arm/boot/dts/stih416-pinctrl.dtsi | 10 +++++----- > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index 07f283c20eb1..cb6811e5ae5a 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -802,7 +802,7 @@ > <0x46000000 0x400000>; > reg-names = "mpu", "dat"; > interrupts = <80>, <81>; > - interrupts-names = "tx", "rx"; > + interrupt-names = "tx", "rx"; > status = "disabled"; > dmas = <&edma 8>, > <&edma 9>; > @@ -816,7 +816,7 @@ > <0x46400000 0x400000>; > reg-names = "mpu", "dat"; > interrupts = <82>, <83>; > - interrupts-names = "tx", "rx"; > + interrupt-names = "tx", "rx"; > status = "disabled"; > dmas = <&edma 10>, > <&edma 11>; > diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi > index 36d523a26831..d1f8707ff1df 100644 > --- a/arch/arm/boot/dts/am4372.dtsi > +++ b/arch/arm/boot/dts/am4372.dtsi > @@ -691,7 +691,7 @@ > <0x46000000 0x400000>; > reg-names = "mpu", "dat"; > interrupts = <80>, <81>; > - interrupts-names = "tx", "rx"; > + interrupt-names = "tx", "rx"; > status = "disabled"; > dmas = <&edma 8>, > <&edma 9>; > @@ -705,7 +705,7 @@ > <0x46400000 0x400000>; > reg-names = "mpu", "dat"; > interrupts = <82>, <83>; > - interrupts-names = "tx", "rx"; > + interrupt-names = "tx", "rx"; > status = "disabled"; > dmas = <&edma 10>, > <&edma 11>; > diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi > index f09fb10a3791..81df870e5ee6 100644 > --- a/arch/arm/boot/dts/stih415-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi > @@ -49,7 +49,7 @@ > reg = <0xfe61f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfe610000 0x5000>; > > PIO0: gpio@fe610000 { > @@ -187,7 +187,7 @@ > reg = <0xfee0f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfee00000 0x8000>; > > PIO5: gpio@fee00000 { > @@ -282,7 +282,7 @@ > reg = <0xfe82f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfe820000 0x8000>; > > PIO13: gpio@fe820000 { > @@ -423,7 +423,7 @@ > reg = <0xfd6bf080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfd6b0000 0x3000>; > > PIO100: gpio@fd6b0000 { > @@ -460,7 +460,7 @@ > reg = <0xfd33f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfd330000 0x5000>; > > PIO103: gpio@fd330000 { > diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi > index aeea304086eb..250d5ecc951e 100644 > --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi > @@ -53,7 +53,7 @@ > reg = <0xfe61f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfe610000 0x6000>; > > PIO0: gpio@fe610000 { > @@ -201,7 +201,7 @@ > reg = <0xfee0f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfee00000 0x10000>; > > PIO5: gpio@fee00000 { > @@ -333,7 +333,7 @@ > reg = <0xfe82f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfe820000 0x6000>; > > PIO13: gpio@fe820000 { > @@ -461,7 +461,7 @@ > reg = <0xfd6bf080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfd6b0000 0x3000>; > > PIO100: gpio@fd6b0000 { > @@ -498,7 +498,7 @@ > reg = <0xfd33f080 0x4>; > reg-names = "irqmux"; > interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; > - interrupts-names = "irqmux"; > + interrupt-names = "irqmux"; > ranges = <0 0xfd330000 0x5000>; > > PIO103: gpio@fd330000 { ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] of/irq: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Geert Uytterhoeven 2014-04-22 18:40 ` [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g Geert Uytterhoeven 2014-04-22 18:40 ` [PATCH 3/4] ARM: dts: " Geert Uytterhoeven @ 2014-04-22 18:40 ` Geert Uytterhoeven 2014-04-23 12:02 ` Grant Likely 2014-04-25 15:47 ` [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Dinh Nguyen 3 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2014-04-22 18:40 UTC (permalink / raw) To: Rob Herring, devicetree; +Cc: linux-kernel, Geert Uytterhoeven Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/of/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 9bcf2cf19357..e2e4c548a42f 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -364,7 +364,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) memset(r, 0, sizeof(*r)); /* - * Get optional "interrupts-names" property to add a name + * Get optional "interrupt-names" property to add a name * to the resource. */ of_property_read_string_index(dev, "interrupt-names", index, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] of/irq: Typo s/interrupts-names/interrupt-names/g 2014-04-22 18:40 ` [PATCH 4/4] of/irq: " Geert Uytterhoeven @ 2014-04-23 12:02 ` Grant Likely 0 siblings, 0 replies; 10+ messages in thread From: Grant Likely @ 2014-04-23 12:02 UTC (permalink / raw) To: Geert Uytterhoeven, Rob Herring, devicetree Cc: linux-kernel, Geert Uytterhoeven On Tue, 22 Apr 2014 20:40:25 +0200, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks Geert, Applied all, but squashed into a single patch. I'll send it up to Linus as a fix for 3.15 g. > --- > drivers/of/irq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/irq.c b/drivers/of/irq.c > index 9bcf2cf19357..e2e4c548a42f 100644 > --- a/drivers/of/irq.c > +++ b/drivers/of/irq.c > @@ -364,7 +364,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) > > memset(r, 0, sizeof(*r)); > /* > - * Get optional "interrupts-names" property to add a name > + * Get optional "interrupt-names" property to add a name > * to the resource. > */ > of_property_read_string_index(dev, "interrupt-names", index, > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g 2014-04-22 18:40 [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Geert Uytterhoeven ` (2 preceding siblings ...) 2014-04-22 18:40 ` [PATCH 4/4] of/irq: " Geert Uytterhoeven @ 2014-04-25 15:47 ` Dinh Nguyen 2014-04-28 11:42 ` Grant Likely 3 siblings, 1 reply; 10+ messages in thread From: Dinh Nguyen @ 2014-04-25 15:47 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Rob Herring, devicetree, linux-kernel, Arnd Bergmann, netdev On Tue, 2014-04-22 at 20:40 +0200, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Dinh Nguyen <dinguyen@altera.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: netdev@vger.kernel.org > --- > .../devicetree/bindings/net/socfpga-dwmac.txt | 2 +- > Documentation/devicetree/bindings/net/stmmac.txt | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > index 636f0ac4e223..2a60cd3e8d5d 100644 > --- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > +++ b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > @@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 { > interrupt-names = "macirq"; > mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ > clocks = <&emac_0_clk>; > - clocks-names = "stmmaceth"; > + clock-names = "stmmaceth"; > }; > diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt > index 80c1fb8bfbb8..a2acd2b26baf 100644 > --- a/Documentation/devicetree/bindings/net/stmmac.txt > +++ b/Documentation/devicetree/bindings/net/stmmac.txt > @@ -33,7 +33,7 @@ Optional properties: > - max-frame-size: See ethernet.txt file in the same directory > - clocks: If present, the first clock should be the GMAC main clock, > further clocks may be specified in derived bindings. > -- clocks-names: One name for each entry in the clocks property, the > +- clock-names: One name for each entry in the clocks property, the > first one should be "stmmaceth". > > Examples: I've applied this patch to git.rocketboards.org/linux-socfpga-next.git next-dt. Thanks, Dinh ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g 2014-04-25 15:47 ` [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Dinh Nguyen @ 2014-04-28 11:42 ` Grant Likely 0 siblings, 0 replies; 10+ messages in thread From: Grant Likely @ 2014-04-28 11:42 UTC (permalink / raw) To: Dinh Nguyen, Geert Uytterhoeven Cc: Rob Herring, devicetree, linux-kernel, Arnd Bergmann, netdev On Fri, 25 Apr 2014 10:47:30 -0500, Dinh Nguyen <dinguyen@altera.com> wrote: > On Tue, 2014-04-22 at 20:40 +0200, Geert Uytterhoeven wrote: > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Cc: Dinh Nguyen <dinguyen@altera.com> > > Cc: Arnd Bergmann <arnd@arndb.de> > > Cc: netdev@vger.kernel.org > > --- > > .../devicetree/bindings/net/socfpga-dwmac.txt | 2 +- > > Documentation/devicetree/bindings/net/stmmac.txt | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > > index 636f0ac4e223..2a60cd3e8d5d 100644 > > --- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > > +++ b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt > > @@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 { > > interrupt-names = "macirq"; > > mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ > > clocks = <&emac_0_clk>; > > - clocks-names = "stmmaceth"; > > + clock-names = "stmmaceth"; > > }; > > diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt > > index 80c1fb8bfbb8..a2acd2b26baf 100644 > > --- a/Documentation/devicetree/bindings/net/stmmac.txt > > +++ b/Documentation/devicetree/bindings/net/stmmac.txt > > @@ -33,7 +33,7 @@ Optional properties: > > - max-frame-size: See ethernet.txt file in the same directory > > - clocks: If present, the first clock should be the GMAC main clock, > > further clocks may be specified in derived bindings. > > -- clocks-names: One name for each entry in the clocks property, the > > +- clock-names: One name for each entry in the clocks property, the > > first one should be "stmmaceth". > > > > Examples: > > I've applied this patch to git.rocketboards.org/linux-socfpga-next.git > next-dt. I've already got it in my tree which is in linux-next and will be asking Linus to pull shortly. g. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-04-28 11:42 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-04-22 18:40 [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Geert Uytterhoeven 2014-04-22 18:40 ` [PATCH 2/4] dt: bindings: Typo s/interrupts-names/interrupt-names/g Geert Uytterhoeven 2014-04-23 14:11 ` Linus Walleij 2014-04-23 17:35 ` Geert Uytterhoeven 2014-04-22 18:40 ` [PATCH 3/4] ARM: dts: " Geert Uytterhoeven 2014-04-23 7:03 ` [STLinux Kernel] " Patrice Chotard 2014-04-22 18:40 ` [PATCH 4/4] of/irq: " Geert Uytterhoeven 2014-04-23 12:02 ` Grant Likely 2014-04-25 15:47 ` [PATCH 1/4] dt: bindings: Typo s/clocks-names/clock-names/g Dinh Nguyen 2014-04-28 11:42 ` Grant Likely
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).