* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
@ 2012-12-23 2:35 Nobuhiro Iwamatsu
2012-12-27 17:05 ` Jason Cooper
0 siblings, 1 reply; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2012-12-23 2:35 UTC (permalink / raw)
To: linux-arm-kernel
88f6281 and 88f6282 has common pinctrl.
This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 69 deletions(-)
create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index d6c9d65..c8fe885 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,44 +1,10 @@
+/include/ "kirkwood-628x-base.dtsi"
+
/ {
ocp at f1000000 {
pinctrl: pinctrl at 10000 {
compatible = "marvell,88f6281-pinctrl";
reg = <0x10000 0x20>;
-
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18",
- "mpp19";
- marvell,function = "nand";
- };
- pmx_sata0: pmx-sata0 {
- marvell,pins = "mpp5", "mpp21", "mpp23";
- marvell,function = "sata0";
- };
- pmx_sata1: pmx-sata1 {
- marvell,pins = "mpp4", "mpp20", "mpp22";
- marvell,function = "sata1";
- };
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
- pmx_sdio: pmx-sdio {
- marvell,pins = "mpp12", "mpp13", "mpp14",
- "mpp15", "mpp16", "mpp17";
- marvell,function = "sdio";
- };
};
};
};
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index e0a779c..7ce9614 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,3 +1,5 @@
+/include/ "kirkwood-628x-base.dtsi"
+
/ {
ocp at f1000000 {
@@ -5,43 +7,10 @@
compatible = "marvell,88f6282-pinctrl";
reg = <0x10000 0x20>;
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18", "mpp19";
- marvell,function = "nand";
- };
-
- pmx_sata0: pmx-sata0 {
- marvell,pins = "mpp5", "mpp21", "mpp23";
- marvell,function = "sata0";
- };
- pmx_sata1: pmx-sata1 {
- marvell,pins = "mpp4", "mpp20", "mpp22";
- marvell,function = "sata1";
- };
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
-
pmx_twsi1: pmx-twsi1 {
marvell,pins = "mpp36", "mpp37";
marvell,function = "twsi1";
};
-
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
-
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
};
i2c at 11100 {
diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
new file mode 100644
index 0000000..c8103b6
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
@@ -0,0 +1,41 @@
+/ {
+ ocp at f1000000 {
+ pinctrl: pinctrl at 10000 {
+ pmx_nand: pmx-nand {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+ "mpp4", "mpp5", "mpp18",
+ "mpp19";
+ marvell,function = "nand";
+ };
+ pmx_sata0: pmx-sata0 {
+ marvell,pins = "mpp5", "mpp21", "mpp23";
+ marvell,function = "sata0";
+ };
+ pmx_sata1: pmx-sata1 {
+ marvell,pins = "mpp4", "mpp20", "mpp22";
+ marvell,function = "sata1";
+ };
+ pmx_spi: pmx-spi {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+ marvell,function = "spi";
+ };
+ pmx_twsi0: pmx-twsi0 {
+ marvell,pins = "mpp8", "mpp9";
+ marvell,function = "twsi0";
+ };
+ pmx_uart0: pmx-uart0 {
+ marvell,pins = "mpp10", "mpp11";
+ marvell,function = "uart0";
+ };
+ pmx_uart1: pmx-uart1 {
+ marvell,pins = "mpp13", "mpp14";
+ marvell,function = "uart1";
+ };
+ pmx_sdio: pmx-sdio {
+ marvell,pins = "mpp12", "mpp13", "mpp14",
+ "mpp15", "mpp16", "mpp17";
+ marvell,function = "sdio";
+ };
+ };
+ };
+};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
2012-12-23 2:35 [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282 Nobuhiro Iwamatsu
@ 2012-12-27 17:05 ` Jason Cooper
2012-12-27 19:40 ` Andrew Lunn
2012-12-27 19:52 ` Jason Cooper
0 siblings, 2 replies; 6+ messages in thread
From: Jason Cooper @ 2012-12-27 17:05 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Dec 23, 2012 at 11:35:49AM +0900, Nobuhiro Iwamatsu wrote:
> 88f6281 and 88f6282 has common pinctrl.
> This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
>
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
> arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
> arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
> arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
Is there a reason we can't move the contents of the proposed
kirkwood-628x-base.dtsi into kirkwood.dtsi ?
Also, please don't forget to CC Andrew Lunn and myself for kirkwood
patches. I've added him.
thx,
Jason.
> 3 files changed, 45 insertions(+), 69 deletions(-)
> create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi
>
> diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
> index d6c9d65..c8fe885 100644
> --- a/arch/arm/boot/dts/kirkwood-6281.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
> @@ -1,44 +1,10 @@
> +/include/ "kirkwood-628x-base.dtsi"
> +
> / {
> ocp at f1000000 {
> pinctrl: pinctrl at 10000 {
> compatible = "marvell,88f6281-pinctrl";
> reg = <0x10000 0x20>;
> -
> - pmx_nand: pmx-nand {
> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> - "mpp4", "mpp5", "mpp18",
> - "mpp19";
> - marvell,function = "nand";
> - };
> - pmx_sata0: pmx-sata0 {
> - marvell,pins = "mpp5", "mpp21", "mpp23";
> - marvell,function = "sata0";
> - };
> - pmx_sata1: pmx-sata1 {
> - marvell,pins = "mpp4", "mpp20", "mpp22";
> - marvell,function = "sata1";
> - };
> - pmx_spi: pmx-spi {
> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> - marvell,function = "spi";
> - };
> - pmx_twsi0: pmx-twsi0 {
> - marvell,pins = "mpp8", "mpp9";
> - marvell,function = "twsi0";
> - };
> - pmx_uart0: pmx-uart0 {
> - marvell,pins = "mpp10", "mpp11";
> - marvell,function = "uart0";
> - };
> - pmx_uart1: pmx-uart1 {
> - marvell,pins = "mpp13", "mpp14";
> - marvell,function = "uart1";
> - };
> - pmx_sdio: pmx-sdio {
> - marvell,pins = "mpp12", "mpp13", "mpp14",
> - "mpp15", "mpp16", "mpp17";
> - marvell,function = "sdio";
> - };
> };
> };
> };
> diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
> index e0a779c..7ce9614 100644
> --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
> @@ -1,3 +1,5 @@
> +/include/ "kirkwood-628x-base.dtsi"
> +
> / {
> ocp at f1000000 {
>
> @@ -5,43 +7,10 @@
> compatible = "marvell,88f6282-pinctrl";
> reg = <0x10000 0x20>;
>
> - pmx_nand: pmx-nand {
> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> - "mpp4", "mpp5", "mpp18", "mpp19";
> - marvell,function = "nand";
> - };
> -
> - pmx_sata0: pmx-sata0 {
> - marvell,pins = "mpp5", "mpp21", "mpp23";
> - marvell,function = "sata0";
> - };
> - pmx_sata1: pmx-sata1 {
> - marvell,pins = "mpp4", "mpp20", "mpp22";
> - marvell,function = "sata1";
> - };
> - pmx_spi: pmx-spi {
> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> - marvell,function = "spi";
> - };
> - pmx_twsi0: pmx-twsi0 {
> - marvell,pins = "mpp8", "mpp9";
> - marvell,function = "twsi0";
> - };
> -
> pmx_twsi1: pmx-twsi1 {
> marvell,pins = "mpp36", "mpp37";
> marvell,function = "twsi1";
> };
> -
> - pmx_uart0: pmx-uart0 {
> - marvell,pins = "mpp10", "mpp11";
> - marvell,function = "uart0";
> - };
> -
> - pmx_uart1: pmx-uart1 {
> - marvell,pins = "mpp13", "mpp14";
> - marvell,function = "uart1";
> - };
> };
>
> i2c at 11100 {
> diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
> new file mode 100644
> index 0000000..c8103b6
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
> @@ -0,0 +1,41 @@
> +/ {
> + ocp at f1000000 {
> + pinctrl: pinctrl at 10000 {
> + pmx_nand: pmx-nand {
> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> + "mpp4", "mpp5", "mpp18",
> + "mpp19";
> + marvell,function = "nand";
> + };
> + pmx_sata0: pmx-sata0 {
> + marvell,pins = "mpp5", "mpp21", "mpp23";
> + marvell,function = "sata0";
> + };
> + pmx_sata1: pmx-sata1 {
> + marvell,pins = "mpp4", "mpp20", "mpp22";
> + marvell,function = "sata1";
> + };
> + pmx_spi: pmx-spi {
> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> + marvell,function = "spi";
> + };
> + pmx_twsi0: pmx-twsi0 {
> + marvell,pins = "mpp8", "mpp9";
> + marvell,function = "twsi0";
> + };
> + pmx_uart0: pmx-uart0 {
> + marvell,pins = "mpp10", "mpp11";
> + marvell,function = "uart0";
> + };
> + pmx_uart1: pmx-uart1 {
> + marvell,pins = "mpp13", "mpp14";
> + marvell,function = "uart1";
> + };
> + pmx_sdio: pmx-sdio {
> + marvell,pins = "mpp12", "mpp13", "mpp14",
> + "mpp15", "mpp16", "mpp17";
> + marvell,function = "sdio";
> + };
> + };
> + };
> +};
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
2012-12-27 17:05 ` Jason Cooper
@ 2012-12-27 19:40 ` Andrew Lunn
2013-01-03 15:56 ` Valentin Longchamp
2012-12-27 19:52 ` Jason Cooper
1 sibling, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2012-12-27 19:40 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 27, 2012 at 12:05:24PM -0500, Jason Cooper wrote:
> On Sun, Dec 23, 2012 at 11:35:49AM +0900, Nobuhiro Iwamatsu wrote:
> > 88f6281 and 88f6282 has common pinctrl.
> > This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
> >
> > Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > ---
> > arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
> > arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
> > arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
>
> Is there a reason we can't move the contents of the proposed
> kirkwood-628x-base.dtsi into kirkwood.dtsi ?
Hi Jason
It might cause problems for kirkwood-98DX4122. I'm assuming this
kirkwood embedded inside a Marvell switch will require a different
pinctrl. I've no idea what pins it actually has, so i cannot really
say.
> Also, please don't forget to CC Andrew Lunn and myself for kirkwood
> patches. I've added him.
I added Valentin Longchamp to CC: who might be able to tell us if any
of common pinctrl below is also common to 98DX4122.
Andrew
> > 3 files changed, 45 insertions(+), 69 deletions(-)
> > create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi
> >
> > diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
> > index d6c9d65..c8fe885 100644
> > --- a/arch/arm/boot/dts/kirkwood-6281.dtsi
> > +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
> > @@ -1,44 +1,10 @@
> > +/include/ "kirkwood-628x-base.dtsi"
> > +
> > / {
> > ocp at f1000000 {
> > pinctrl: pinctrl at 10000 {
> > compatible = "marvell,88f6281-pinctrl";
> > reg = <0x10000 0x20>;
> > -
> > - pmx_nand: pmx-nand {
> > - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> > - "mpp4", "mpp5", "mpp18",
> > - "mpp19";
> > - marvell,function = "nand";
> > - };
> > - pmx_sata0: pmx-sata0 {
> > - marvell,pins = "mpp5", "mpp21", "mpp23";
> > - marvell,function = "sata0";
> > - };
> > - pmx_sata1: pmx-sata1 {
> > - marvell,pins = "mpp4", "mpp20", "mpp22";
> > - marvell,function = "sata1";
> > - };
> > - pmx_spi: pmx-spi {
> > - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> > - marvell,function = "spi";
> > - };
> > - pmx_twsi0: pmx-twsi0 {
> > - marvell,pins = "mpp8", "mpp9";
> > - marvell,function = "twsi0";
> > - };
> > - pmx_uart0: pmx-uart0 {
> > - marvell,pins = "mpp10", "mpp11";
> > - marvell,function = "uart0";
> > - };
> > - pmx_uart1: pmx-uart1 {
> > - marvell,pins = "mpp13", "mpp14";
> > - marvell,function = "uart1";
> > - };
> > - pmx_sdio: pmx-sdio {
> > - marvell,pins = "mpp12", "mpp13", "mpp14",
> > - "mpp15", "mpp16", "mpp17";
> > - marvell,function = "sdio";
> > - };
> > };
> > };
> > };
> > diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
> > index e0a779c..7ce9614 100644
> > --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
> > +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
> > @@ -1,3 +1,5 @@
> > +/include/ "kirkwood-628x-base.dtsi"
> > +
> > / {
> > ocp at f1000000 {
> >
> > @@ -5,43 +7,10 @@
> > compatible = "marvell,88f6282-pinctrl";
> > reg = <0x10000 0x20>;
> >
> > - pmx_nand: pmx-nand {
> > - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> > - "mpp4", "mpp5", "mpp18", "mpp19";
> > - marvell,function = "nand";
> > - };
> > -
> > - pmx_sata0: pmx-sata0 {
> > - marvell,pins = "mpp5", "mpp21", "mpp23";
> > - marvell,function = "sata0";
> > - };
> > - pmx_sata1: pmx-sata1 {
> > - marvell,pins = "mpp4", "mpp20", "mpp22";
> > - marvell,function = "sata1";
> > - };
> > - pmx_spi: pmx-spi {
> > - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> > - marvell,function = "spi";
> > - };
> > - pmx_twsi0: pmx-twsi0 {
> > - marvell,pins = "mpp8", "mpp9";
> > - marvell,function = "twsi0";
> > - };
> > -
> > pmx_twsi1: pmx-twsi1 {
> > marvell,pins = "mpp36", "mpp37";
> > marvell,function = "twsi1";
> > };
> > -
> > - pmx_uart0: pmx-uart0 {
> > - marvell,pins = "mpp10", "mpp11";
> > - marvell,function = "uart0";
> > - };
> > -
> > - pmx_uart1: pmx-uart1 {
> > - marvell,pins = "mpp13", "mpp14";
> > - marvell,function = "uart1";
> > - };
> > };
> >
> > i2c at 11100 {
> > diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
> > new file mode 100644
> > index 0000000..c8103b6
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
> > @@ -0,0 +1,41 @@
> > +/ {
> > + ocp at f1000000 {
> > + pinctrl: pinctrl at 10000 {
> > + pmx_nand: pmx-nand {
> > + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
> > + "mpp4", "mpp5", "mpp18",
> > + "mpp19";
> > + marvell,function = "nand";
> > + };
> > + pmx_sata0: pmx-sata0 {
> > + marvell,pins = "mpp5", "mpp21", "mpp23";
> > + marvell,function = "sata0";
> > + };
> > + pmx_sata1: pmx-sata1 {
> > + marvell,pins = "mpp4", "mpp20", "mpp22";
> > + marvell,function = "sata1";
> > + };
> > + pmx_spi: pmx-spi {
> > + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> > + marvell,function = "spi";
> > + };
> > + pmx_twsi0: pmx-twsi0 {
> > + marvell,pins = "mpp8", "mpp9";
> > + marvell,function = "twsi0";
> > + };
> > + pmx_uart0: pmx-uart0 {
> > + marvell,pins = "mpp10", "mpp11";
> > + marvell,function = "uart0";
> > + };
> > + pmx_uart1: pmx-uart1 {
> > + marvell,pins = "mpp13", "mpp14";
> > + marvell,function = "uart1";
> > + };
> > + pmx_sdio: pmx-sdio {
> > + marvell,pins = "mpp12", "mpp13", "mpp14",
> > + "mpp15", "mpp16", "mpp17";
> > + marvell,function = "sdio";
> > + };
> > + };
> > + };
> > +};
> > --
> > 1.7.10.4
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
2012-12-27 17:05 ` Jason Cooper
2012-12-27 19:40 ` Andrew Lunn
@ 2012-12-27 19:52 ` Jason Cooper
1 sibling, 0 replies; 6+ messages in thread
From: Jason Cooper @ 2012-12-27 19:52 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 27, 2012 at 12:05:24PM -0500, Jason Cooper wrote:
> On Sun, Dec 23, 2012 at 11:35:49AM +0900, Nobuhiro Iwamatsu wrote:
> > 88f6281 and 88f6282 has common pinctrl.
> > This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
> >
> > Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > ---
> > arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
> > arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
> > arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
>
> Is there a reason we can't move the contents of the proposed
> kirkwood-628x-base.dtsi into kirkwood.dtsi ?
Also, once we figure this out, could you please base your other patch
series on top of this? Putting the cleanups before the changes helps us
avoid merge conflicts as we pull everything together.
thx,
Jason.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
2012-12-27 19:40 ` Andrew Lunn
@ 2013-01-03 15:56 ` Valentin Longchamp
2013-01-15 23:53 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 6+ messages in thread
From: Valentin Longchamp @ 2013-01-03 15:56 UTC (permalink / raw)
To: linux-arm-kernel
On 12/27/2012 08:40 PM, Andrew Lunn wrote:
> On Thu, Dec 27, 2012 at 12:05:24PM -0500, Jason Cooper wrote:
>> On Sun, Dec 23, 2012 at 11:35:49AM +0900, Nobuhiro Iwamatsu wrote:
>>> 88f6281 and 88f6282 has common pinctrl.
>>> This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
>>>
>>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>> ---
>>> arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
>>> arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
>>> arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
>>
>> Is there a reason we can't move the contents of the proposed
>> kirkwood-628x-base.dtsi into kirkwood.dtsi ?
>
> Hi Jason
>
> It might cause problems for kirkwood-98DX4122. I'm assuming this
> kirkwood embedded inside a Marvell switch will require a different
> pinctrl. I've no idea what pins it actually has, so i cannot really
> say.
>
>> Also, please don't forget to CC Andrew Lunn and myself for kirkwood
>> patches. I've added him.
>
> I added Valentin Longchamp to CC: who might be able to tell us if any
> of common pinctrl below is also common to 98DX4122.
Hi Andrew,
There are common pins on the kirkwood-98DX4122:
- nand
- spi
- twsi0
- uart0
- uart1
However, these are not present:
- sata0
- sata1
- sdio
One solution would then be to have the first five in a kirkwood-xyz-base.dtsi
that could be included in all the 3 kirkwood-[6281|6282|98dx4122].dtsi files
(that would then contain the remaining 3 for both the 6281 6282).
Valentin
>
> Andrew
>
>
>>> 3 files changed, 45 insertions(+), 69 deletions(-)
>>> create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>>
>>> diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
>>> index d6c9d65..c8fe885 100644
>>> --- a/arch/arm/boot/dts/kirkwood-6281.dtsi
>>> +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
>>> @@ -1,44 +1,10 @@
>>> +/include/ "kirkwood-628x-base.dtsi"
>>> +
>>> / {
>>> ocp at f1000000 {
>>> pinctrl: pinctrl at 10000 {
>>> compatible = "marvell,88f6281-pinctrl";
>>> reg = <0x10000 0x20>;
>>> -
>>> - pmx_nand: pmx-nand {
>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>> - "mpp4", "mpp5", "mpp18",
>>> - "mpp19";
>>> - marvell,function = "nand";
>>> - };
>>> - pmx_sata0: pmx-sata0 {
>>> - marvell,pins = "mpp5", "mpp21", "mpp23";
>>> - marvell,function = "sata0";
>>> - };
>>> - pmx_sata1: pmx-sata1 {
>>> - marvell,pins = "mpp4", "mpp20", "mpp22";
>>> - marvell,function = "sata1";
>>> - };
>>> - pmx_spi: pmx-spi {
>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>> - marvell,function = "spi";
>>> - };
>>> - pmx_twsi0: pmx-twsi0 {
>>> - marvell,pins = "mpp8", "mpp9";
>>> - marvell,function = "twsi0";
>>> - };
>>> - pmx_uart0: pmx-uart0 {
>>> - marvell,pins = "mpp10", "mpp11";
>>> - marvell,function = "uart0";
>>> - };
>>> - pmx_uart1: pmx-uart1 {
>>> - marvell,pins = "mpp13", "mpp14";
>>> - marvell,function = "uart1";
>>> - };
>>> - pmx_sdio: pmx-sdio {
>>> - marvell,pins = "mpp12", "mpp13", "mpp14",
>>> - "mpp15", "mpp16", "mpp17";
>>> - marvell,function = "sdio";
>>> - };
>>> };
>>> };
>>> };
>>> diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
>>> index e0a779c..7ce9614 100644
>>> --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
>>> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
>>> @@ -1,3 +1,5 @@
>>> +/include/ "kirkwood-628x-base.dtsi"
>>> +
>>> / {
>>> ocp at f1000000 {
>>>
>>> @@ -5,43 +7,10 @@
>>> compatible = "marvell,88f6282-pinctrl";
>>> reg = <0x10000 0x20>;
>>>
>>> - pmx_nand: pmx-nand {
>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>> - "mpp4", "mpp5", "mpp18", "mpp19";
>>> - marvell,function = "nand";
>>> - };
>>> -
>>> - pmx_sata0: pmx-sata0 {
>>> - marvell,pins = "mpp5", "mpp21", "mpp23";
>>> - marvell,function = "sata0";
>>> - };
>>> - pmx_sata1: pmx-sata1 {
>>> - marvell,pins = "mpp4", "mpp20", "mpp22";
>>> - marvell,function = "sata1";
>>> - };
>>> - pmx_spi: pmx-spi {
>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>> - marvell,function = "spi";
>>> - };
>>> - pmx_twsi0: pmx-twsi0 {
>>> - marvell,pins = "mpp8", "mpp9";
>>> - marvell,function = "twsi0";
>>> - };
>>> -
>>> pmx_twsi1: pmx-twsi1 {
>>> marvell,pins = "mpp36", "mpp37";
>>> marvell,function = "twsi1";
>>> };
>>> -
>>> - pmx_uart0: pmx-uart0 {
>>> - marvell,pins = "mpp10", "mpp11";
>>> - marvell,function = "uart0";
>>> - };
>>> -
>>> - pmx_uart1: pmx-uart1 {
>>> - marvell,pins = "mpp13", "mpp14";
>>> - marvell,function = "uart1";
>>> - };
>>> };
>>>
>>> i2c at 11100 {
>>> diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>> new file mode 100644
>>> index 0000000..c8103b6
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>> @@ -0,0 +1,41 @@
>>> +/ {
>>> + ocp at f1000000 {
>>> + pinctrl: pinctrl at 10000 {
>>> + pmx_nand: pmx-nand {
>>> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>> + "mpp4", "mpp5", "mpp18",
>>> + "mpp19";
>>> + marvell,function = "nand";
>>> + };
>>> + pmx_sata0: pmx-sata0 {
>>> + marvell,pins = "mpp5", "mpp21", "mpp23";
>>> + marvell,function = "sata0";
>>> + };
>>> + pmx_sata1: pmx-sata1 {
>>> + marvell,pins = "mpp4", "mpp20", "mpp22";
>>> + marvell,function = "sata1";
>>> + };
>>> + pmx_spi: pmx-spi {
>>> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>> + marvell,function = "spi";
>>> + };
>>> + pmx_twsi0: pmx-twsi0 {
>>> + marvell,pins = "mpp8", "mpp9";
>>> + marvell,function = "twsi0";
>>> + };
>>> + pmx_uart0: pmx-uart0 {
>>> + marvell,pins = "mpp10", "mpp11";
>>> + marvell,function = "uart0";
>>> + };
>>> + pmx_uart1: pmx-uart1 {
>>> + marvell,pins = "mpp13", "mpp14";
>>> + marvell,function = "uart1";
>>> + };
>>> + pmx_sdio: pmx-sdio {
>>> + marvell,pins = "mpp12", "mpp13", "mpp14",
>>> + "mpp15", "mpp16", "mpp17";
>>> + marvell,function = "sdio";
>>> + };
>>> + };
>>> + };
>>> +};
>>> --
>>> 1.7.10.4
>>>
>>>
>>> _______________________________________________
>>> linux-arm-kernel mailing list
>>> linux-arm-kernel at lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282
2013-01-03 15:56 ` Valentin Longchamp
@ 2013-01-15 23:53 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2013-01-15 23:53 UTC (permalink / raw)
To: linux-arm-kernel
Hi, all.
Thank you for your comments.
I will check and update these.
Thanks.
Nobuhiro
On Fri, Jan 4, 2013 at 12:56 AM, Valentin Longchamp
<valentin.longchamp@keymile.com> wrote:
> On 12/27/2012 08:40 PM, Andrew Lunn wrote:
>> On Thu, Dec 27, 2012 at 12:05:24PM -0500, Jason Cooper wrote:
>>> On Sun, Dec 23, 2012 at 11:35:49AM +0900, Nobuhiro Iwamatsu wrote:
>>>> 88f6281 and 88f6282 has common pinctrl.
>>>> This buldles the common pincrtl of these to kirkwood-628x-base.dtsi.
>>>>
>>>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>>> ---
>>>> arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------
>>>> arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++----------------------
>>>> arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++
>>>
>>> Is there a reason we can't move the contents of the proposed
>>> kirkwood-628x-base.dtsi into kirkwood.dtsi ?
>>
>> Hi Jason
>>
>> It might cause problems for kirkwood-98DX4122. I'm assuming this
>> kirkwood embedded inside a Marvell switch will require a different
>> pinctrl. I've no idea what pins it actually has, so i cannot really
>> say.
>>
>>> Also, please don't forget to CC Andrew Lunn and myself for kirkwood
>>> patches. I've added him.
>>
>> I added Valentin Longchamp to CC: who might be able to tell us if any
>> of common pinctrl below is also common to 98DX4122.
>
> Hi Andrew,
>
> There are common pins on the kirkwood-98DX4122:
> - nand
> - spi
> - twsi0
> - uart0
> - uart1
>
> However, these are not present:
>
> - sata0
> - sata1
> - sdio
>
> One solution would then be to have the first five in a kirkwood-xyz-base.dtsi
> that could be included in all the 3 kirkwood-[6281|6282|98dx4122].dtsi files
> (that would then contain the remaining 3 for both the 6281 6282).
>
> Valentin
>
>>
>> Andrew
>>
>>
>>>> 3 files changed, 45 insertions(+), 69 deletions(-)
>>>> create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>>>
>>>> diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
>>>> index d6c9d65..c8fe885 100644
>>>> --- a/arch/arm/boot/dts/kirkwood-6281.dtsi
>>>> +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
>>>> @@ -1,44 +1,10 @@
>>>> +/include/ "kirkwood-628x-base.dtsi"
>>>> +
>>>> / {
>>>> ocp at f1000000 {
>>>> pinctrl: pinctrl at 10000 {
>>>> compatible = "marvell,88f6281-pinctrl";
>>>> reg = <0x10000 0x20>;
>>>> -
>>>> - pmx_nand: pmx-nand {
>>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>>> - "mpp4", "mpp5", "mpp18",
>>>> - "mpp19";
>>>> - marvell,function = "nand";
>>>> - };
>>>> - pmx_sata0: pmx-sata0 {
>>>> - marvell,pins = "mpp5", "mpp21", "mpp23";
>>>> - marvell,function = "sata0";
>>>> - };
>>>> - pmx_sata1: pmx-sata1 {
>>>> - marvell,pins = "mpp4", "mpp20", "mpp22";
>>>> - marvell,function = "sata1";
>>>> - };
>>>> - pmx_spi: pmx-spi {
>>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>>> - marvell,function = "spi";
>>>> - };
>>>> - pmx_twsi0: pmx-twsi0 {
>>>> - marvell,pins = "mpp8", "mpp9";
>>>> - marvell,function = "twsi0";
>>>> - };
>>>> - pmx_uart0: pmx-uart0 {
>>>> - marvell,pins = "mpp10", "mpp11";
>>>> - marvell,function = "uart0";
>>>> - };
>>>> - pmx_uart1: pmx-uart1 {
>>>> - marvell,pins = "mpp13", "mpp14";
>>>> - marvell,function = "uart1";
>>>> - };
>>>> - pmx_sdio: pmx-sdio {
>>>> - marvell,pins = "mpp12", "mpp13", "mpp14",
>>>> - "mpp15", "mpp16", "mpp17";
>>>> - marvell,function = "sdio";
>>>> - };
>>>> };
>>>> };
>>>> };
>>>> diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
>>>> index e0a779c..7ce9614 100644
>>>> --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
>>>> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
>>>> @@ -1,3 +1,5 @@
>>>> +/include/ "kirkwood-628x-base.dtsi"
>>>> +
>>>> / {
>>>> ocp at f1000000 {
>>>>
>>>> @@ -5,43 +7,10 @@
>>>> compatible = "marvell,88f6282-pinctrl";
>>>> reg = <0x10000 0x20>;
>>>>
>>>> - pmx_nand: pmx-nand {
>>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>>> - "mpp4", "mpp5", "mpp18", "mpp19";
>>>> - marvell,function = "nand";
>>>> - };
>>>> -
>>>> - pmx_sata0: pmx-sata0 {
>>>> - marvell,pins = "mpp5", "mpp21", "mpp23";
>>>> - marvell,function = "sata0";
>>>> - };
>>>> - pmx_sata1: pmx-sata1 {
>>>> - marvell,pins = "mpp4", "mpp20", "mpp22";
>>>> - marvell,function = "sata1";
>>>> - };
>>>> - pmx_spi: pmx-spi {
>>>> - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>>> - marvell,function = "spi";
>>>> - };
>>>> - pmx_twsi0: pmx-twsi0 {
>>>> - marvell,pins = "mpp8", "mpp9";
>>>> - marvell,function = "twsi0";
>>>> - };
>>>> -
>>>> pmx_twsi1: pmx-twsi1 {
>>>> marvell,pins = "mpp36", "mpp37";
>>>> marvell,function = "twsi1";
>>>> };
>>>> -
>>>> - pmx_uart0: pmx-uart0 {
>>>> - marvell,pins = "mpp10", "mpp11";
>>>> - marvell,function = "uart0";
>>>> - };
>>>> -
>>>> - pmx_uart1: pmx-uart1 {
>>>> - marvell,pins = "mpp13", "mpp14";
>>>> - marvell,function = "uart1";
>>>> - };
>>>> };
>>>>
>>>> i2c at 11100 {
>>>> diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>>> new file mode 100644
>>>> index 0000000..c8103b6
>>>> --- /dev/null
>>>> +++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi
>>>> @@ -0,0 +1,41 @@
>>>> +/ {
>>>> + ocp at f1000000 {
>>>> + pinctrl: pinctrl at 10000 {
>>>> + pmx_nand: pmx-nand {
>>>> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
>>>> + "mpp4", "mpp5", "mpp18",
>>>> + "mpp19";
>>>> + marvell,function = "nand";
>>>> + };
>>>> + pmx_sata0: pmx-sata0 {
>>>> + marvell,pins = "mpp5", "mpp21", "mpp23";
>>>> + marvell,function = "sata0";
>>>> + };
>>>> + pmx_sata1: pmx-sata1 {
>>>> + marvell,pins = "mpp4", "mpp20", "mpp22";
>>>> + marvell,function = "sata1";
>>>> + };
>>>> + pmx_spi: pmx-spi {
>>>> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>>>> + marvell,function = "spi";
>>>> + };
>>>> + pmx_twsi0: pmx-twsi0 {
>>>> + marvell,pins = "mpp8", "mpp9";
>>>> + marvell,function = "twsi0";
>>>> + };
>>>> + pmx_uart0: pmx-uart0 {
>>>> + marvell,pins = "mpp10", "mpp11";
>>>> + marvell,function = "uart0";
>>>> + };
>>>> + pmx_uart1: pmx-uart1 {
>>>> + marvell,pins = "mpp13", "mpp14";
>>>> + marvell,function = "uart1";
>>>> + };
>>>> + pmx_sdio: pmx-sdio {
>>>> + marvell,pins = "mpp12", "mpp13", "mpp14",
>>>> + "mpp15", "mpp16", "mpp17";
>>>> + marvell,function = "sdio";
>>>> + };
>>>> + };
>>>> + };
>>>> +};
>>>> --
>>>> 1.7.10.4
>>>>
>>>>
>>>> _______________________________________________
>>>> linux-arm-kernel mailing list
>>>> linux-arm-kernel at lists.infradead.org
>>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-15 23:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-23 2:35 [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282 Nobuhiro Iwamatsu
2012-12-27 17:05 ` Jason Cooper
2012-12-27 19:40 ` Andrew Lunn
2013-01-03 15:56 ` Valentin Longchamp
2013-01-15 23:53 ` Nobuhiro Iwamatsu
2012-12-27 19:52 ` Jason Cooper
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).