add TI DA8xx support: Add new directory for da830evm board
PATCH v3 3/4 add TI DA8xx support: Add new directory for da830evm board
Add new directory for da830evm board
Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum Digital EVM board. See http://www.spectrumdigital.com/
Provides:
Initial boot and configuration.
Support for i2c.
UART support (console).
---
Applies to u-boot-ti
board/davinci/common/misc.c +45 -1
@@ -1,6 +1,7 @@/* * Miscelaneous DaVinci functions. * +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]> * Copyright (C) 2007 Sergey Kubushyn <[email protected]> * Copyright (C) 2008 Lyrtech <www.lyrtech.com> * Copyright (C) 2004 Texas Instruments.
@@ -27,7 +28,8 @@#include <i2c.h> #include <net.h> #include <asm/arch/hardware.h> - +#include <asm/io.h> +#include "misc.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -109,3 +111,45 @@ void dv_configure_mac_address(uint8_t *rom_enetaddr) }#endif /* DAVINCI_EMAC */ + +/* +* Change the setting of a pin multiplexer field. +* +* Takes an array of pinmux settings similar to: +* +* struct pinmux_config uart_pins[] = { +* { PINMUX8, 2, 7 }, +* { PINMUX9, 2, 0 } +* }; +* +* Stepping through the array, each PINMUXn register has the given value +* set in the pin mux field specified. +* +* The number of pins in the array must be passed (ARRAY_SIZE can provide +* this value conveniently). +* +* Returns 0 if all field numbers and values are in the correct range, +* else returns -1. +*/ +int dv_configure_pin_mux (const struct pinmux_config *pins,int n_pins) +{ +int i; + +for (i =0 ; i < n_pins; i++) { +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK ; +int value = pins[i].value; +int offset = pins[i].field *PIN_MUX_FIELD_SIZE ; + +if (pins[i].field <PIN_MUX_NUM_FIELDS && + (value & ~PIN_MUX_FIELD_MASK ) ==0 ) { + mask <<= offset; + value <<= offset; +writel (value | (readl (mux) & (~mask)), mux); + }else { +return -1 ; + } + } + +return 0 ; +}
board/davinci/common/misc.h +13 -0
@@ -1,4 +1,5 @@/* +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]> * Copyright (C) 2008 Lyrtech <www.lyrtech.com> * * See file CREDITS for list of people who contributed to this
@@ -22,8 +23,20 @@#ifndef __MISC_H#define __MISC_H +/* pin muxer definitions */ +#define PIN_MUX_NUM_FIELDS 8/* Per register */ +#define PIN_MUX_FIELD_SIZE 4/* n in bits */ +#define PIN_MUX_FIELD_MASK 0xf/* mask n field bits */ + +/* pin definition */ +struct pinmux_config { +unsigned int mux;/* Address of mux register */ +unsigned char value;/* Value to set in field */ +unsigned char field;/* field number */ +};int dvevm_read_mac_address (uint8_t *buf);void dv_configure_mac_address (uint8_t *rom_enetaddr); +int dv_configure_pin_mux (const struct pinmux_config *pins,int n_pins);#endif /* __MISC_H */
board/davinci/da830evm/Makefile new file +51 -0
51 lines not on this page · raw message
board/davinci/da830evm/config.mk new file +45 -0
45 lines not on this page · raw message
board/davinci/da830evm/da830evm.c new file +126 -0
126 lines not on this page · raw message
Paulraj
PATCH v3 3/4 add TI DA8xx support: Add new directory for da830evm board
Quoted 8 lines
Add new directory for da830evm board
Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum Digital EVM board. See http://www.spectrumdigital.com/
Quoted 8 lines
Provides:
Initial boot and configuration.
Support for i2c.
UART support (console).Signed-off-by Nick Thompson <[email protected]>---
Applies to u-boot-ti
It should be broken up into multiple patches because you are adding DA830 EVM specific stuff and some enhancements for PINMUX which could be used by all DaVinci's
Quoted 90 lines
board/davinci/common/misc.c +1
-0@@ -1,6 +1,7 @@/* * Miscelaneous DaVinci functions. * +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]>
* Copyright (C) 2007 Sergey Kubushyn <[email protected]>
* Copyright (C) 2008 Lyrtech <www.lyrtech.com>
* Copyright (C) 2004 Texas Instruments.board/davinci/common/misc.c +44
-1@@ -27,7 +28,8 @@#include <i2c.h> #include <net.h> #include <asm/arch/hardware.h> - +#include <asm/io.h> +#include "misc.h" DECLARE_GLOBAL_DATA_PTR ;@@ -109,3 +111,45 @@ void dv_configure_mac_address(uint8_t *rom_enetaddr) }#endif /* DAVINCI_EMAC */ + +/* +* Change the setting of a pin multiplexer field. +* +* Takes an array of pinmux settings similar to: +* +* struct pinmux_config uart_pins[] = { +* { PINMUX8, 2, 7 }, +* { PINMUX9, 2, 0 } +* }; +* +* Stepping through the array, each PINMUXn register has the given value +* set in the pin mux field specified. +* +* The number of pins in the array must be passed (ARRAY_SIZE can provide +* this value conveniently). +* +* Returns 0 if all field numbers and values are in the correct range, +* else returns -1. +*/ +int dv_configure_pin_mux (const struct pinmux_config *pins,int n_pins) +{ +int i; + +for (i =0 ; i < n_pins; i++) { +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK ; +int value = pins[i].value; +int offset = pins[i].field *PIN_MUX_FIELD_SIZE ; + +if (pins[i].field <PIN_MUX_NUM_FIELDS && + (value & ~PIN_MUX_FIELD_MASK ) ==0 ) { + mask <<= offset; + value <<= offset; +writel (value | (readl (mux) & (~mask)), mux); + }else { +return -1 ; + } + } + +return 0 ; +}board/davinci/common/misc.h +1
-0@@ -1,4 +1,5 @@/* +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]>
* Copyright (C) 2008 Lyrtech <www.lyrtech.com>
*
* See file CREDITS for list of people who contributed to thisboard/davinci/common/misc.h +5
-0@@ -22,8 +23,20 @@#ifndef __MISC_H#define __MISC_H +/* pin muxer definitions */ +#define PIN_MUX_NUM_FIELDS 8/* Per register */ +#define PIN_MUX_FIELD_SIZE 4/* n in bits */ +#define PIN_MUX_FIELD_MASK 0xf/* mask n field bits */ +
board/davinci/common/misc.h line 40
Quoted 10 lines
board/davinci/common/misc.h +7
-0+/* pin definition */ +struct pinmux_config { +unsigned int mux;/* Address of mux register */ +unsigned char value;/* Value to set in field */ +unsigned char field;/* field number */ +};int dvevm_read_mac_address (uint8_t *buf);void dv_configure_mac_address (uint8_t *rom_enetaddr); +int dv_configure_pin_mux (const struct pinmux_config *pins,int n_pins);
What about actually having the prefix davinci.
And I can see that there are other functions above(not added by you) that need a similar rename.
Quoted 252 lines
board/davinci/common/misc.h +0
-0#endif /* __MISC_H */ board/davinci/da830evm/Makefile new file +51
-0@@ -0,0 +1,51 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# Copyright (C) 2007 Sergey Kubushyn <[email protected]> +# +# 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 := da830evm.o + +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 *~ .depend + +######################################################################### +# This is for $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################board/davinci/da830evm/config.mk new file +2
-0@@ -0,0 +1,45 @@ +# +# (C) Copyright 2008 Sekhar Nori, Texas Instruments, Inc.board/davinci/da830evm/config.mk new file +43
-0+# +# Copyright (C) 2007 Sergey Kubushyn <[email protected]> +# +# (C) Copyright 2003 Swaminathan, Texas Instruments, <[email protected]> +# +# (C) Copyright 2002 +# Gary Jennejohn, DENX Software Engineering, <[email protected]> +# David Mueller, ELSOFT AG, <[email protected]> +# +# 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 +# + +# Texas Instruments DA8xx EVM board (ARM925EJS) cpu +# see http://www.ti.com/ for more information on Texas Instruments +# +# DA8xx EVM has 1 bank of 64 MB SDRAM (2 16Meg x16 chips). +# Physical Address: +# C000'0000 to C400'0000 +# +# Linux-Kernel is expected to be at C000'8000, entry C000'8000 +# (mem base + reserved) +# +# we load ourself to C108 '0000 + + +#Provide at least 16MB spacing between us and the Linux Kernel image +TEXT_BASE = 0xC1080000board/davinci/da830evm/da830evm.c new file +2
-0@@ -0,0 +1,126 @@ +/* +* Copyright (C) 2009 Nick Thompson, GE Fanuc, Ltd. <[email protected]>
+ *
+ * Base on code from TI. Original Notices follow:
+ *
+ * Copyright (C) 2008 Sekhar Nori, Texas Instruments, Inc. <[email protected]>
+ *
+ * Modified for DA8xx EVM.
+ *
+ * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
+ *
+ * Parts are shamelessly stolen from various TI sources, original copyright
+ * follows:
+ * -----------------------------------------------------------------
+ *
+ * Copyright (C) 2004 Texas Instruments.
+ *
+ * ----------------------------------------------------------------------
------
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ----------------------------------------------------------------------
------
+ */board/davinci/da830evm/da830evm.c new file +74
-0+ +#include <common.h> +#include <i2c.h> +#include <asm/arch/hardware.h> +#include <asm/io.h> +#include "../common/misc.h" + +DECLARE_GLOBAL_DATA_PTR ; + +#ifdef CONFIG_SPI_FLASH +/* SPI0 pin muxer settings */ +const struct pinmux_config spi0_pins[] = { + {PINMUX7 ,1 ,3 }, + {PINMUX7 ,1 ,4 }, + {PINMUX7 ,1 ,5 }, + {PINMUX7 ,1 ,6 }, + {PINMUX7 ,1 ,7 } +}; +#endif + +/* UART pin muxer settings */ +const struct pinmux_config uart_pins[] = { + {PINMUX8 ,2 ,7 }, + {PINMUX9 ,2 ,0 } +}; + +/* I2C pin muxer settings */ +const struct pinmux_config i2c_pins[] = { + {PINMUX9 ,2 ,3 }, + {PINMUX9 ,2 ,4 } +}; + +int board_init (void ) +{ + +#ifndef CONFIG_USE_IRQ +/* +* Mask all IRQs by clearing the global enable and setting +* the enable clear for all the 90 interrupts. +*/ + +writel (0 ,INTC_GLB_EN ); + +writel (0 ,INTC_HINT_EN +0x0 ); +writel (0 ,INTC_HINT_EN +0x4 ); +writel (0 ,INTC_HINT_EN +0x8 ); + +writel (0xffffffff ,INTC_EN_CLR0 +0x0 ); +writel (0xffffffff ,INTC_EN_CLR0 +0x4 ); +writel (0xffffffff ,INTC_EN_CLR0 +0x8 ); +#endif + +/* arch number of the board */ + gd->bd->bi_arch_number =MACH_TYPE_DAVINCI_DA830_EVM ; + +/* address of boot parameters */ + gd->bd->bi_boot_params =LINUX_BOOT_PARAM_ADDR ; + +/* +* Power on required peripherals +* ARM does not have access by default to PSC0 and PSC1 +* assuming here that the DSP bootloader has set the IOPU +* such that PSC access is available to ARM +*/ +lpsc_on (DAVINCI_LPSC_AEMIF );/* NAND, NOR */ +lpsc_on (DAVINCI_LPSC_SPI0 );/* Serial Flash */ +lpsc_on (DAVINCI_LPSC_EMAC );/* image download */ +lpsc_on (DAVINCI_LPSC_UART2 );/* console */ +lpsc_on (DAVINCI_LPSC_GPIO ); + +/* Pin Muxing support */ + +/* setup the SUSPSRC for ARM to control emulation suspend */ + writel(readl(SUSPSRC) & ~(SUSPSRC_EMAC | SUSPSRC_I2C | SUSPSRC_SPI0|
board/davinci/da830evm/da830evm.c new file +19
-0+ SUSPSRC_TIMER0 | SUSPSRC_UART2), SUSPSRC); + +#ifdef CONFIG_SPI_FLASH +if (dv_configure_pin_mux (spi0_pins,ARRAY_SIZE (spi0_pins)) !=0 ) +return 1 ; +#endif + +if (dv_configure_pin_mux (uart_pins,ARRAY_SIZE (uart_pins)) !=0 ) +return 1 ; + +if (dv_configure_pin_mux (i2c_pins,ARRAY_SIZE (i2c_pins)) !=0 ) +return 1 ; + +/* enable the console UART */ +writel (PWREMU_MGMT_FREE |PWREMU_MGMT_URRST |PWREMU_MGMT_UTRST , +DAVINCI_UART2_BASE +PWREMU_MGMT_BASE ); + +return (0 ); +}
Wolfgang Denk
NAKPATCH v3 3/4 add TI DA8xx support: Add new directory for da830evm board
In reply to Nick ThompsonDear Nick Thompson,
Quoted 4 lines · In message <[email protected]> you wrote:
Add new directory for da830evm board
Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum Digital EVM board. See http://www.spectrumdigital.com/
...
board/davinci/common/misc.h line 3
Quoted 8 lines
board/davinci/common/misc.h +1
-0@@ -1,4 +1,5 @@/* +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]> * Copyright (C) 2008 Lyrtech <www.lyrtech.com>
NAK.
We don't add Copyright entries just for adding a few lines of #defines, only for really major code contributions. Your credit and rights are sufficiently taken care of by the commit message and
Signed-off-by: lines.
...
Quoted 8 lines
board/davinci/common/misc.h +8
-0+int board_init (void ) +{ + +#ifndef CONFIG_USE_IRQ +/* +* Mask all IRQs by clearing the global enable and setting +* the enable clear for all the 90 interrupts. +*/
board/davinci/common/misc.h
Quoted 10 lines
board/davinci/common/misc.h +10
-0+ +writel (0 ,INTC_GLB_EN ); + +writel (0 ,INTC_HINT_EN +0x0 ); +writel (0 ,INTC_HINT_EN +0x4 ); +writel (0 ,INTC_HINT_EN +0x8 ); + +writel (0xffffffff ,INTC_EN_CLR0 +0x0 ); +writel (0xffffffff ,INTC_EN_CLR0 +0x4 ); +writel (0xffffffff ,INTC_EN_CLR0 +0x8 );
See previous review comment. Please use C structs here and in all similar places.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Writing a book is like washing an elephant: there's no good place to begin or end, and it's hard to keep track of what you've already covered.