Module Name: src
Committed By: kiyohara
Date: Mon Sep 30 13:12:56 UTC 2013
Modified Files:
src/sys/arch/arm/marvell: mvsocvar.h
Log Message:
Remove #ifdef ARMADAXP. It is OK !ARMADAXP.
Change argument for armadaxp functions.
Add some MV78xx0 definitions.
Add mv78xx0 functions.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/marvell/mvsocvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/mvsocvar.h
diff -u src/sys/arch/arm/marvell/mvsocvar.h:1.4 src/sys/arch/arm/marvell/mvsocvar.h:1.5
--- src/sys/arch/arm/marvell/mvsocvar.h:1.4 Wed May 29 20:47:14 2013
+++ src/sys/arch/arm/marvell/mvsocvar.h Mon Sep 30 13:12:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocvar.h,v 1.4 2013/05/29 20:47:14 rkujawa Exp $ */
+/* $NetBSD: mvsocvar.h,v 1.5 2013/09/30 13:12:56 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -42,16 +42,15 @@ struct mvsoc_softc {
typedef int (*mvsoc_irq_handler_t)(void *);
extern uint32_t mvPclk, mvSysclk, mvTclk;
+extern vaddr_t misc_base;
extern vaddr_t mlmb_base;
extern int nwindow, nremap;
extern int gpp_npins, gpp_irqbase;
extern struct bus_space mvsoc_bs_tag;
extern struct arm32_bus_dma_tag mvsoc_bus_dma_tag;
-#if defined(ARMADAXP)
-extern vaddr_t misc_base;
+
#define read_miscreg(o) (*(volatile uint32_t *)(misc_base + (o)))
#define write_miscreg(o, v) (*(volatile uint32_t *)(misc_base + (o)) = (v))
-#endif
#define read_mlmbreg(o) (*(volatile uint32_t *)(mlmb_base + (o)))
#define write_mlmbreg(o, v) (*(volatile uint32_t *)(mlmb_base + (o)) = (v))
@@ -88,6 +87,30 @@ enum mvsoc_tags {
KIRKWOOD_TAG_BOOTROM,
KIRKWOOD_TAG_CRYPT,
+ MV78XX0_TAG_DEVICE_CS0,
+ MV78XX0_TAG_DEVICE_CS1,
+ MV78XX0_TAG_DEVICE_CS2,
+ MV78XX0_TAG_DEVICE_CS3,
+ MV78XX0_TAG_DEVICE_BOOTCS,
+ MV78XX0_TAG_SPI,
+ MV78XX0_TAG_PEX0_MEM,
+ MV78XX0_TAG_PEX01_MEM,
+ MV78XX0_TAG_PEX02_MEM,
+ MV78XX0_TAG_PEX03_MEM,
+ MV78XX0_TAG_PEX0_IO,
+ MV78XX0_TAG_PEX01_IO,
+ MV78XX0_TAG_PEX02_IO,
+ MV78XX0_TAG_PEX03_IO,
+ MV78XX0_TAG_PEX1_MEM,
+ MV78XX0_TAG_PEX11_MEM,
+ MV78XX0_TAG_PEX12_MEM,
+ MV78XX0_TAG_PEX13_MEM,
+ MV78XX0_TAG_PEX1_IO,
+ MV78XX0_TAG_PEX11_IO,
+ MV78XX0_TAG_PEX12_IO,
+ MV78XX0_TAG_PEX13_IO,
+ MV78XX0_TAG_CRYPT,
+
ARMADAXP_TAG_PEX00_MEM,
ARMADAXP_TAG_PEX00_IO,
ARMADAXP_TAG_PEX01_MEM,
@@ -103,13 +126,16 @@ enum mvsoc_tags {
};
int mvsoc_target(int, uint32_t *, uint32_t *, uint32_t *, uint32_t *);
-void armadaxp_getclks(void);
-void armadaxp_intr_bootstrap(void);
-
void orion_intr_bootstrap(void);
void orion_getclks(bus_addr_t);
void kirkwood_intr_bootstrap(void);
void kirkwood_getclks(bus_addr_t);
+void mv78xx0_intr_bootstrap(void);
+void mv78xx0_getclks(bus_addr_t);
+
+void armadaxp_intr_bootstrap(bus_addr_t);
+void armadaxp_getclks(void);
+
#endif /* _MVSOCVAR_H_ */
