[U-Boot] [PATCH v4: DNS320 support 0/4] Add a new kirkwook board

2014-07-04 Thread Bastien ROUCARIÈS 
Add a new kirkwook board dns-320.
This is a rebase of an old patch set from Jamie Lentin.

Source is available here: 
http://jamie.lentin.co.uk/devices/dlink-dns325/

Please apply

Changelog:
[V2] Use git option -M
[V3] Fix a mismerge in boards.cfg
[V4] Rebase.

Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net

Jamie Lentin (4):
  kirkwood: Rename dns325 to dnskw
  kirkwood: Add support for the D-Link DNS-320
  kirkwood: Set unused SD pins back to GPIO for DNS-320  DNS-325
  kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

 board/d-link/dns325/dns325.h   |  32 ---
 board/d-link/{dns325 = dnskw}/Makefile|   2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}|  30 +++---
 board/d-link/dnskw/dnskw.h |  42 +
 .../kwbimage.cfg = dnskw/kwbimage.dns320.cfg} | 103 -
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |   0
 boards.cfg |   3 +-
 include/configs/{dns325.h = dnskw.h}  |  23 -
 8 files changed, 138 insertions(+), 97 deletions(-)
 delete mode 100644 board/d-link/dns325/dns325.h
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (84%)
 create mode 100644 board/d-link/dnskw/dnskw.h
 copy board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns320.cfg} (67%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (86%)

-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/4] kirkwood: Rename dns325 to dnskw

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
 board/d-link/{dns325 = dnskw}/Makefile|  2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10 -
 board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24 +-
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |  0
 boards.cfg |  2 +-
 include/configs/{dns325.h = dnskw.h}  | 11 +++---
 6 files changed, 29 insertions(+), 20 deletions(-)
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (93%)
 rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (52%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (94%)

diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 93%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index b8a5ea1..85cebf7 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  := dns325.o
+obj-y  := dnskw.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 93%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index ff70e94..22b0ffb 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -17,15 +17,15 @@
 #include asm/arch/kirkwood.h
 #include asm/arch/mpp.h
 #include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
/* Gpio configuration */
-   kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
-   DNS325_OE_LOW, DNS325_OE_HIGH);
+   kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+   DNSKW_OE_LOW, DNSKW_OE_HIGH);
 
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
@@ -83,9 +83,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config, NULL);
 
-   kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+   kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
 
-   kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+   kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
 }
 
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 52%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index f7b25f2..8d2e2b1 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -10,18 +10,22 @@
  * SPDX-License-Identifier:GPL-2.0+
  */
 
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
 
 /* GPIO configuration */
-#define DNS325_OE_LOW  0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW  0x3800  /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800  /* disable leds */
+#define DNSKW_OE_LOW   0x
+#define DNSKW_OE_HIGH  0x00039604
 
-#define DNS325_GPIO_LED_POWER  26
-#define DNS325_GPIO_SATA0_EN   39
-#define DNS325_GPIO_SATA1_EN   40
+#define DNSKW_GPIO_LED_POWER   26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
 
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
@@ -29,4 +33,4 @@
 #define MV88E1116_RGMII_TXTM_CTRL  (1  4)
 #define MV88E1116_RGMII_RXTM_CTRL  (1  5)
 
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg 
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index 8e2db82..5259b27 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -163,7 +163,7 @@ Active  arm arm926ejs  davinci omicron  
   calimain
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lschlv2   lsxl:LSCHLV2  

Michael Walle mich...@walle.cc
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lsxhl lsxl:LSXHL

[U-Boot] [PATCH 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

You should already know you're using a D-link device.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
---
 include/configs/dnskw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
 #ifdef CONFIG_BOARD_IS_DNS325
 #define MACH_TYPE_DNS325   3800
 #define CONFIG_MACH_TYPE   MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING\nD-Link DNS-325
+#define CONFIG_IDENT_STRING\nDNS-325
 
 #define CONFIG_SYS_KWD_CONFIG  
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
 
-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 2/4] kirkwood: Add support for the D-Link DNS-320

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more
information on this NAS, see:-

  http://jamie.lentin.co.uk/devices/dlink-dns320
  http://dns323.kood.org/dns-320
  http://sharecenter.dlink.com/products/DNS-320

Changes since V1:
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]
Changes since V2:
* Correct a mismerge conflict

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c |   8 +-
 board/d-link/dnskw/dnskw.h |   6 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 boards.cfg |   1 +
 include/configs/dnskw.h|  10 ++
 5 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,8 @@ int board_early_init_f(void)
MPP10_UART0_TXD,
MPP11_UART0_RXD,
MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
+   MPP13_UART1_TXD,/* Custom ...*/
+   MPP14_UART1_RXD,/* ... controller */
MPP15_SD_D1,
MPP16_SD_D2,
MPP17_SD_D3,
@@ -58,13 +58,13 @@ int board_early_init_f(void)
MPP26_GPIO, /* power led */
MPP27_GPIO, /* sata0(right) error led */
MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
+   MPP29_GPIO, /* usb error led (dns-325) */
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
MPP33_GPIO,
MPP34_GPIO, /* power key */
-   MPP35_GPIO,
+   MPP35_GPIO, /* usb error led (dns-320) */
MPP36_GPIO,
MPP37_GPIO,
MPP38_GPIO,
diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h
index 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
 #define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
 #endif /* CONFIG_BOARD_IS_DNS325 */
 
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0808  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
 #define MV88E1116_PGADR_REG22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg 
b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM  nand
+NAND_ECC_MODE  default
+NAND_PAGE_SIZE 0x0800
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b1b9b
+
+#Dram initalization for SINGLE x16 CL=3 @ 200MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0:  0x618 DDR2 clks refresh rate
+# bit23-14: 0 required
+# bit24:1, enable exit self refresh mode on DDR access
+# bit25:1 required
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0:   0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven during self refresh, we don't care for APX
+# bit6: 0, use

[U-Boot] [PATCH 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 DNS-325

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10  MPP11's use whilst here.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
+   MPP10_UART0_TXD,/* 5 pin ...*/
+   MPP11_UART0_RXD,/* ... console header */
+   MPP12_GPO,
MPP13_UART1_TXD,/* Custom ...*/
MPP14_UART1_RXD,/* ... controller */
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
+   MPP15_GPIO,
+   MPP16_GPIO,
+   MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn,   /* sata1(left) status led */
-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH V5: 0/5] Add a new kirkwook board

2014-07-04 Thread Bastien ROUCARIÈS 
Add a new kirkwook board dns-320.
This is a rebase of an old patch set from Jamie Lentin.

Source is available here:
http://jamie.lentin.co.uk/devices/dlink-dns325/

Please apply

Changelog:
[V2] Use git option -M
[V3] Fix a mismerge in boards.cfg
[V4] Rebase.
[V5] Add documentation

Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net


Bastien ROUCARIÈS (1):
  Add documentation for dns-32{0,5}

Jamie Lentin (4):
  kirkwood: Rename dns325 to dnskw
  kirkwood: Add support for the D-Link DNS-320
  kirkwood: Set unused SD pins back to GPIO for DNS-320  DNS-325
  kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

 board/d-link/dns325/dns325.h   |  32 ---
 board/d-link/{dns325 = dnskw}/Makefile|   2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}|  30 +++---
 board/d-link/dnskw/dnskw.h |  42 +
 .../kwbimage.cfg = dnskw/kwbimage.dns320.cfg} | 103 -
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |   0
 boards.cfg |   3 +-
 doc/README.dnskw   |  25 +
 include/configs/{dns325.h = dnskw.h}  |  23 -
 9 files changed, 163 insertions(+), 97 deletions(-)
 delete mode 100644 board/d-link/dns325/dns325.h
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (84%)
 create mode 100644 board/d-link/dnskw/dnskw.h
 copy board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns320.cfg} (67%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 create mode 100644 doc/README.dnskw
 rename include/configs/{dns325.h = dnskw.h} (86%)

-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH V5: 1/5] kirkwood: Rename dns325 to dnskw

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
 board/d-link/{dns325 = dnskw}/Makefile|  2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10 -
 board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24 +-
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |  0
 boards.cfg |  2 +-
 include/configs/{dns325.h = dnskw.h}  | 11 +++---
 6 files changed, 29 insertions(+), 20 deletions(-)
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (93%)
 rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (52%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (94%)

diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 93%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index b8a5ea1..85cebf7 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  := dns325.o
+obj-y  := dnskw.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 93%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index ff70e94..22b0ffb 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -17,15 +17,15 @@
 #include asm/arch/kirkwood.h
 #include asm/arch/mpp.h
 #include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
/* Gpio configuration */
-   kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
-   DNS325_OE_LOW, DNS325_OE_HIGH);
+   kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+   DNSKW_OE_LOW, DNSKW_OE_HIGH);
 
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
@@ -83,9 +83,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config, NULL);
 
-   kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+   kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
 
-   kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+   kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
 }
 
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 52%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index f7b25f2..8d2e2b1 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -10,18 +10,22 @@
  * SPDX-License-Identifier:GPL-2.0+
  */
 
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
 
 /* GPIO configuration */
-#define DNS325_OE_LOW  0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW  0x3800  /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800  /* disable leds */
+#define DNSKW_OE_LOW   0x
+#define DNSKW_OE_HIGH  0x00039604
 
-#define DNS325_GPIO_LED_POWER  26
-#define DNS325_GPIO_SATA0_EN   39
-#define DNS325_GPIO_SATA1_EN   40
+#define DNSKW_GPIO_LED_POWER   26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
 
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
@@ -29,4 +33,4 @@
 #define MV88E1116_RGMII_TXTM_CTRL  (1  4)
 #define MV88E1116_RGMII_RXTM_CTRL  (1  5)
 
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg 
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index 8e2db82..5259b27 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -163,7 +163,7 @@ Active  arm arm926ejs  davinci omicron  
   calimain
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lschlv2   lsxl:LSCHLV2  

Michael Walle mich...@walle.cc
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lsxhl lsxl:LSXHL

[U-Boot] [PATCH V5: 3/5] kirkwood: Set unused SD pins back to GPIO for DNS-320 DNS-325

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10  MPP11's use whilst here.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
+   MPP10_UART0_TXD,/* 5 pin ...*/
+   MPP11_UART0_RXD,/* ... console header */
+   MPP12_GPO,
MPP13_UART1_TXD,/* Custom ...*/
MPP14_UART1_RXD,/* ... controller */
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
+   MPP15_GPIO,
+   MPP16_GPIO,
+   MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn,   /* sata1(left) status led */
-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH V5: 2/5] kirkwood: Add support for the D-Link DNS-320

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more
information on this NAS, see:-

  http://jamie.lentin.co.uk/devices/dlink-dns320
  http://dns323.kood.org/dns-320
  http://sharecenter.dlink.com/products/DNS-320

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
Changes since V1:
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]
Changes since V2:
* Correct a mismerge conflict

 board/d-link/dnskw/dnskw.c |   8 +-
 board/d-link/dnskw/dnskw.h |   6 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 boards.cfg |   1 +
 include/configs/dnskw.h|  10 ++
 5 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,8 @@ int board_early_init_f(void)
MPP10_UART0_TXD,
MPP11_UART0_RXD,
MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
+   MPP13_UART1_TXD,/* Custom ...*/
+   MPP14_UART1_RXD,/* ... controller */
MPP15_SD_D1,
MPP16_SD_D2,
MPP17_SD_D3,
@@ -58,13 +58,13 @@ int board_early_init_f(void)
MPP26_GPIO, /* power led */
MPP27_GPIO, /* sata0(right) error led */
MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
+   MPP29_GPIO, /* usb error led (dns-325) */
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
MPP33_GPIO,
MPP34_GPIO, /* power key */
-   MPP35_GPIO,
+   MPP35_GPIO, /* usb error led (dns-320) */
MPP36_GPIO,
MPP37_GPIO,
MPP38_GPIO,
diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h
index 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
 #define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
 #endif /* CONFIG_BOARD_IS_DNS325 */
 
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0808  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
 #define MV88E1116_PGADR_REG22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg 
b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM  nand
+NAND_ECC_MODE  default
+NAND_PAGE_SIZE 0x0800
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b1b9b
+
+#Dram initalization for SINGLE x16 CL=3 @ 200MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0:  0x618 DDR2 clks refresh rate
+# bit23-14: 0 required
+# bit24:1, enable exit self refresh mode on DDR access
+# bit25:1 required
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0:   0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven during self refresh, we don't care for APX
+# bit6: 0, use

[U-Boot] [PATCH V5: 4/5] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

2014-07-04 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

You should already know you're using a D-link device.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
---
 include/configs/dnskw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
 #ifdef CONFIG_BOARD_IS_DNS325
 #define MACH_TYPE_DNS325   3800
 #define CONFIG_MACH_TYPE   MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING\nD-Link DNS-325
+#define CONFIG_IDENT_STRING\nDNS-325
 
 #define CONFIG_SYS_KWD_CONFIG  
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
 
-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH V5: 5/5] Add documentation for dns-32{0,5}

2014-07-04 Thread Bastien ROUCARIÈS 
Add documentation for dns-320 dns-325 kirkwood box.

This documentation include harware description, and link to external 
documentation.

Signed-off-by: Bastien ROUCARIÈS roucaries.bast...@gmail.com
---
 doc/README.dnskw | 25 +
 1 file changed, 25 insertions(+)
 create mode 100644 doc/README.dnskw

diff --git a/doc/README.dnskw b/doc/README.dnskw
new file mode 100644
index 000..f9aaadc
--- /dev/null
+++ b/doc/README.dnskw
@@ -0,0 +1,25 @@
+Overview
+
+
+The DNS-kw are a low cost NAS based on Marvell SOC 88F6281-A1 aka kirkwood.
+They are two supported NAS:
+- dns 320
+- dns 325
+
+Hardware
+
+
+   DNS-320DNS-325
+SoCMarvell 88F6281-A1 @800Mhz Marvell 
88F6281-A1 @1200Mhz
+RAM2xSEC K4T51083QG-HCE6:64Mx8 @333 CL5 (128MB total) 2xSEC 
K4T1G084QF-HCF7:128Mx8 @400 CL6 (256MB total)
+Flash  SAMSUNG 146 K9F1G08U0D SCB0 (128MB total)  SAMSUNG 946 
K9F1G08U0B PCB0 (128MB total)
+PHY Marvell 88E1116R-NNC1  Marvell 
88E1116R-NNC1
+PMUWeltrend WT69P803  Holtek HT48C06E
+
+
+More information
+
+
+ http://jamie.lentin.co.uk/devices/dlink-dns320
+ http://dns323.kood.org/dns-320
+ http://sharecenter.dlink.com/products/DNS-320
-- 
2.0.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 DNS-325

2014-06-08 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10  MPP11's use whilst here.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
+   MPP10_UART0_TXD,/* 5 pin ...*/
+   MPP11_UART0_RXD,/* ... console header */
+   MPP12_GPO,
MPP13_UART1_TXD,/* Custom ...*/
MPP14_UART1_RXD,/* ... controller */
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
+   MPP15_GPIO,
+   MPP16_GPIO,
+   MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn,   /* sata1(left) status led */
-- 
2.0.0.rc2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 2/4] kirkwood: Add support for the D-Link DNS-320

2014-06-08 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more
information on this NAS, see:-

  http://jamie.lentin.co.uk/devices/dlink-dns320
  http://dns323.kood.org/dns-320
  http://sharecenter.dlink.com/products/DNS-320

Changes since V1:
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]
Changes since V2:
* Correct a mismerge conflict

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c |   8 +-
 board/d-link/dnskw/dnskw.h |   6 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 boards.cfg |   1 +
 include/configs/dnskw.h|  10 ++
 5 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,8 @@ int board_early_init_f(void)
MPP10_UART0_TXD,
MPP11_UART0_RXD,
MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
+   MPP13_UART1_TXD,/* Custom ...*/
+   MPP14_UART1_RXD,/* ... controller */
MPP15_SD_D1,
MPP16_SD_D2,
MPP17_SD_D3,
@@ -58,13 +58,13 @@ int board_early_init_f(void)
MPP26_GPIO, /* power led */
MPP27_GPIO, /* sata0(right) error led */
MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
+   MPP29_GPIO, /* usb error led (dns-325) */
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
MPP33_GPIO,
MPP34_GPIO, /* power key */
-   MPP35_GPIO,
+   MPP35_GPIO, /* usb error led (dns-320) */
MPP36_GPIO,
MPP37_GPIO,
MPP38_GPIO,
diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h
index 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
 #define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
 #endif /* CONFIG_BOARD_IS_DNS325 */
 
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0808  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
 #define MV88E1116_PGADR_REG22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg 
b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM  nand
+NAND_ECC_MODE  default
+NAND_PAGE_SIZE 0x0800
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b1b9b
+
+#Dram initalization for SINGLE x16 CL=3 @ 200MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0:  0x618 DDR2 clks refresh rate
+# bit23-14: 0 required
+# bit24:1, enable exit self refresh mode on DDR access
+# bit25:1 required
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0:   0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven during self refresh, we don't care for APX
+# bit6: 0, use

[U-Boot] [PATCH 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

2014-06-08 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

You should already know you're using a D-link device.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
---
 include/configs/dnskw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
 #ifdef CONFIG_BOARD_IS_DNS325
 #define MACH_TYPE_DNS325   3800
 #define CONFIG_MACH_TYPE   MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING\nD-Link DNS-325
+#define CONFIG_IDENT_STRING\nDNS-325
 
 #define CONFIG_SYS_KWD_CONFIG  
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
 
-- 
2.0.0.rc2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/4] kirkwood: Rename dns325 to dnskw

2014-06-08 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
 board/d-link/dns325/Makefile   |  13 ---
 board/d-link/dns325/dns325.c   | 132 ---
 board/d-link/dns325/dns325.h   |  32 --
 board/d-link/dns325/kwbimage.cfg   | 192 -
 board/d-link/dnskw/Makefile|  13 +++
 board/d-link/dnskw/dnskw.c | 132 +++
 board/d-link/dnskw/dnskw.h |  36 +++
 board/d-link/dnskw/kwbimage.dns325.cfg | 192 +
 boards.cfg |   2 +-
 include/configs/dns325.h   | 170 -
 include/configs/dnskw.h| 175 ++
 11 files changed, 549 insertions(+), 540 deletions(-)
 delete mode 100644 board/d-link/dns325/Makefile
 delete mode 100644 board/d-link/dns325/dns325.c
 delete mode 100644 board/d-link/dns325/dns325.h
 delete mode 100644 board/d-link/dns325/kwbimage.cfg
 create mode 100644 board/d-link/dnskw/Makefile
 create mode 100644 board/d-link/dnskw/dnskw.c
 create mode 100644 board/d-link/dnskw/dnskw.h
 create mode 100644 board/d-link/dnskw/kwbimage.dns325.cfg
 delete mode 100644 include/configs/dns325.h
 create mode 100644 include/configs/dnskw.h

diff --git a/board/d-link/dns325/Makefile b/board/d-link/dns325/Makefile
deleted file mode 100644
index b8a5ea1..000
--- a/board/d-link/dns325/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2011
-# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
-#
-# Based on Kirkwood support:
-# (C) Copyright 2009
-# Marvell Semiconductor www.marvell.com
-# Written-by: Prafulla Wadaskar prafu...@marvell.com
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y  := dns325.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
deleted file mode 100644
index ff70e94..000
--- a/board/d-link/dns325/dns325.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2011
- * Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
- *
- * Based on Kirkwood support:
- * (C) Copyright 2009
- * Marvell Semiconductor www.marvell.com
- * Written-by: Prafulla Wadaskar prafu...@marvell.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include miiphy.h
-#include netdev.h
-#include asm/arch/cpu.h
-#include asm/arch/kirkwood.h
-#include asm/arch/mpp.h
-#include asm/arch/gpio.h
-#include dns325.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_early_init_f(void)
-{
-   /* Gpio configuration */
-   kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
-   DNS325_OE_LOW, DNS325_OE_HIGH);
-
-   /* Multi-Purpose Pins Functionality configuration */
-   static const u32 kwmpp_config[] = {
-   MPP0_NF_IO2,
-   MPP1_NF_IO3,
-   MPP2_NF_IO4,
-   MPP3_NF_IO5,
-   MPP4_NF_IO6,
-   MPP5_NF_IO7,
-   MPP6_SYSRST_OUTn,
-   MPP7_GPO,
-   MPP8_TW_SDA,
-   MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
-   MPP18_NF_IO0,
-   MPP19_NF_IO1,
-   MPP20_SATA1_ACTn,   /* sata1(left) status led */
-   MPP21_SATA0_ACTn,   /* sata0(right) status led */
-   MPP22_GPIO,
-   MPP23_GPIO,
-   MPP24_GPIO, /* power off out */
-   MPP25_GPIO,
-   MPP26_GPIO, /* power led */
-   MPP27_GPIO, /* sata0(right) error led */
-   MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
-   MPP30_GPIO,
-   MPP31_GPIO,
-   MPP32_GPIO,
-   MPP33_GPIO,
-   MPP34_GPIO, /* power key */
-   MPP35_GPIO,
-   MPP36_GPIO,
-   MPP37_GPIO,
-   MPP38_GPIO,
-   MPP39_GPIO, /* enable sata 0 */
-   MPP40_GPIO, /* enable sata 1 */
-   MPP41_GPIO, /* hdd0 present */
-   MPP42_GPIO, /* hdd1 present */
-   MPP43_GPIO, /* usb status led */
-   MPP44_GPIO, /* fan status */
-   MPP45_GPIO, /* fan high speed */
-   MPP46_GPIO, /* fan low speed */
-   MPP47_GPIO, /* usb

[U-Boot] [PATCH v3: DNS320 support 0/4] Add a new kirkwook board

2014-05-22 Thread Bastien ROUCARIÈS 
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi,

A rebase of an old patch set from Jamie Lentin.

Source is available here: 
http://jamie.lentin.co.uk/devices/dlink-dns325/

Please apply

Changelog:
[V2] Use git option -M
[V3] Fix a mismerge in boards.cfg

Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net

Jamie Lentin (4):
  kirkwood: Rename dns325 to dnskw
  kirkwood: Add support for the D-Link DNS-320
  kirkwood: Set unused SD pins back to GPIO for DNS-320  DNS-325
  kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

 board/d-link/dns325/dns325.h   |  32 
 board/d-link/{dns325 = dnskw}/Makefile|   2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}|  30 +--
 board/d-link/dnskw/dnskw.h |  42 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |   0
 boards.cfg |   3 +-
 include/configs/{dns325.h = dnskw.h}  |  23 ++-
 8 files changed, 286 insertions(+), 53 deletions(-)
 delete mode 100644 board/d-link/dns325/dns325.h
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (84%)
 create mode 100644 board/d-link/dnskw/dnskw.h
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (86%)

-- 
2.0.0.rc2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v3: DNS320 support 1/4] kirkwood: Rename dns325 to dnskw

2014-05-22 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
---
 board/d-link/{dns325 = dnskw}/Makefile|  2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10 -
 board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24 +-
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |  0
 boards.cfg |  2 +-
 include/configs/{dns325.h = dnskw.h}  | 11 +++---
 6 files changed, 29 insertions(+), 20 deletions(-)
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (93%)
 rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (52%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (94%)

diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 93%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index b8a5ea1..85cebf7 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  := dns325.o
+obj-y  := dnskw.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 93%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index ff70e94..22b0ffb 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -17,15 +17,15 @@
 #include asm/arch/kirkwood.h
 #include asm/arch/mpp.h
 #include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
/* Gpio configuration */
-   kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
-   DNS325_OE_LOW, DNS325_OE_HIGH);
+   kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+   DNSKW_OE_LOW, DNSKW_OE_HIGH);
 
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
@@ -83,9 +83,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config, NULL);
 
-   kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+   kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
 
-   kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+   kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
 }
 
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 52%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index f7b25f2..8d2e2b1 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -10,18 +10,22 @@
  * SPDX-License-Identifier:GPL-2.0+
  */
 
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
 
 /* GPIO configuration */
-#define DNS325_OE_LOW  0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW  0x3800  /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800  /* disable leds */
+#define DNSKW_OE_LOW   0x
+#define DNSKW_OE_HIGH  0x00039604
 
-#define DNS325_GPIO_LED_POWER  26
-#define DNS325_GPIO_SATA0_EN   39
-#define DNS325_GPIO_SATA1_EN   40
+#define DNSKW_GPIO_LED_POWER   26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
 
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
@@ -29,4 +33,4 @@
 #define MV88E1116_RGMII_TXTM_CTRL  (1  4)
 #define MV88E1116_RGMII_RXTM_CTRL  (1  5)
 
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg 
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index 0497a91..2c555da 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -168,7 +168,7 @@ Active  arm arm926ejs  davinci omicron  
   calimain
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lschlv2   lsxl:LSCHLV2  

Michael Walle mich...@walle.cc
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lsxhl lsxl:LSXHL

[U-Boot] [PATCH v3: DNS320 support 2/4] kirkwood: Add support for the D-Link DNS-320

2014-05-22 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more
information on this NAS, see:-

  http://jamie.lentin.co.uk/devices/dlink-dns320
  http://dns323.kood.org/dns-320
  http://sharecenter.dlink.com/products/DNS-320

Changes since V1:
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]
Changes since V2:
* Correct a mismerge conflict

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c |   8 +-
 board/d-link/dnskw/dnskw.h |   6 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 boards.cfg |   1 +
 include/configs/dnskw.h|  10 ++
 5 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,8 @@ int board_early_init_f(void)
MPP10_UART0_TXD,
MPP11_UART0_RXD,
MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
+   MPP13_UART1_TXD,/* Custom ...*/
+   MPP14_UART1_RXD,/* ... controller */
MPP15_SD_D1,
MPP16_SD_D2,
MPP17_SD_D3,
@@ -58,13 +58,13 @@ int board_early_init_f(void)
MPP26_GPIO, /* power led */
MPP27_GPIO, /* sata0(right) error led */
MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
+   MPP29_GPIO, /* usb error led (dns-325) */
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
MPP33_GPIO,
MPP34_GPIO, /* power key */
-   MPP35_GPIO,
+   MPP35_GPIO, /* usb error led (dns-320) */
MPP36_GPIO,
MPP37_GPIO,
MPP38_GPIO,
diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h
index 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
 #define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
 #endif /* CONFIG_BOARD_IS_DNS325 */
 
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0808  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
 #define MV88E1116_PGADR_REG22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg 
b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM  nand
+NAND_ECC_MODE  default
+NAND_PAGE_SIZE 0x0800
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b1b9b
+
+#Dram initalization for SINGLE x16 CL=3 @ 200MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0:  0x618 DDR2 clks refresh rate
+# bit23-14: 0 required
+# bit24:1, enable exit self refresh mode on DDR access
+# bit25:1 required
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0:   0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven during self refresh, we don't care for APX
+# bit6: 0, use

[U-Boot] [PATCH v3: DNS320 support 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 DNS-325

2014-05-22 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10  MPP11's use whilst here.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: prafu...@marvell.com
Cc: albert.u.b...@aribaud.net
Cc: ste...@herbrechtsmeier.net
---
 board/d-link/dnskw/dnskw.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
+   MPP10_UART0_TXD,/* 5 pin ...*/
+   MPP11_UART0_RXD,/* ... console header */
+   MPP12_GPO,
MPP13_UART1_TXD,/* Custom ...*/
MPP14_UART1_RXD,/* ... controller */
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
+   MPP15_GPIO,
+   MPP16_GPIO,
+   MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn,   /* sata1(left) status led */
-- 
2.0.0.rc2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v3: DNS320 support 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

2014-05-22 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

You should already know you're using a D-link device.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
---
 include/configs/dnskw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
 #ifdef CONFIG_BOARD_IS_DNS325
 #define MACH_TYPE_DNS325   3800
 #define CONFIG_MACH_TYPE   MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING\nD-Link DNS-325
+#define CONFIG_IDENT_STRING\nDNS-325
 
 #define CONFIG_SYS_KWD_CONFIG  
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
 
-- 
2.0.0.rc2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 3/4] kirkwood: Set unused SD pins back to GPIO for DNS-320 DNS-325

2014-05-18 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Neither device makes any use of the SD reader functionalty, so as
suggested by Stefan Herbrechtsmeier, set the pins to GPIO instead
to make this more obvious. Label MPP10  MPP11's use whilst here.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net

---
 board/d-link/dnskw/dnskw.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index a9fa9a2..90cb92e 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -39,14 +39,14 @@ int board_early_init_f(void)
MPP7_GPO,
MPP8_TW_SDA,
MPP9_TW_SCK,
-   MPP10_UART0_TXD,
-   MPP11_UART0_RXD,
-   MPP12_SD_CLK,
+   MPP10_UART0_TXD,/* 5 pin ...*/
+   MPP11_UART0_RXD,/* ... console header */
+   MPP12_GPO,
MPP13_UART1_TXD,/* Custom ...*/
MPP14_UART1_RXD,/* ... controller */
-   MPP15_SD_D1,
-   MPP16_SD_D2,
-   MPP17_SD_D3,
+   MPP15_GPIO,
+   MPP16_GPIO,
+   MPP17_GPIO,
MPP18_NF_IO0,
MPP19_NF_IO1,
MPP20_SATA1_ACTn,   /* sata1(left) status led */
-- 
2.0.0.rc0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 2/4] kirkwood: Add support for the D-Link DNS-320

2014-05-18 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

Extend dnskw to support the D-Link DNS-320 ShareCenter NAS also. For more
information on this NAS, see:-

  http://jamie.lentin.co.uk/devices/dlink-dns320
  http://dns323.kood.org/dns-320
  http://sharecenter.dlink.com/products/DNS-320

Changes since last submission (V1):-
* Shorten CONFIG_IDENT_STRING [Prafulla Wadaskar]

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net

---
 board/d-link/dnskw/dnskw.c |   8 +-
 board/d-link/dnskw/dnskw.h |   6 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 boards.cfg |   3 +-
 include/configs/dnskw.h|  10 ++
 5 files changed, 229 insertions(+), 5 deletions(-)
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg

diff --git a/board/d-link/dnskw/dnskw.c b/board/d-link/dnskw/dnskw.c
index 22b0ffb..a9fa9a2 100644
--- a/board/d-link/dnskw/dnskw.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -42,8 +42,8 @@ int board_early_init_f(void)
MPP10_UART0_TXD,
MPP11_UART0_RXD,
MPP12_SD_CLK,
-   MPP13_SD_CMD,
-   MPP14_SD_D0,
+   MPP13_UART1_TXD,/* Custom ...*/
+   MPP14_UART1_RXD,/* ... controller */
MPP15_SD_D1,
MPP16_SD_D2,
MPP17_SD_D3,
@@ -58,13 +58,13 @@ int board_early_init_f(void)
MPP26_GPIO, /* power led */
MPP27_GPIO, /* sata0(right) error led */
MPP28_GPIO, /* sata1(left) error led */
-   MPP29_GPIO, /* usb error led */
+   MPP29_GPIO, /* usb error led (dns-325) */
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
MPP33_GPIO,
MPP34_GPIO, /* power key */
-   MPP35_GPIO,
+   MPP35_GPIO, /* usb error led (dns-320) */
MPP36_GPIO,
MPP37_GPIO,
MPP38_GPIO,
diff --git a/board/d-link/dnskw/dnskw.h b/board/d-link/dnskw/dnskw.h
index 8d2e2b1..f87f02c 100644
--- a/board/d-link/dnskw/dnskw.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -27,6 +27,12 @@
 #define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
 #endif /* CONFIG_BOARD_IS_DNS325 */
 
+/* DNS-320 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS320
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0808  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS320 */
+
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
 #define MV88E1116_PGADR_REG22
diff --git a/board/d-link/dnskw/kwbimage.dns320.cfg 
b/board/d-link/dnskw/kwbimage.dns320.cfg
new file mode 100644
index 000..b515bf2
--- /dev/null
+++ b/board/d-link/dnskw/kwbimage.dns320.cfg
@@ -0,0 +1,207 @@
+#
+# Copyright (C) 2012
+# Jamie Lentin j...@lentin.co.uk
+#
+# Based on dns325 support:
+# Copyright (C) 2011
+# Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM  nand
+NAND_ECC_MODE  default
+NAND_PAGE_SIZE 0x0800
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b1b9b
+
+#Dram initalization for SINGLE x16 CL=3 @ 200MHz
+DATA 0xFFD01400 0x43000618 # DDR Configuration register
+# bit13-0:  0x618 DDR2 clks refresh rate
+# bit23-14: 0 required
+# bit24:1, enable exit self refresh mode on DDR access
+# bit25:1 required
+# bit29-26: 0 required
+# bit31-30: 0b01 required
+
+DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
+# bit3-0:   0 required
+# bit4: 0, addr/cmd in smame cycle
+# bit5: 0, clk is driven

[U-Boot] [V2][PATCH 0/4] Support d-link dns320 (arch kirkwood)

2014-05-18 Thread Bastien ROUCARIÈS 
Hi,

A rebase of an old patch set from Jamie Lentin.

Source is available here: 
http://jamie.lentin.co.uk/devices/dlink-dns325/

Please apply

Changelog:
[V2] Use git option -M

Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net

Jamie Lentin (4):
  kirkwood: Rename dns325 to dnskw
  kirkwood: Add support for the D-Link DNS-320
  kirkwood: Set unused SD pins back to GPIO for DNS-320  DNS-325
  kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

 board/d-link/dns325/dns325.h   |  32 
 board/d-link/{dns325 = dnskw}/Makefile|   2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}|  30 +--
 board/d-link/dnskw/dnskw.h |  42 +
 board/d-link/dnskw/kwbimage.dns320.cfg | 207 +
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |   0
 boards.cfg |   1 +
 include/configs/{dns325.h = dnskw.h}  |  23 ++-
 8 files changed, 285 insertions(+), 52 deletions(-)
 delete mode 100644 board/d-link/dns325/dns325.h
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (84%)
 create mode 100644 board/d-link/dnskw/dnskw.h
 create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (86%)

-- 
2.0.0.rc0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 4/4] kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320

2014-05-18 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

You should already know you're using a D-link device.

Signed-off-by: Jamie Lentin j...@lentin.co.uk

Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
---
 include/configs/dnskw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/dnskw.h b/include/configs/dnskw.h
index e55fdc4..7058873 100644
--- a/include/configs/dnskw.h
+++ b/include/configs/dnskw.h
@@ -19,7 +19,7 @@
 #ifdef CONFIG_BOARD_IS_DNS325
 #define MACH_TYPE_DNS325   3800
 #define CONFIG_MACH_TYPE   MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING\nD-Link DNS-325
+#define CONFIG_IDENT_STRING\nDNS-325
 
 #define CONFIG_SYS_KWD_CONFIG  
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.dns325.cfg
 
-- 
2.0.0.rc0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/4] kirkwood: Rename dns325 to dnskw

2014-05-18 Thread Bastien ROUCARIÈS 
From: Jamie Lentin j...@lentin.co.uk

So we can re-use DNS-325 configuration for the DNS-320 without things getting
confusing, rename all common parts from dns325 to dnskw, and use a config
option to configure DNS-325 specifics.

Signed-off-by: Jamie Lentin j...@lentin.co.uk
Cc: Prafulla Wadaskar prafu...@marvell.com
Cc: Jamie Lentin j...@lentin.co.uk
Cc: Albert ARIBAUD albert.u.b...@aribaud.net
Cc: Stefan Herbrechtsmeier ste...@code.herbrechtsmeier.net
---
 board/d-link/{dns325 = dnskw}/Makefile|  2 +-
 board/d-link/{dns325/dns325.c = dnskw/dnskw.c}| 10 -
 board/d-link/{dns325/dns325.h = dnskw/dnskw.h}| 24 +-
 .../kwbimage.cfg = dnskw/kwbimage.dns325.cfg} |  0
 boards.cfg |  2 +-
 include/configs/{dns325.h = dnskw.h}  | 11 +++---
 6 files changed, 29 insertions(+), 20 deletions(-)
 rename board/d-link/{dns325 = dnskw}/Makefile (93%)
 rename board/d-link/{dns325/dns325.c = dnskw/dnskw.c} (93%)
 rename board/d-link/{dns325/dns325.h = dnskw/dnskw.h} (52%)
 rename board/d-link/{dns325/kwbimage.cfg = dnskw/kwbimage.dns325.cfg} (100%)
 rename include/configs/{dns325.h = dnskw.h} (94%)

diff --git a/board/d-link/dns325/Makefile b/board/d-link/dnskw/Makefile
similarity index 93%
rename from board/d-link/dns325/Makefile
rename to board/d-link/dnskw/Makefile
index b8a5ea1..85cebf7 100644
--- a/board/d-link/dns325/Makefile
+++ b/board/d-link/dnskw/Makefile
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  := dns325.o
+obj-y  := dnskw.o
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dnskw/dnskw.c
similarity index 93%
rename from board/d-link/dns325/dns325.c
rename to board/d-link/dnskw/dnskw.c
index ff70e94..22b0ffb 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dnskw/dnskw.c
@@ -17,15 +17,15 @@
 #include asm/arch/kirkwood.h
 #include asm/arch/mpp.h
 #include asm/arch/gpio.h
-#include dns325.h
+#include dnskw.h
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
/* Gpio configuration */
-   kw_config_gpio(DNS325_OE_VAL_LOW, DNS325_OE_VAL_HIGH,
-   DNS325_OE_LOW, DNS325_OE_HIGH);
+   kw_config_gpio(DNSKW_OE_VAL_LOW, DNSKW_OE_VAL_HIGH,
+   DNSKW_OE_LOW, DNSKW_OE_HIGH);
 
/* Multi-Purpose Pins Functionality configuration */
static const u32 kwmpp_config[] = {
@@ -83,9 +83,9 @@ int board_early_init_f(void)
};
kirkwood_mpp_conf(kwmpp_config, NULL);
 
-   kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
+   kw_gpio_set_blink(DNSKW_GPIO_LED_POWER , 1);
 
-   kw_gpio_set_value(DNS325_GPIO_SATA0_EN , 1);
+   kw_gpio_set_value(DNSKW_GPIO_SATA0_EN , 1);
return 0;
 }
 
diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dnskw/dnskw.h
similarity index 52%
rename from board/d-link/dns325/dns325.h
rename to board/d-link/dnskw/dnskw.h
index f7b25f2..8d2e2b1 100644
--- a/board/d-link/dns325/dns325.h
+++ b/board/d-link/dnskw/dnskw.h
@@ -10,18 +10,22 @@
  * SPDX-License-Identifier:GPL-2.0+
  */
 
-#ifndef __DNS325_H
-#define __DNS325_H
+#ifndef __DNSKW_H
+#define __DNSKW_H
 
 /* GPIO configuration */
-#define DNS325_OE_LOW  0x
-#define DNS325_OE_HIGH 0x00039604
-#define DNS325_OE_VAL_LOW  0x3800  /* disable leds */
-#define DNS325_OE_VAL_HIGH 0x0800  /* disable leds */
+#define DNSKW_OE_LOW   0x
+#define DNSKW_OE_HIGH  0x00039604
 
-#define DNS325_GPIO_LED_POWER  26
-#define DNS325_GPIO_SATA0_EN   39
-#define DNS325_GPIO_SATA1_EN   40
+#define DNSKW_GPIO_LED_POWER   26
+#define DNSKW_GPIO_SATA0_EN39
+#define DNSKW_GPIO_SATA1_EN40
+
+/* DNS-325 specific configuration */
+#ifdef CONFIG_BOARD_IS_DNS325
+#define DNSKW_OE_VAL_LOW   0x3800  /* disable leds */
+#define DNSKW_OE_VAL_HIGH  0x0800  /* disable leds */
+#endif /* CONFIG_BOARD_IS_DNS325 */
 
 /* PHY related */
 #define MV88E1116_MAC_CTRL_REG 21
@@ -29,4 +33,4 @@
 #define MV88E1116_RGMII_TXTM_CTRL  (1  4)
 #define MV88E1116_RGMII_RXTM_CTRL  (1  5)
 
-#endif /* __DNS325_H */
+#endif /* __DNSKW_H */
diff --git a/board/d-link/dns325/kwbimage.cfg 
b/board/d-link/dnskw/kwbimage.dns325.cfg
similarity index 100%
rename from board/d-link/dns325/kwbimage.cfg
rename to board/d-link/dnskw/kwbimage.dns325.cfg
diff --git a/boards.cfg b/boards.cfg
index da7a0db..233d9da 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -168,7 +168,7 @@ Active  arm arm926ejs  davinci omicron  
   calimain
 Active  arm arm926ejs  kirkwoodbuffalo lsxl
lschlv2   lsxl:LSCHLV2  

Michael Walle mich...@walle.cc
 Active