linux-kernel - Re: linux-next: manual merge of the pinctrl tree with the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAKohponChNTOw=h6V1wka9vO0n8QWObX4O9PjDfir8Fr8gidEA@mail.gmail.com>
Date:	Mon, 12 Nov 2012 09:05:00 +0530
From:	Viresh Kumar <viresh.kumar@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vinod Koul <vinod.koul@...el.com>,
	spear-devel <spear-devel@...t.st.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the slave-dma tree

On 12 November 2012 08:45, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Linus,
>
> Today's linux-next merge of the pinctrl tree got a conflict in
> arch/arm/boot/dts/spear1340.dtsi between commit b47394911c26 ("ARM:
> SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit
> 4ddb1c295752 ("ARM: SPEAr: Add plgpio node in device tree dtsi files")
> from the pinctrl tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen. It looks perfectly fine. Thanks for keeping ascending order
of node names. :)

> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
>
> diff --cc arch/arm/boot/dts/spear1340.dtsi
> index 8ea3f66,6c09eb0..0000000
> --- a/arch/arm/boot/dts/spear1340.dtsi
> +++ b/arch/arm/boot/dts/spear1340.dtsi
> @@@ -24,25 -24,12 +24,31 @@@
>                         status = "disabled";
>                 };
>
>  +              dma@...00000 {
>  +                      slave_info {
>  +                              uart1_tx {
>  +                                      bus_id = "uart1_tx";
>  +                                      cfg_hi = <0x6000>;      /* 0xC << 11 */
>  +                                      cfg_lo = <0>;
>  +                                      src_master = <0>;
>  +                                      dst_master = <1>;
>  +                              };
>  +                              uart1_tx {
>  +                                      bus_id = "uart1_tx";
>  +                                      cfg_hi = <0x680>;       /* 0xD << 7 */
>  +                                      cfg_lo = <0>;
>  +                                      src_master = <1>;
>  +                                      dst_master = <0>;
>  +                              };
>  +                      };
>  +              };
>  +
> +               pinmux: pinmux@...00000 {
> +                       compatible = "st,spear1340-pinmux";
> +                       reg = <0xe0700000 0x1000>;
> +                       #gpio-range-cells = <2>;
> +               };
> +
>                 spi1: spi@...00000 {
>                         compatible = "arm,pl022", "arm,primecell";
>                         reg = <0x5d400000 0x1000>;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/