summaryrefslogtreecommitdiff
path: root/sys/arch/armv7/exynos
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2016-07-26 22:10:11 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2016-07-26 22:10:11 +0000
commita74ef2545dc135abecfddca35e47068674a4fe86 (patch)
treebf4bd8cd1c5ca94d267ca997cfef25770f6cc4d2 /sys/arch/armv7/exynos
parent7be1b07afad34d8e30960b2ba4ef0345981de096 (diff)
Rename struct fdt_memory to fdt_reg to match the member name
used in the fdt attach args and the device tree. ok kettenis@
Diffstat (limited to 'sys/arch/armv7/exynos')
-rw-r--r--sys/arch/armv7/exynos/exclock.c10
-rw-r--r--sys/arch/armv7/exynos/exdisplay.c10
-rw-r--r--sys/arch/armv7/exynos/exdog.c10
-rw-r--r--sys/arch/armv7/exynos/exehci.c16
-rw-r--r--sys/arch/armv7/exynos/exesdhc.c10
-rw-r--r--sys/arch/armv7/exynos/exgpio.c10
-rw-r--r--sys/arch/armv7/exynos/exiic.c8
-rw-r--r--sys/arch/armv7/exynos/exmct.c10
-rw-r--r--sys/arch/armv7/exynos/expower.c10
-rw-r--r--sys/arch/armv7/exynos/exsysreg.c10
-rw-r--r--sys/arch/armv7/exynos/exuart.c18
11 files changed, 61 insertions, 61 deletions
diff --git a/sys/arch/armv7/exynos/exclock.c b/sys/arch/armv7/exynos/exclock.c
index d6c906c5a2b..c4fa7ea01e6 100644
--- a/sys/arch/armv7/exynos/exclock.c
+++ b/sys/arch/armv7/exynos/exclock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exclock.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exclock.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -132,12 +132,12 @@ exclock_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exdisplay.c b/sys/arch/armv7/exynos/exdisplay.c
index 3326b0266f9..a80171fcc2b 100644
--- a/sys/arch/armv7/exynos/exdisplay.c
+++ b/sys/arch/armv7/exynos/exdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exdisplay.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exdisplay.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
*
@@ -126,12 +126,12 @@ exdisplay_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exdog.c b/sys/arch/armv7/exynos/exdog.c
index 0f92a484756..853ba31b43d 100644
--- a/sys/arch/armv7/exynos/exdog.c
+++ b/sys/arch/armv7/exynos/exdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exdog.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exdog.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -93,12 +93,12 @@ exdog_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exehci.c b/sys/arch/armv7/exynos/exehci.c
index 9a1783bffcd..ec99b0dea44 100644
--- a/sys/arch/armv7/exynos/exehci.c
+++ b/sys/arch/armv7/exynos/exehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exehci.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exehci.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -131,16 +131,16 @@ exehci_attach(struct device *parent, struct device *self, void *aux)
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fhmem, fpmem;
+ struct fdt_reg hreg, preg;
uint32_t ints[3];
- if (fdt_get_memory_address(aa->aa_node, 0, &fhmem))
+ if (fdt_get_reg(aa->aa_node, 0, &hreg))
panic("%s: could not extract memory data from FDT",
__func__);
/* XXX: In a different way, please. */
void *node = fdt_find_compatible("samsung,exynos5250-usb2-phy");
- if (node == NULL || fdt_get_memory_address(node, 0, &fpmem))
+ if (node == NULL || fdt_get_reg(node, 0, &preg))
panic("%s: could not extract phy data from FDT",
__func__);
@@ -150,10 +150,10 @@ exehci_attach(struct device *parent, struct device *self, void *aux)
panic("%s: could not extract interrupt data from FDT",
__func__);
- hmem.addr = fhmem.addr;
- hmem.size = fhmem.size;
- pmem.addr = fpmem.addr;
- pmem.size = fpmem.size;
+ hmem.addr = hreg.addr;
+ hmem.size = hreg.size;
+ pmem.addr = preg.addr;
+ pmem.size = preg.size;
irq = ints[1];
} else
diff --git a/sys/arch/armv7/exynos/exesdhc.c b/sys/arch/armv7/exynos/exesdhc.c
index 73ff91e2ac5..9f63345a6d7 100644
--- a/sys/arch/armv7/exynos/exesdhc.c
+++ b/sys/arch/armv7/exynos/exesdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exesdhc.c,v 1.7 2016/05/05 11:01:08 kettenis Exp $ */
+/* $OpenBSD: exesdhc.c,v 1.8 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -273,13 +273,13 @@ exesdhc_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
+ struct fdt_reg reg;
static int unit = 0;
uint32_t ints[3];
sc->unit = unit++;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
@@ -289,8 +289,8 @@ exesdhc_attach(struct device *parent, struct device *self, void *args)
panic("%s: could not extract interrupt data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
irq = ints[1];
} else
diff --git a/sys/arch/armv7/exynos/exgpio.c b/sys/arch/armv7/exynos/exgpio.c
index 180fa79ac38..beaa9a2a8b7 100644
--- a/sys/arch/armv7/exynos/exgpio.c
+++ b/sys/arch/armv7/exynos/exgpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exgpio.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exgpio.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -125,12 +125,12 @@ exgpio_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exiic.c b/sys/arch/armv7/exynos/exiic.c
index b9e9f0e2e08..de4f90da738 100644
--- a/sys/arch/armv7/exynos/exiic.c
+++ b/sys/arch/armv7/exynos/exiic.c
@@ -137,15 +137,15 @@ exiic_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
+ struct fdt_reg reg;
static int unit = 0;
sc->unit = unit++;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exmct.c b/sys/arch/armv7/exynos/exmct.c
index b032d123ba8..eea4480d2a2 100644
--- a/sys/arch/armv7/exynos/exmct.c
+++ b/sys/arch/armv7/exynos/exmct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exmct.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exmct.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -86,12 +86,12 @@ exmct_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/expower.c b/sys/arch/armv7/exynos/expower.c
index 644f9edb301..54874f72a5c 100644
--- a/sys/arch/armv7/exynos/expower.c
+++ b/sys/arch/armv7/exynos/expower.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expower.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: expower.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -92,12 +92,12 @@ expower_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exsysreg.c b/sys/arch/armv7/exynos/exsysreg.c
index d1552ee1271..28e5435ebe9 100644
--- a/sys/arch/armv7/exynos/exsysreg.c
+++ b/sys/arch/armv7/exynos/exsysreg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exsysreg.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
+/* $OpenBSD: exsysreg.c,v 1.4 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -92,12 +92,12 @@ exsysreg_attach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ struct fdt_reg reg;
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
} else
#endif
{
diff --git a/sys/arch/armv7/exynos/exuart.c b/sys/arch/armv7/exynos/exuart.c
index 60cd751c9ec..58d24361765 100644
--- a/sys/arch/armv7/exynos/exuart.c
+++ b/sys/arch/armv7/exynos/exuart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exuart.c,v 1.5 2016/06/11 08:08:16 jsg Exp $ */
+/* $OpenBSD: exuart.c,v 1.6 2016/07/26 22:10:10 patrick Exp $ */
/*
* Copyright (c) 2005 Dale Rahn <drahn@motorola.com>
*
@@ -137,19 +137,19 @@ int exuartdefaultrate = B115200;
void
exuart_init_cons(void)
{
- struct fdt_memory mem;
+ struct fdt_reg reg;
void *node;
if ((node = fdt_find_cons("samsung,exynos4210-uart")) == NULL)
return;
- if (fdt_get_memory_address(node, 0, &mem))
+ if (fdt_get_reg(node, 0, &reg))
return;
/* dtb uses serial2, qemu uses serial0 */
if (board_id == BOARD_ID_EXYNOS4_SMDKC210)
- mem.addr = 0x13800000;
+ reg.addr = 0x13800000;
- exuartcnattach(&armv7_bs_tag, mem.addr, comcnspeed, comcnmode);
+ exuartcnattach(&armv7_bs_tag, reg.addr, comcnspeed, comcnmode);
}
int
@@ -185,10 +185,10 @@ exuartattach(struct device *parent, struct device *self, void *args)
sc->sc_iot = aa->aa_iot;
#if NFDT > 0
if (aa->aa_node) {
- struct fdt_memory fdtmem;
+ struct fdt_reg reg;
uint32_t ints[3];
- if (fdt_get_memory_address(aa->aa_node, 0, &fdtmem))
+ if (fdt_get_reg(aa->aa_node, 0, &reg))
panic("%s: could not extract memory data from FDT",
__func__);
@@ -198,8 +198,8 @@ exuartattach(struct device *parent, struct device *self, void *args)
panic("%s: could not extract interrupt data from FDT",
__func__);
- mem.addr = fdtmem.addr;
- mem.size = fdtmem.size;
+ mem.addr = reg.addr;
+ mem.size = reg.size;
irq = ints[1];
} else
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 15:20:25 +0000