Re: linux-next: manual merge of the pinctrl tree with the slave-dma tree
On 12 November 2012 08:45, Stephen Rothwell 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 Rothwells...@canb.auug.org.au
>
> diff --cc arch/arm/boot/dts/spear1340.dtsi
> index 8ea3f66,6c09eb0..000
> --- a/arch/arm/boot/dts/spear1340.dtsi
> +++ b/arch/arm/boot/dts/spear1340.dtsi
> @@@ -24,25 -24,12 +24,31 @@@
> status = "disabled";
> };
>
> + dma@ea80 {
> + 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@e070 {
> + compatible = "st,spear1340-pinmux";
> + reg = <0xe070 0x1000>;
> + #gpio-range-cells = <2>;
> + };
> +
> spi1: spi@5d40 {
> compatible = "arm,pl022", "arm,primecell";
> reg = <0x5d40 0x1000>;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the pinctrl tree with the slave-dma tree
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).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/spear1340.dtsi
index 8ea3f66,6c09eb0..000
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -24,12 +24,31 @@@
status = "disabled";
};
+ dma@ea80 {
+ 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@e070 {
+ compatible = "st,spear1340-pinmux";
+ reg = <0xe070 0x1000>;
+ #gpio-range-cells = <2>;
+ };
+
spi1: spi@5d40 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x5d40 0x1000>;
pgpeAzqu3S8kK.pgp
Description: PGP signature
linux-next: manual merge of the pinctrl tree with the slave-dma tree
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).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/spear1340.dtsi
index 8ea3f66,6c09eb0..000
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -24,12 +24,31 @@@
status = disabled;
};
+ dma@ea80 {
+ 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@e070 {
+ compatible = st,spear1340-pinmux;
+ reg = 0xe070 0x1000;
+ #gpio-range-cells = 2;
+ };
+
spi1: spi@5d40 {
compatible = arm,pl022, arm,primecell;
reg = 0x5d40 0x1000;
pgpeAzqu3S8kK.pgp
Description: PGP signature
Re: linux-next: manual merge of the pinctrl tree with the slave-dma tree
On 12 November 2012 08:45, Stephen Rothwell s...@canb.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 Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/spear1340.dtsi
index 8ea3f66,6c09eb0..000
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -24,12 +24,31 @@@
status = disabled;
};
+ dma@ea80 {
+ 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@e070 {
+ compatible = st,spear1340-pinmux;
+ reg = 0xe070 0x1000;
+ #gpio-range-cells = 2;
+ };
+
spi1: spi@5d40 {
compatible = arm,pl022, arm,primecell;
reg = 0x5d40 0x1000;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
