Move up_cgu.c to lpc313x_freqin.c

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2457 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 10 insertions, 81 deletions

diff --git a/nuttx/configs/ea3131/include/board.h b/nuttx/configs/ea3131/include/board.h
index 0e988d692..c3ce4451a 100755
--- a/nuttx/configs/ea3131/include/board.h
+++ b/nuttx/configs/ea3131/include/board.h
@@ -52,9 +52,15 @@
  ************************************************************************************/
 
 /* Clocking *************************************************************************/
-/* Frequency of the installed crystal */
-
-#define LPC313X_XTALIN (12000000)
+/* Frequency of the all inputs */
+
+#define BOARD_FREQIN_FFAST     (12000000) /* ffast (12 MHz crystal) */
+#define BOARD_FREQIN_I2SRXBCK0 0          /* I2SRX_BCK0 */
+#define BOARD_FREQIN_I2SRXWS0  0          /* I2SRX_WS0 */
+#define BOARD_FREQIN_I2SRXBCK1 0          /* I2SRX_BCK1 */
+#define BOARD_FREQIN_I2SRXWS1  0          /* I2SRX_WS1 */
+#define BOARD_FREQIN_HPPLL0    0          /* HPPLL0 (Audio/I2S PLL)) */
+#define BOARD_FREQIN_HPPLL1    0          /* HPPLL1 (System PLL */
 
 /* The following 3 bitsets determine which clocks will be enabled at initialization
  * time.
diff --git a/nuttx/configs/ea3131/src/Makefile b/nuttx/configs/ea3131/src/Makefile
index e4db278f3..410597cb9 100755
--- a/nuttx/configs/ea3131/src/Makefile
+++ b/nuttx/configs/ea3131/src/Makefile
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_buttons.c up_cgu.c up_leds.c up_sdram.c up_spi.c
+CSRCS		= up_boot.c up_buttons.c up_leds.c up_sdram.c up_spi.c
 ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
diff --git a/nuttx/configs/ea3131/src/up_cgu.c b/nuttx/configs/ea3131/src/up_cgu.c
deleted file mode 100755
index 6fdb5b5d6..000000000
--- a/nuttx/configs/ea3131/src/up_cgu.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * configs/ea3131/src/up_cgu.c
- *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-
-#include <arch/board/board.h>
-
-#include "lpc313x_internal.h"
-#
-/****************************************************************************
- * Definitions
- ****************************************************************************/
-
-/* This array must be provided by the board-specific logic to provide
- * the programmed frequency of every input source.
- */
-
-const int32_t g_boardfreqin[CGU_NFREQIN] =
-{
-  LPC313X_XTALIN, /* CGU_FREQIN_FFAST (12 MHz) */
-  0,              /* CGU_FREQIN_I2SRXBCK0 */
-  0,              /* CGU_FREQIN_I2SRXWS0 */
-  0,              /* CGU_FREQIN_I2SRXBCK1 */
-  0,              /* CGU_FREQIN_I2SRXWS1 */
-  0,              /* CGU_FREQIN_HPPLL0 (Audio/I2S PLL) */
-  0               /* CGU_FREQIN_HPPLL1 (System PLL) */
-};
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/