wrs: move GPIO definitions to gpio-wrs.h

f4acbfd8 · Grzegorz Daniluk · 5cce6590 · f4acbfd8 · 5cce6590 · f4acbfd8
Commit f4acbfd8 authored Aug 16, 2019 by Grzegorz Daniluk
Showing with 11 additions and 19 deletions

ad9516.c dev/ad9516.c +0 -5

ext-board.h include/ext-board.h +0 -12

gpio-wrs.h include/gpio-wrs.h +11 -0

spll_external.c softpll/spll_external.c +0 -1

wrs_main.c wrs_main.c +0 -1

No files found.
--- a/dev/ad9516.c
+++ b/dev/ad9516.c
@@ -20,7 +20,6 @@
 #include "board.h"
 #include "syscon.h"
 #include "gpio-wrs.h"
-#include "ext-board.h"

 #include "rt_ipc.h"

@@ -70,10 +69,6 @@ struct ad9516_reg {
 #define SPI_CTRL_GO_BSY		(1<<8)
 #define SPI_CTRL_CHAR_LEN(x)	((x) & 0x7f)

-#define GPIO_PLL_RESET_N 1
-#define GPIO_SYS_CLK_SEL 0
-#define GPIO_PERIPH_RESET_N 3
-
 #define CS_PLL	0 /* AD9516 on SPI CS0 */

 static int oc_spi_init(void *base_addr)

--- a/include/ext-board.h
+++ b/include/ext-board.h
-#ifndef __EXT_BOARD_H
-#define __EXT_BOARD_H
-
-#define GPIO_EXT_PLL_RESET_N	4
-#define GPIO_EXT_BOARD_DETECT	5
-#define GPIO_EXT_OSC_FRED_D0	6
-#define GPIO_EXT_OSC_FRED_D1	7
-#define GPIO_EXT_OSC_FRED_D2	8
-
-extern int ljd_present;
-
-#endif
--- a/include/gpio-wrs.h
+++ b/include/gpio-wrs.h
@@ -10,6 +10,17 @@

 #include "board.h"

+#define GPIO_SYS_CLK_SEL	0
+#define GPIO_PLL_RESET_N	1
+#define GPIO_PERIPH_RESET_N	3
+#define GPIO_EXT_PLL_RESET_N	4
+#define GPIO_EXT_BOARD_DETECT	5
+#define GPIO_EXT_OSC_FRED_D0	6
+#define GPIO_EXT_OSC_FRED_D1	7
+#define GPIO_EXT_OSC_FRED_D2	8
+
+extern int ljd_present;
+
 struct GPIO_WB
 {
  uint32_t CODR;  /*Clear output register*/

--- a/softpll/spll_external.c
+++ b/softpll/spll_external.c
@@ -14,7 +14,6 @@
 #include "softpll_ng.h"
 #include "irq.h"
 #include "gpio-wrs.h"
-#include "ext-board.h"

 #define ALIGN_SAMPLE_PERIOD 100000
 #define ALIGN_TARGET 0

--- a/wrs_main.c
+++ b/wrs_main.c
@@ -14,7 +14,6 @@
 #include "revision.h"
 #include "system_checks.h"
 #include "gpio-wrs.h"
-#include "ext-board.h"


 int scb_ver = 33;		/* SCB version */