[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Tom]

SPEAr310 SoC support contains basic spear310 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver
- emi driver(cfi support)

Signed-off-by: Vipin <vipin.kumar@st.com>
---
  MAKEALL                         |    1 +

<snip>

+#include <asm/arch/spr_defs.h>
+#include <asm/arch/spr_misc.h>
+#include <asm/arch/spr_nand.h>
+
+int board_init(void)
+{
+	return spear_board_init(MACH_TYPE_SPEAR300);
Does this need a new mach type ?
I see there isn't a SPEAR310 define in mach-types.
+}
+
+/*
+ * board_nand_init - Board specific NAND initialization
+ * @nand:	mtd private chip structure
+ *
+ * Called by nand_init_chip to initialize the board specific functions
+ */
+
+int board_nand_init(struct nand_chip *nand)
+{
+	struct misc_regs *const misc_regs_p =
+	    (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
+
+	if (((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
+	     MISC_SOCCFG30) ||
+	    ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
+	     MISC_SOCCFG31)) {
+
+		return spear_nand_init(nand);
+	}
+
+	return -1;
+}
diff --git a/include/configs/spear.h b/include/configs/spear.h
index 15a8241..859b92f 100755
--- a/include/configs/spear.h
+++ b/include/configs/spear.h
@@ -33,6 +33,9 @@
  #elif defined(CONFIG_MK_spear300)
  #define CONFIG_SPEAR3XX				1
  #define CONFIG_SPEAR300				1
+#elif defined(CONFIG_MK_spear310)
+#define CONFIG_SPEAR3XX				1
+#define CONFIG_SPEAR310				1
  #endif

Similar comment to the spear300 board
There needs to be a  spear310 config file

Tom

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Vipin KUMAR]

Hello Tom,

> <snip>
> 
> +#include <asm/arch/spr_defs.h>
> +#include <asm/arch/spr_misc.h>
> +#include <asm/arch/spr_nand.h>
> +
> +int board_init(void)
> +{
> +    return spear_board_init(MACH_TYPE_SPEAR300);
> Does this need a new mach type ?
> I see there isn't a SPEAR310 define in mach-types.

Actually, spear310 and spear320 are variants of a base version spear300
This is why we are using a single mach type

Regards
Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Tom]

Vipin KUMAR wrote:
> Hello Tom,
> 
>> <snip>
>>
>> +#include <asm/arch/spr_defs.h>
>> +#include <asm/arch/spr_misc.h>
>> +#include <asm/arch/spr_nand.h>
>> +
>> +int board_init(void)
>> +{
>> +    return spear_board_init(MACH_TYPE_SPEAR300);
>> Does this need a new mach type ?
>> I see there isn't a SPEAR310 define in mach-types.
> 
> Actually, spear310 and spear320 are variants of a base version spear300
> This is why we are using a single mach type
> 

Ok.
Then the 310 and 320 board *.c files can be combined into 300 board files
These look like they are copies of the 300 file.
Tom

> Regards
> Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Vipin Kumar]

Hello Tom,

>>> <snip>
>>>
>>> +#include <asm/arch/spr_defs.h>
>>> +#include <asm/arch/spr_misc.h>
>>> +#include <asm/arch/spr_nand.h>
>>> +
>>> +int board_init(void)
>>> +{
>>> + ? ?return spear_board_init(MACH_TYPE_SPEAR300);
>>> Does this need a new mach type ?
>>> I see there isn't a SPEAR310 define in mach-types.
>>
>> Actually, spear310 and spear320 are variants of a base version spear300
>> This is why we are using a single mach type
>>
>
> Ok.
> Then the 310 and 320 board *.c files can be combined into 300 board files
> These look like they are copies of the 300 file.
> Tom
>

Please find the patchset v5 for SPEAr support on the mailing list
It contains all your suggested changes
Please consider it for mainline inclusion

Regards
Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Tom]

Vipin Kumar wrote:
> Hello Tom,
> 
>>>> <snip>
>>>>
>>>> +#include <asm/arch/spr_defs.h>
>>>> +#include <asm/arch/spr_misc.h>
>>>> +#include <asm/arch/spr_nand.h>
>>>> +
>>>> +int board_init(void)
>>>> +{
>>>> +    return spear_board_init(MACH_TYPE_SPEAR300);
>>>> Does this need a new mach type ?
>>>> I see there isn't a SPEAR310 define in mach-types.
>>> Actually, spear310 and spear320 are variants of a base version spear300
>>> This is why we are using a single mach type
>>>
>> Ok.
>> Then the 310 and 320 board *.c files can be combined into 300 board files
>> These look like they are copies of the 300 file.
>> Tom
>>
> 
> Please find the patchset v5 for SPEAr support on the mailing list
> It contains all your suggested changes
> Please consider it for mainline inclusion
> 
I see in v5 that the 300,310,320 boards are still in separate files.
These all look like copies and could be combined.

Do you expect there will be a need in the future to add unique code
to each of these board files?
If not, please look into combining them.

I will provide feedback on the other files shortly.

Tom


> Regards
> Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Vipin Kumar]

On Sat, Jan 16, 2010 at 8:40 PM, Tom <Tom.Rix@windriver.com> wrote:
> Vipin Kumar wrote:
>>
>> Hello Tom,
>>
>>>>> <snip>
>>>>>
>>>>> +#include <asm/arch/spr_defs.h>
>>>>> +#include <asm/arch/spr_misc.h>
>>>>> +#include <asm/arch/spr_nand.h>
>>>>> +
>>>>> +int board_init(void)
>>>>> +{
>>>>> + ? ?return spear_board_init(MACH_TYPE_SPEAR300);
>>>>> Does this need a new mach type ?
>>>>> I see there isn't a SPEAR310 define in mach-types.
>>>>
>>>> Actually, spear310 and spear320 are variants of a base version spear300
>>>> This is why we are using a single mach type
>>>>
>>> Ok.
>>> Then the 310 and 320 board *.c files can be combined into 300 board files
>>> These look like they are copies of the 300 file.
>>> Tom
>>>
>>
>> Please find the patchset v5 for SPEAr support on the mailing list
>> It contains all your suggested changes
>> Please consider it for mainline inclusion
>>
> I see in v5 that the 300,310,320 boards are still in separate files.
> These all look like copies and could be combined.
>
> Do you expect there will be a need in the future to add unique code
> to each of these board files?
> If not, please look into combining them.
>
> I will provide feedback on the other files shortly.
>
> Tom
>

Although all three are based on one chip but sp300, sp310 and
sp320 are different SoCs and support different IPs.
Yes, board files are copies of each other as of now but may diverge in
future
I would rather create different mach ids rather than combining them
into one.

Regards
Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Tom]

Vipin Kumar wrote:
> On Sat, Jan 16, 2010 at 8:40 PM, Tom <Tom.Rix@windriver.com> wrote:
>> Vipin Kumar wrote:
>>> Hello Tom,
>>>
>>>>>> <snip>
>>>>>>
>>>>>> +#include <asm/arch/spr_defs.h>
>>>>>> +#include <asm/arch/spr_misc.h>
>>>>>> +#include <asm/arch/spr_nand.h>
>>>>>> +
>>>>>> +int board_init(void)
>>>>>> +{
>>>>>> +    return spear_board_init(MACH_TYPE_SPEAR300);
>>>>>> Does this need a new mach type ?
>>>>>> I see there isn't a SPEAR310 define in mach-types.
>>>>> Actually, spear310 and spear320 are variants of a base version spear300
>>>>> This is why we are using a single mach type
>>>>>
>>>> Ok.
>>>> Then the 310 and 320 board *.c files can be combined into 300 board files
>>>> These look like they are copies of the 300 file.
>>>> Tom
>>>>
>>> Please find the patchset v5 for SPEAr support on the mailing list
>>> It contains all your suggested changes
>>> Please consider it for mainline inclusion
>>>
>> I see in v5 that the 300,310,320 boards are still in separate files.
>> These all look like copies and could be combined.
>>
>> Do you expect there will be a need in the future to add unique code
>> to each of these board files?
>> If not, please look into combining them.
>>
>> I will provide feedback on the other files shortly.
>>
>> Tom
>>
> 
> Although all three are based on one chip but sp300, sp310 and
> sp320 are different SoCs and support different IPs.
> Yes, board files are copies of each other as of now but may diverge in
> future
> I would rather create different mach ids rather than combining them
> into one.

Ok.
Fine to leave them as-is.
Tom

> 
> Regards
> Vipin

[U-Boot] [PATCH v4 11/12] SPEAr : Support added for SPEAr310 board

[Vipin KUMAR]

SPEAr310 SoC support contains basic spear310 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver
- emi driver(cfi support)

Signed-off-by: Vipin <vipin.kumar@st.com>
---
 MAKEALL                         |    1 +
 Makefile                        |    1 +
 board/spear/spear310/Makefile   |   51 +++++++++++++++++++++++++
 board/spear/spear310/config.mk  |   44 +++++++++++++++++++++
 board/spear/spear310/spear310.c |   58 ++++++++++++++++++++++++++++
 include/configs/spear.h         |   79 ++++++++++++++++++++++++++++++++++++---
 6 files changed, 228 insertions(+), 6 deletions(-)
 create mode 100755 board/spear/spear310/Makefile
 create mode 100755 board/spear/spear310/config.mk
 create mode 100755 board/spear/spear310/spear310.c

diff --git a/MAKEALL b/MAKEALL
index b39a77d..6a2f66c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -573,6 +573,7 @@ LIST_ARM9="			\
 	smdk2400		\
 	smdk2410		\
 	spear300		\
+	spear310		\
 	spear600		\
 	trab			\
 	VCMA9			\
diff --git a/Makefile b/Makefile
index 499314f..2bee80a 100644
--- a/Makefile
+++ b/Makefile
@@ -3024,6 +3024,7 @@ smdk2410_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
 
 spear300_config \
+spear310_config \
 spear600_config :	unconfig
 	@$(MKCONFIG) -n $@ -t $(@:_config=) spear arm arm926ejs $(@:_config=) spear spear
 
diff --git a/board/spear/spear310/Makefile b/board/spear/spear310/Makefile
new file mode 100755
index 0000000..e67e941
--- /dev/null
+++ b/board/spear/spear310/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2004
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# 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., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).a
+
+COBJS	:= spear310.o
+SOBJS	:=
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak $(obj).depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
new file mode 100755
index 0000000..cba8436
--- /dev/null
+++ b/board/spear/spear310/config.mk
@@ -0,0 +1,44 @@
+#
+# (C) Copyright 2009
+# Vipin Kumar, ST Microelectronics <vipin.kumar@st.com>
+#
+# 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., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+#########################################################################
+
+TEXT_BASE = 0x00700000
+
+ALL += $(obj)u-boot.img
+
+# Environment variables in NAND
+ifeq ($(ENV),NAND)
+PLATFORM_RELFLAGS += -DCONFIG_ENV_IS_IN_NAND
+else
+PLATFORM_RELFLAGS += -DCONFIG_ENV_IS_IN_FLASH
+endif
+
+# Support parallel flash
+ifeq ($(FLASH),PNOR)
+PLATFORM_RELFLAGS += -DCONFIG_FLASH_PNOR
+endif
+
+ifeq ($(CONSOLE),USB)
+PLATFORM_RELFLAGS += -DCONFIG_SPEAR_USBTTY
+endif
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
new file mode 100755
index 0000000..e4a91a8
--- /dev/null
+++ b/board/spear/spear310/spear310.c
@@ -0,0 +1,58 @@
+/*
+ * (C) Copyright 2009
+ * Ryan Chen, ST Micoelectronics, ryan.chen at st.com.
+ * Vipin Kumar, ST Micoelectronics, vipin.kumar at st.com.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <nand.h>
+#include <asm/io.h>
+#include <asm/arch/spr_defs.h>
+#include <asm/arch/spr_misc.h>
+#include <asm/arch/spr_nand.h>
+
+int board_init(void)
+{
+	return spear_board_init(MACH_TYPE_SPEAR300);
+}
+
+/*
+ * board_nand_init - Board specific NAND initialization
+ * @nand:	mtd private chip structure
+ *
+ * Called by nand_init_chip to initialize the board specific functions
+ */
+
+int board_nand_init(struct nand_chip *nand)
+{
+	struct misc_regs *const misc_regs_p =
+	    (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
+
+	if (((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
+	     MISC_SOCCFG30) ||
+	    ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
+	     MISC_SOCCFG31)) {
+
+		return spear_nand_init(nand);
+	}
+
+	return -1;
+}
diff --git a/include/configs/spear.h b/include/configs/spear.h
index 15a8241..859b92f 100755
--- a/include/configs/spear.h
+++ b/include/configs/spear.h
@@ -33,6 +33,9 @@
 #elif defined(CONFIG_MK_spear300)
 #define CONFIG_SPEAR3XX				1
 #define CONFIG_SPEAR300				1
+#elif defined(CONFIG_MK_spear310)
+#define CONFIG_SPEAR3XX				1
+#define CONFIG_SPEAR310				1
 #endif
 
 /*
@@ -70,6 +73,12 @@
 #define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK			(48 * 1000 * 1000)
 #define CONFIG_SYS_SERIAL0			0xD0000000
+#define CONFIG_CONS_INDEX			0
+#define CONFIG_BAUDRATE				115200
+#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, \
+						57600, 115200 }
+
+#define CONFIG_SYS_LOADS_BAUD_CHANGE
 
 #if defined(CONFIG_SPEAR600)
 #define CONFIG_SYS_SERIAL1			0xD0080000
@@ -77,14 +86,26 @@
 						(void *)CONFIG_SYS_SERIAL1 }
 #elif defined(CONFIG_SPEAR300)
 #define CONFIG_PL01x_PORTS			{(void *)CONFIG_SYS_SERIAL0}
-#endif
 
-#define CONFIG_CONS_INDEX			0
-#define CONFIG_BAUDRATE				115200
-#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, \
-						57600, 115200 }
+#elif defined(CONFIG_SPEAR310)
 
-#define CONFIG_SYS_LOADS_BAUD_CHANGE
+#if (CONFIG_CONS_INDEX)
+#undef  CONFIG_PL011_CLOCK
+#define CONFIG_PL011_CLOCK			(83 * 1000 * 1000)
+#endif
+
+#define CONFIG_SYS_SERIAL1			0xB2000000
+#define CONFIG_SYS_SERIAL2			0xB2080000
+#define CONFIG_SYS_SERIAL3			0xB2100000
+#define CONFIG_SYS_SERIAL4			0xB2180000
+#define CONFIG_SYS_SERIAL5			0xB2200000
+#define CONFIG_PL01x_PORTS			{(void *)CONFIG_SYS_SERIAL0, \
+						(void *)CONFIG_SYS_SERIAL1, \
+						(void *)CONFIG_SYS_SERIAL2, \
+						(void *)CONFIG_SYS_SERIAL3, \
+						(void *)CONFIG_SYS_SERIAL4, \
+						(void *)CONFIG_SYS_SERIAL5 }
+#endif
 
 /*
  * Platform specific defines (SPEAr)
@@ -110,6 +131,27 @@
 #define CONFIG_SPEAR_FSMCBASE			(0x94000000)
 #define CONFIG_SYS_NAND_BASE			(0x80000000)
 
+#elif defined(CONFIG_SPEAR310)
+#define CONFIG_SYS_I2C_BASE			(0xD0180000)
+#define CONFIG_SPEAR_FSMCBASE			(0x44000000)
+#define CONFIG_SYS_NAND_BASE			(0x40000000)
+
+#undef CONFIG_SYS_NAND_CLE
+#undef CONFIG_SYS_NAND_ALE
+#define CONFIG_SYS_NAND_CLE			(1 << 17)
+#define CONFIG_SYS_NAND_ALE			(1 << 16)
+
+#define CONFIG_SPEAR_EMIBASE			(0x4F000000)
+#define CONFIG_SPEAR_RASBASE			(0xB4000000)
+
+#elif defined(CONFIG_SPEAR320)
+#define CONFIG_SYS_I2C_BASE			(0xD0180000)
+#define CONFIG_SPEAR_FSMCBASE			(0x4C000000)
+#define CONFIG_SYS_NAND_BASE			(0x50000000)
+
+#define CONFIG_SPEAR_EMIBASE			(0x40000000)
+#define CONFIG_SPEAR_RASBASE			(0xB3000000)
+
 #endif
 
 #define CONFIG_SYS_HZ				(1000)
@@ -132,6 +174,31 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT		(3 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_FLASH_WRITE_TOUT		(3 * CONFIG_SYS_HZ)
 
+#elif defined(CONFIG_SPEAR_EMI)
+
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+
+#if defined(CONFIG_SPEAR310)
+#define CONFIG_SYS_FLASH_BASE			0x50000000
+#define CONFIG_SYS_CS1_FLASH_BASE		0x60000000
+#define CONFIG_SYS_CS2_FLASH_BASE		0x70000000
+#define CONFIG_SYS_CS3_FLASH_BASE		0x80000000
+#define CONFIG_SYS_CS4_FLASH_BASE		0x90000000
+#define CONFIG_SYS_CS5_FLASH_BASE		0xA0000000
+#define CONFIG_SYS_FLASH_BANKS_LIST		{ CONFIG_SYS_FLASH_BASE,   \
+						CONFIG_SYS_CS1_FLASH_BASE, \
+						CONFIG_SYS_CS2_FLASH_BASE, \
+						CONFIG_SYS_CS3_FLASH_BASE, \
+						CONFIG_SYS_CS4_FLASH_BASE, \
+						CONFIG_SYS_CS5_FLASH_BASE }
+#define CONFIG_SYS_MAX_FLASH_BANKS		6
+
+#endif
+
+#define CONFIG_SYS_MAX_FLASH_SECT		(127 + 8)
+#define CONFIG_SYS_FLASH_QUIET_TEST		1
+
 #endif
 
 /*
-- 
1.6.0.2