| Message ID | 1398192025-31523-2-git-send-email-geert+renesas@glider.be |
|---|---|
| State | Superseded, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 = <
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(-)