diff mbox

ARM: kirkwood: Add Plat'Home OpenBlocks A6 support

Message ID 1352792590-20052-1-git-send-email-iwamatsu@nigauri.org (mailing list archive)
State New, archived
Headers show

Commit Message

Nobuhiro Iwamatsu Nov. 13, 2012, 7:43 a.m. UTC 
Add support for Plat'Home OpenBlocks A6 using the device tree
where possible.
This commit supports SATA, USB, ether and serial console.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
V2: 
  - Remove unnecessary value from bootargs.
  - Update comment for MPP table.
  - Remove kirkwood_uart0_init().

 arch/arm/boot/dts/Makefile                   |    3 +-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts |   39 ++++++++++++++
 arch/arm/configs/kirkwood_defconfig          |    1 +
 arch/arm/mach-kirkwood/Kconfig               |    7 +++
 arch/arm/mach-kirkwood/Makefile              |    1 +
 arch/arm/mach-kirkwood/board-dt.c            |    4 ++
 arch/arm/mach-kirkwood/board-openblocks_a6.c |   71 ++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/common.h              |    6 +++
 8 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a6.dts
 create mode 100644 arch/arm/mach-kirkwood/board-openblocks_a6.c

Comments

Jason Cooper Nov. 13, 2012, 12:37 p.m. UTC | #1 
Nobuhiro,

On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
> Add support for Plat'Home OpenBlocks A6 using the device tree
> where possible.
> This commit supports SATA, USB, ether and serial console.
> 
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
> V2: 
>   - Remove unnecessary value from bootargs.
>   - Update comment for MPP table.
>   - Remove kirkwood_uart0_init().

Thanks for the patch.  One small note.  In the future, please add a 'V2'
to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
which one to merge.

No need to resend, I'll keep track of it since I'm about to pull
everything together over the next few days.

thx,

Jason.
Nobuhiro Iwamatsu Nov. 13, 2012, 7:54 p.m. UTC | #2 
Hi,

On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> Nobuhiro,
>
> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
>> Add support for Plat'Home OpenBlocks A6 using the device tree
>> where possible.
>> This commit supports SATA, USB, ether and serial console.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> ---
>> V2:
>>   - Remove unnecessary value from bootargs.
>>   - Update comment for MPP table.
>>   - Remove kirkwood_uart0_init().
>
> Thanks for the patch.  One small note.  In the future, please add a 'V2'
> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
> which one to merge.

Although I knew about it , I forgot adding "V2".

>
> No need to resend, I'll keep track of it since I'm about to pull
> everything together over the next few days.

Thank you.

>
> thx,
>
> Jason.

Best regards,
  Nobuhiro
Nobuhiro Iwamatsu Nov. 21, 2012, 11:43 p.m. UTC | #3 
Hi, Jason.

On Wed, Nov 14, 2012 at 4:54 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote:
> Hi,
>
> On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
>> Nobuhiro,
>>
>> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
>>> Add support for Plat'Home OpenBlocks A6 using the device tree
>>> where possible.
>>> This commit supports SATA, USB, ether and serial console.
>>>
>>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>> ---
>>> V2:
>>>   - Remove unnecessary value from bootargs.
>>>   - Update comment for MPP table.
>>>   - Remove kirkwood_uart0_init().
>>
>> Thanks for the patch.  One small note.  In the future, please add a 'V2'
>> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
>> which one to merge.
>
> Although I knew about it , I forgot adding "V2".
>
>>
>> No need to resend, I'll keep track of it since I'm about to pull
>> everything together over the next few days.

Where have you managed this patch?  http://git.infradead.org/ ?
I would like to put this into 3.8.  And I would like to follow some
functions (clock frame work etc.) updated.

Best regards,
  Nobuhiro
Jason Cooper Nov. 22, 2012, 2:53 a.m. UTC | #4 
On Thu, Nov 22, 2012 at 08:43:46AM +0900, Nobuhiro Iwamatsu wrote:
> On Wed, Nov 14, 2012 at 4:54 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote:
> > On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> >> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
> >>> Add support for Plat'Home OpenBlocks A6 using the device tree
> >>> where possible.
> >>> This commit supports SATA, USB, ether and serial console.
> >>>
> >>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> >>> ---
> >>> V2:
> >>>   - Remove unnecessary value from bootargs.
> >>>   - Update comment for MPP table.
> >>>   - Remove kirkwood_uart0_init().
> >>
> >> Thanks for the patch.  One small note.  In the future, please add a 'V2'
> >> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
> >> which one to merge.
> >
> > Although I knew about it , I forgot adding "V2".
> >
> >>
> >> No need to resend, I'll keep track of it since I'm about to pull
> >> everything together over the next few days.
> 
> Where have you managed this patch?  http://git.infradead.org/ ?

Yes, mostly on my local machine currently.  I'm busy sorting everything.
;-)

> I would like to put this into 3.8.  And I would like to follow some
> functions (clock frame work etc.) updated.

I'm not sure what you mean by the second sentence.  At any rate, Thomas
has included your patch in his pull request, which I have merged in for
3.8.  I should have everything up in the next day with pull requests
sent to Arnd.

thx,

Jason.
Andrew Lunn Nov. 22, 2012, 6:09 a.m. UTC | #5 
On Wed, Nov 21, 2012 at 09:53:57PM -0500, Jason Cooper wrote:
> On Thu, Nov 22, 2012 at 08:43:46AM +0900, Nobuhiro Iwamatsu wrote:
> > On Wed, Nov 14, 2012 at 4:54 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote:
> > > On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> > >> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
> > >>> Add support for Plat'Home OpenBlocks A6 using the device tree
> > >>> where possible.
> > >>> This commit supports SATA, USB, ether and serial console.
> > >>>
> > >>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > >>> ---
> > >>> V2:
> > >>>   - Remove unnecessary value from bootargs.
> > >>>   - Update comment for MPP table.
> > >>>   - Remove kirkwood_uart0_init().
> > >>
> > >> Thanks for the patch.  One small note.  In the future, please add a 'V2'
> > >> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
> > >> which one to merge.
> > >
> > > Although I knew about it , I forgot adding "V2".
> > >
> > >>
> > >> No need to resend, I'll keep track of it since I'm about to pull
> > >> everything together over the next few days.
> > 
> > Where have you managed this patch?  http://git.infradead.org/ ?
> 
> Yes, mostly on my local machine currently.  I'm busy sorting everything.
> ;-)
> 
> > I would like to put this into 3.8.  And I would like to follow some
> > functions (clock frame work etc.) updated.
> 
> I'm not sure what you mean by the second sentence.  At any rate, Thomas
> has included your patch in his pull request,

Hi Jason

What out for the difference between OpenBlocks A6 and AX4. A6 is
kirkwood, AX4 is XP. I've seen patches from Thomas for AX4. I don't
remember patches for A6 from Thomas. For A6 it would be nice to have
pinctrl, convert EHCI to DT, etc.

Happy Thanks Giving,

	 Andrew
Jason Cooper Nov. 22, 2012, 6:42 a.m. UTC | #6 
On Thu, Nov 22, 2012 at 07:09:43AM +0100, Andrew Lunn wrote:
> On Wed, Nov 21, 2012 at 09:53:57PM -0500, Jason Cooper wrote:
> > On Thu, Nov 22, 2012 at 08:43:46AM +0900, Nobuhiro Iwamatsu wrote:
> > > On Wed, Nov 14, 2012 at 4:54 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote:
> > > > On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> > > >> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
> > > >>> Add support for Plat'Home OpenBlocks A6 using the device tree
> > > >>> where possible.
> > > >>> This commit supports SATA, USB, ether and serial console.
> > > >>>
> > > >>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > > >>> ---
> > > >>> V2:
> > > >>>   - Remove unnecessary value from bootargs.
> > > >>>   - Update comment for MPP table.
> > > >>>   - Remove kirkwood_uart0_init().
> > > >>
> > > >> Thanks for the patch.  One small note.  In the future, please add a 'V2'
> > > >> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
> > > >> which one to merge.
> > > >
> > > > Although I knew about it , I forgot adding "V2".
> > > >
> > > >>
> > > >> No need to resend, I'll keep track of it since I'm about to pull
> > > >> everything together over the next few days.
> > > 
> > > Where have you managed this patch?  http://git.infradead.org/ ?
> > 
> > Yes, mostly on my local machine currently.  I'm busy sorting everything.
> > ;-)
> > 
> > > I would like to put this into 3.8.  And I would like to follow some
> > > functions (clock frame work etc.) updated.
> > 
> > I'm not sure what you mean by the second sentence.  At any rate, Thomas
> > has included your patch in his pull request,
> 
> Hi Jason
> 
> What out for the difference between OpenBlocks A6 and AX4. A6 is
> kirkwood, AX4 is XP. I've seen patches from Thomas for AX4. I don't
> remember patches for A6 from Thomas. For A6 it would be nice to have
> pinctrl, convert EHCI to DT, etc.

Ahhh, good catch!  I'll add it in.

> Happy Thanks Giving,

Thanks!

Jason.
Nobuhiro Iwamatsu Nov. 22, 2012, 9:15 p.m. UTC | #7 
Hi, Andrew.

On Thu, Nov 22, 2012 at 3:09 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> On Wed, Nov 21, 2012 at 09:53:57PM -0500, Jason Cooper wrote:
>> On Thu, Nov 22, 2012 at 08:43:46AM +0900, Nobuhiro Iwamatsu wrote:
>> > On Wed, Nov 14, 2012 at 4:54 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote:
>> > > On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
>> > >> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
>> > >>> Add support for Plat'Home OpenBlocks A6 using the device tree
>> > >>> where possible.
>> > >>> This commit supports SATA, USB, ether and serial console.
>> > >>>
>> > >>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> > >>> ---
>> > >>> V2:
>> > >>>   - Remove unnecessary value from bootargs.
>> > >>>   - Update comment for MPP table.
>> > >>>   - Remove kirkwood_uart0_init().
>> > >>
>> > >> Thanks for the patch.  One small note.  In the future, please add a 'V2'
>> > >> to the subject line, eg "[PATCH V2] ...".  It really helps us keep track of
>> > >> which one to merge.
>> > >
>> > > Although I knew about it , I forgot adding "V2".
>> > >
>> > >>
>> > >> No need to resend, I'll keep track of it since I'm about to pull
>> > >> everything together over the next few days.
>> >
>> > Where have you managed this patch?  http://git.infradead.org/ ?
>>
>> Yes, mostly on my local machine currently.  I'm busy sorting everything.
>> ;-)
>>
>> > I would like to put this into 3.8.  And I would like to follow some
>> > functions (clock frame work etc.) updated.
>>
>> I'm not sure what you mean by the second sentence.  At any rate, Thomas
>> has included your patch in his pull request,
>
> Hi Jason
>
> What out for the difference between OpenBlocks A6 and AX4. A6 is
> kirkwood, AX4 is XP. I've seen patches from Thomas for AX4. I don't
> remember patches for A6 from Thomas. For A6 it would be nice to have
> pinctrl, convert EHCI to DT, etc.
>
> Happy Thanks Giving,
>
>          Andrew
>

Thank you for your advice.
I explained that was not enough.

Best regards,
  Nobuhiro
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b994045..ce053a4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -41,7 +41,8 @@  dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 	kirkwood-lschlv2.dtb \
 	kirkwood-lsxhl.dtb \
 	kirkwood-ts219-6281.dtb \
-	kirkwood-ts219-6282.dtb
+	kirkwood-ts219-6282.dtb \
+	kirkwood-openblocks_a6.dtb
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
new file mode 100644
index 0000000..4fb088d
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -0,0 +1,39 @@ 
+/dts-v1/;
+
+/include/ "kirkwood.dtsi"
+
+/ {
+	model = "Plat'Home OpenBlocksA6";
+	compatible = "plathome,openblocks-a6", "marvell,kirkwood-88f6283", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp@f1000000 {
+		serial@12000 {
+			clock-frequency = <200000000>;
+			status = "ok";
+		};
+
+		serial@12100 {
+			clock-frequency = <200000000>;
+			status = "ok";
+		};
+
+		nand@3000000 {
+			chip-delay = <25>;
+			status = "okay";
+		};
+
+		sata@80000 {
+			nr-ports = <1>;
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 74eee0c..8b5988c 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -27,6 +27,7 @@  CONFIG_MACH_GOFLEXNET_DT=y
 CONFIG_MACH_LSXL_DT=y
 CONFIG_MACH_IOMEGA_IX2_200_DT=y
 CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_OPENBLOCKS_A6_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 50bca50..830bb5c 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -130,6 +130,13 @@  config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_OPENBLOCKS_A6_DT
+	bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  Plat'Home OpenBlocks A6 (Flattened Device Tree).
+
 config MACH_TS219
 	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
 	help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 294779f..ee38f9d 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -31,3 +31,4 @@  obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index d94872f..c3aa0e2 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -94,6 +94,9 @@  static void __init kirkwood_dt_init(void)
 	if (of_machine_is_compatible("keymile,km_kirkwood"))
 		km_kirkwood_init();
 
+	if (of_machine_is_compatible("plathome,openblocks-a6"))
+		openblocks_a6_init();
+	
 	of_platform_populate(NULL, kirkwood_dt_match_table,
 			     kirkwood_auxdata_lookup, NULL);
 }
@@ -110,6 +113,7 @@  static const char *kirkwood_dt_board_compat[] = {
 	"buffalo,lsxl",
 	"iom,ix2-200",
 	"keymile,km_kirkwood",
+	"plathome,openblocks-a6",
 	NULL
 };
 
diff --git a/arch/arm/mach-kirkwood/board-openblocks_a6.c b/arch/arm/mach-kirkwood/board-openblocks_a6.c
new file mode 100644
index 0000000..e807e8c
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-openblocks_a6.c
@@ -0,0 +1,71 @@ 
+/*
+ * Copyright 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * arch/arm/mach-kirkwood/board-openblocks_a6.c
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/clk.h>
+#include <linux/clk-private.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mv643xx_eth_platform_data openblocks_ge00_data = {
+	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
+};
+
+static unsigned int openblocks_a6_mpp_config[] __initdata = {
+	MPP0_NF_IO2,
+	MPP1_NF_IO3,
+	MPP2_NF_IO4,
+	MPP3_NF_IO5,
+	MPP4_NF_IO6,
+	MPP5_NF_IO7,
+	MPP6_SYSRST_OUTn,
+	MPP8_UART1_RTS,
+	MPP9_UART1_CTS,
+	MPP10_UART0_TXD,
+	MPP11_UART0_RXD,
+	MPP13_UART1_TXD,
+	MPP14_UART1_RXD,
+	MPP15_UART0_RTS,
+	MPP16_UART0_CTS,
+	MPP18_NF_IO0,
+	MPP19_NF_IO1,
+	MPP20_GPIO, /* DIP SW0 */
+	MPP21_GPIO, /* DIP SW1 */
+	MPP22_GPIO, /* DIP SW2 */
+	MPP23_GPIO, /* DIP SW3 */
+	MPP24_GPIO, /* GPIO 0 */
+	MPP25_GPIO, /* GPIO 1 */
+	MPP26_GPIO, /* GPIO 2 */
+	MPP27_GPIO, /* GPIO 3 */
+	MPP28_GPIO, /* GPIO 4 */
+	MPP29_GPIO, /* GPIO 5 */
+	MPP30_GPIO, /* GPIO 6 */
+	MPP31_GPIO, /* GPIO 7 */
+	MPP36_TW1_SDA,
+	MPP37_TW1_SCK,
+	MPP38_GPIO, /* INIT */
+	MPP39_GPIO, /* USB OC */
+	MPP41_GPIO, /* LED: Red */
+	MPP42_GPIO, /* LED: Yellow */
+	MPP43_GPIO, /* LED: Green */
+	0,
+};
+
+void __init openblocks_a6_init(void)
+{
+	/*
+	 * Basic setup. Needs to be called early.
+	 */
+	kirkwood_mpp_conf(openblocks_a6_mpp_config);
+	kirkwood_ehci_init();
+	kirkwood_ge00_init(&openblocks_ge00_data);
+}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index bcffd7c..0d0159e 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -112,6 +112,12 @@  void km_kirkwood_init(void);
 static inline void km_kirkwood_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
+void openblocks_a6_init(void);
+#else
+static inline void openblocks_a6_init(void) {};
+#endif
+
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);