diff options
| -rw-r--r-- | board/davinci/common/Makefile | 2 | ||||
| -rw-r--r-- | board/davinci/common/psc.h | 32 | ||||
| -rw-r--r-- | board/davinci/dvevm/dvevm.c | 1 | ||||
| -rw-r--r-- | board/davinci/schmoogie/schmoogie.c | 1 | ||||
| -rw-r--r-- | board/davinci/sffsdr/sffsdr.c | 1 | ||||
| -rw-r--r-- | board/davinci/sonata/sonata.c | 1 | ||||
| -rw-r--r-- | cpu/arm926ejs/davinci/Makefile | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/davinci/psc.c (renamed from board/davinci/common/psc.c) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-davinci/hardware.h | 8 |
9 files changed, 10 insertions, 38 deletions
diff --git a/board/davinci/common/Makefile b/board/davinci/common/Makefile index 127bb6ede9..8d9ea00ddc 100644 --- a/board/davinci/common/Makefile +++ b/board/davinci/common/Makefile @@ -29,7 +29,7 @@ endif LIB = $(obj)lib$(VENDOR).a -COBJS := psc.o misc.o +COBJS := misc.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/davinci/common/psc.h b/board/davinci/common/psc.h deleted file mode 100644 index b2dd7b56d4..0000000000 --- a/board/davinci/common/psc.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2008 Lyrtech <www.lyrtech.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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __PSC_H -#define __PSC_H - -void lpsc_on(unsigned int id); -void dsp_on(void); -void davinci_enable_uart0(void); -void davinci_enable_emac(void); -void davinci_enable_i2c(void); -void davinci_errata_workarounds(void); - -#endif /* __PSC_H */ diff --git a/board/davinci/dvevm/dvevm.c b/board/davinci/dvevm/dvevm.c index 22308deeb0..162a5dcea8 100644 --- a/board/davinci/dvevm/dvevm.c +++ b/board/davinci/dvevm/dvevm.c @@ -27,7 +27,6 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/psc.h" #include "../common/misc.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 433769a608..d6dfef5817 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -27,7 +27,6 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/psc.h" #include "../common/misc.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/sffsdr/sffsdr.c b/board/davinci/sffsdr/sffsdr.c index e76f86d08c..7d855fb836 100644 --- a/board/davinci/sffsdr/sffsdr.c +++ b/board/davinci/sffsdr/sffsdr.c @@ -30,7 +30,6 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/psc.h" #include "../common/misc.h" #define DAVINCI_A3CR (0x01E00014) /* EMIF-A CS3 config register. */ diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c index d56b443b20..155fb549c0 100644 --- a/board/davinci/sonata/sonata.c +++ b/board/davinci/sonata/sonata.c @@ -26,7 +26,6 @@ #include <common.h> #include <asm/arch/hardware.h> -#include "../common/psc.h" #include "../common/misc.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile index 7f51d17775..83708d8138 100644 --- a/cpu/arm926ejs/davinci/Makefile +++ b/cpu/arm926ejs/davinci/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a -COBJS = timer.o ether.o lxt972.o dp83848.o +COBJS = timer.o ether.o lxt972.o dp83848.o psc.o SOBJS = reset.o ifndef CONFIG_SKIP_LOWLEVEL_INIT diff --git a/board/davinci/common/psc.c b/cpu/arm926ejs/davinci/psc.c index 28e2a4b5b6..28e2a4b5b6 100644 --- a/board/davinci/common/psc.c +++ b/cpu/arm926ejs/davinci/psc.c diff --git a/include/asm-arm/arch-davinci/hardware.h b/include/asm-arm/arch-davinci/hardware.h index ebcdcfea1e..3f6d4834b0 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/include/asm-arm/arch-davinci/hardware.h @@ -133,6 +133,14 @@ typedef volatile unsigned int * dv_reg_p; #define DAVINCI_LPSC_GEM 39 #define DAVINCI_LPSC_IMCOP 40 +void lpsc_on(unsigned int id); +void dsp_on(void); + +void davinci_enable_uart0(void); +void davinci_enable_emac(void); +void davinci_enable_i2c(void); +void davinci_errata_workarounds(void); + /* Some PSC defines */ #define PSC_CHP_SHRTSW (0x01c40038) #define PSC_GBLCTL (0x01c41010) |