Module Name: src
Committed By: marty
Date: Mon Dec 21 04:58:50 UTC 2015
Modified Files:
src/sys/arch/arm/samsung: exynos_chipid.c exynos_combiner.c
exynos_gpio.c exynos_i2c.c exynos_pinctrl.c exynos_rtc.c
exynos_soc.c exynos_usb.c exynos_wdt.c files.exynos
src/sys/arch/evbarm/conf: EXYNOS
src/sys/arch/evbarm/exynos: exynos_machdep.c
Removed Files:
src/sys/arch/arm/samsung: exynos4_loc.c exynos4_reg.h exynos5_loc.c
exynos_dma.c exynos_io.c exynos_io.h exynos_space.c
Log Message:
XU4 FDT final checkpoint
step N of N: get rid of baggage by removing whole files. What's left is in
approximately the same shape as when the FDT update started, that is mostly
broken. What's missing is most of the 76 devices recognized in the dtd. In
other words, This is barely the start of a port.
Next up, gpio then i2c, followed either by straightening out usb or getting
the sdhc driver to work -- both probably require getting the interrupt
combiner to work first. A large chunk of work is left to do on the clocks.
I barely got them attaching to fdt and didn't do anything to take advantage
of the information in the dtd.
None of the other existing drivers, such as they are, properly request gpios,
i2c or clocks, and, of course power domains are off the table.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r0 src/sys/arch/arm/samsung/exynos4_loc.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/arm/samsung/exynos4_reg.h \
src/sys/arch/arm/samsung/exynos5_loc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos_chipid.c \
src/sys/arch/arm/samsung/exynos_combiner.c \
src/sys/arch/arm/samsung/exynos_rtc.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/samsung/exynos_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/samsung/exynos_gpio.c \
src/sys/arch/arm/samsung/exynos_usb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/arm/samsung/exynos_io.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/arm/samsung/exynos_io.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_pinctrl.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/samsung/exynos_soc.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/samsung/exynos_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/samsung/exynos_wdt.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/EXYNOS
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/exynos/exynos_machdep.c
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/samsung/exynos_chipid.c
diff -u src/sys/arch/arm/samsung/exynos_chipid.c:1.1 src/sys/arch/arm/samsung/exynos_chipid.c:1.2
--- src/sys/arch/arm/samsung/exynos_chipid.c:1.1 Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_chipid.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_chipid.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/* $NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_chipid.c,v 1.1 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_chipi
#include <dev/gpio/gpiovar.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
#include <arm/samsung/exynos_intr.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/arm/samsung/exynos_combiner.c
diff -u src/sys/arch/arm/samsung/exynos_combiner.c:1.1 src/sys/arch/arm/samsung/exynos_combiner.c:1.2
--- src/sys/arch/arm/samsung/exynos_combiner.c:1.1 Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_combiner.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_combiner.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/* $NetBSD: exynos_combiner.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.1 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -46,7 +46,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_combi
#include <arm/cortex/gic_intr.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
#include <arm/samsung/exynos_intr.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/arm/samsung/exynos_rtc.c
diff -u src/sys/arch/arm/samsung/exynos_rtc.c:1.1 src/sys/arch/arm/samsung/exynos_rtc.c:1.2
--- src/sys/arch/arm/samsung/exynos_rtc.c:1.1 Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_rtc.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_rtc.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/* $NetBSD: exynos_rtc.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_rtc.c,v 1.1 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_rtc.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_rtc.c
#include <dev/clock_subr.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
#include <arm/samsung/exynos_intr.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/arm/samsung/exynos_gpio.c
diff -u src/sys/arch/arm/samsung/exynos_gpio.c:1.14 src/sys/arch/arm/samsung/exynos_gpio.c:1.15
--- src/sys/arch/arm/samsung/exynos_gpio.c:1.14 Sat Dec 19 21:42:31 2015
+++ src/sys/arch/arm/samsung/exynos_gpio.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_gpio.c,v 1.14 2015/12/19 21:42:31 marty Exp $ */
+/* $NetBSD: exynos_gpio.c,v 1.15 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.14 2015/12/19 21:42:31 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.15 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_gpio.
#include <dev/gpio/gpiovar.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
+#include <arm/samsung/exynos_var.h>
#include <arm/samsung/exynos_intr.h>
#include <arm/samsung/exynos_pinctrl.h>
@@ -133,7 +133,7 @@ static void
exynos_gpio_update_cfg_regs(struct exynos_gpio_bank *bank,
const struct exynos_gpio_pin_cfg *ncfg)
{
- bus_space_tag_t bst = &exynos_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
if (bank->bank_cfg.cfg != ncfg->cfg) {
bus_space_write_4(bst, bank->bank_bsh,
Index: src/sys/arch/arm/samsung/exynos_usb.c
diff -u src/sys/arch/arm/samsung/exynos_usb.c:1.14 src/sys/arch/arm/samsung/exynos_usb.c:1.15
--- src/sys/arch/arm/samsung/exynos_usb.c:1.14 Mon Dec 21 03:34:34 2015
+++ src/sys/arch/arm/samsung/exynos_usb.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_usb.c,v 1.14 2015/12/21 03:34:34 marty Exp $ */
+/* $NetBSD: exynos_usb.c,v 1.15 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.14 2015/12/21 03:34:34 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.15 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_usb.c
#include <arm/samsung/exynos_reg.h>
#include <arm/samsung/exynos_var.h>
-#include <arm/samsung/exynos_io.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/arm/samsung/exynos_i2c.c
diff -u src/sys/arch/arm/samsung/exynos_i2c.c:1.5 src/sys/arch/arm/samsung/exynos_i2c.c:1.6
--- src/sys/arch/arm/samsung/exynos_i2c.c:1.5 Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_i2c.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_i2c.c,v 1.5 2015/12/21 00:52:50 marty Exp $ */
+/* $NetBSD: exynos_i2c.c,v 1.6 2015/12/21 04:58:50 marty Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "exynos_iic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.5 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.6 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c
#include <sys/kmem.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
#include <arm/samsung/exynos_intr.h>
#include <sys/gpio.h>
Index: src/sys/arch/arm/samsung/exynos_pinctrl.c
diff -u src/sys/arch/arm/samsung/exynos_pinctrl.c:1.2 src/sys/arch/arm/samsung/exynos_pinctrl.c:1.3
--- src/sys/arch/arm/samsung/exynos_pinctrl.c:1.2 Mon Dec 21 00:54:35 2015
+++ src/sys/arch/arm/samsung/exynos_pinctrl.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_pinctrl.c,v 1.2 2015/12/21 00:54:35 marty Exp $ */
+/* $NetBSD: exynos_pinctrl.c,v 1.3 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.2 2015/12/21 00:54:35 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.3 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_pinct
#include <dev/gpio/gpiovar.h>
#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_io.h>
+#include <arm/samsung/exynos_var.h>
#include <arm/samsung/exynos_intr.h>
#include <arm/samsung/exynos_pinctrl.h>
Index: src/sys/arch/arm/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.30 src/sys/arch/arm/samsung/exynos_soc.c:1.31
--- src/sys/arch/arm/samsung/exynos_soc.c:1.30 Sat Dec 12 21:57:40 2015
+++ src/sys/arch/arm/samsung/exynos_soc.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.30 2015/12/12 21:57:40 marty Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.31 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.30 2015/12/12 21:57:40 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.31 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -343,7 +343,7 @@ exynos_get_cpufreq(void)
uint32_t regval;
uint32_t freq;
- regval = bus_space_read_4(&exynos_bs_tag, exynos_cmu_apll_bsh,
+ regval = bus_space_read_4(&armv7_generic_bs_tag, exynos_cmu_apll_bsh,
PLL_CON0_OFFSET);
freq = PLL_FREQ(EXYNOS_F_IN_FREQ, regval);
@@ -369,7 +369,7 @@ exynos_set_cpufreq(const struct cpu_freq
/* enable PPL and write config */
regval |= PLL_CON0_ENABLE;
- bus_space_write_4(&exynos_bs_tag, exynos_cmu_apll_bsh, PLL_CON0_OFFSET,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_cmu_apll_bsh, PLL_CON0_OFFSET,
regval);
/* update our cycle counter i.e. our CPU frequency for all CPUs */
@@ -443,7 +443,7 @@ sysctl_cpufreq_current(SYSCTLFN_ARGS)
#ifdef VERBOSE_INIT_ARM
#define DUMP_PLL(v, var) \
reg = EXYNOS##v##_CMU_##var + PLL_CON0_OFFSET;\
- regval = bus_space_read_4(&exynos_bs_tag, exynos_cmu_bsh, reg); \
+ regval = bus_space_read_4(&armv7_generic_bs_tag, exynos_cmu_bsh, reg); \
freq = PLL_FREQ(EXYNOS_F_IN_FREQ, regval); \
printf("%8s at %d Mhz\n", #var, freq/(1000*1000));
@@ -553,14 +553,14 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
#endif
/* map in the exynos io registers */
- error = bus_space_map(&exynos_bs_tag, EXYNOS_CORE_PBASE,
+ error = bus_space_map(&armv7_generic_bs_tag, EXYNOS_CORE_PBASE,
core_size, 0, &exynos_core_bsh);
if (error)
panic("%s: failed to map in Exynos SFR registers: %d",
__func__, error);
KASSERT(exynos_core_bsh == iobase);
- error = bus_space_map(&exynos_bs_tag, audiocore_pbase,
+ error = bus_space_map(&armv7_generic_bs_tag, audiocore_pbase,
audiocore_size, 0, &exynos_audiocore_bsh);
if (error)
panic("%s: failed to map in Exynos audio SFR registers: %d",
@@ -568,27 +568,27 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
KASSERT(exynos_audiocore_bsh == audiocore_vbase);
/* map in commonly used subregions and common used register banks */
- error = bus_space_subregion(&exynos_bs_tag, exynos_core_bsh,
+ error = bus_space_subregion(&armv7_generic_bs_tag, exynos_core_bsh,
exynos_wdt_offset, EXYNOS_BLOCK_SIZE, &exynos_wdt_bsh);
if (error)
panic("%s: failed to subregion wdt registers: %d",
__func__, error);
- error = bus_space_subregion(&exynos_bs_tag, exynos_core_bsh,
+ error = bus_space_subregion(&armv7_generic_bs_tag, exynos_core_bsh,
exynos_pmu_offset, EXYNOS_BLOCK_SIZE, &exynos_pmu_bsh);
if (error)
panic("%s: failed to subregion pmu registers: %d",
__func__, error);
exynos_cmu_bsh = exynos_core_bsh;
- bus_space_subregion(&exynos_bs_tag, exynos_core_bsh,
+ bus_space_subregion(&armv7_generic_bs_tag, exynos_core_bsh,
exynos_sysreg_offset, EXYNOS_BLOCK_SIZE,
&exynos_sysreg_bsh);
if (error)
panic("%s: failed to subregion sysreg registers: %d",
__func__, error);
- error = bus_space_subregion(&exynos_bs_tag, exynos_cmu_bsh,
+ error = bus_space_subregion(&armv7_generic_bs_tag, exynos_cmu_bsh,
exynos_cmu_apll_offset, 0xfff, &exynos_cmu_apll_bsh);
if (error)
panic("%s: failed to subregion cmu apll registers: %d",
@@ -613,7 +613,7 @@ exynos_device_register(device_t self, vo
* bus space used for the armcore registers (which armperiph uses).
*/
struct mainbus_attach_args * const mb = aux;
- mb->mb_iot = &exynos_bs_tag;
+ mb->mb_iot = &armv7_generic_bs_tag;
return;
}
if (device_is_a(self, "armgic")
@@ -666,10 +666,10 @@ exynos_device_register(device_t self, vo
* The global timer is dependent on the MCT running.
*/
bus_size_t o = EXYNOS5_MCT_OFFSET + MCT_G_TCON;
- uint32_t v = bus_space_read_4(&exynos_bs_tag, exynos_core_bsh,
+ uint32_t v = bus_space_read_4(&armv7_generic_bs_tag, exynos_core_bsh,
o);
v |= G_TCON_START;
- bus_space_write_4(&exynos_bs_tag, exynos_core_bsh, o, v);
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_core_bsh, o, v);
#endif
/*
* The frequencies of the timers are the reference
@@ -679,15 +679,12 @@ exynos_device_register(device_t self, vo
"frequency", EXYNOS_F_IN_FREQ);
return;
}
-
- exyo_device_register(self, aux);
}
void
exynos_device_register_post_config(device_t self, void *aux)
{
- exyo_device_register_post_config(self, aux);
}
void
@@ -714,23 +711,23 @@ exynos_usb2_set_isolation(bool on)
if (IS_EXYNOS5_P() || IS_EXYNOS4410_P()) {
/* set usbhost mode */
regval = on ? 0 : USB20_PHY_HOST_LINK_EN;
- bus_space_write_4(&exynos_bs_tag, exynos_sysreg_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_sysreg_bsh,
EXYNOS5_SYSREG_USB20_PHY_TYPE, regval);
reg = EXYNOS_PMU_USBHOST_PHY_CTRL;
}
/* do enable PHY */
en_mask = PMU_PHY_ENABLE;
- regval = bus_space_read_4(&exynos_bs_tag, exynos_pmu_bsh, reg);
+ regval = bus_space_read_4(&armv7_generic_bs_tag, exynos_pmu_bsh, reg);
regval = on ? regval & ~en_mask : regval | en_mask;
- bus_space_write_4(&exynos_bs_tag, exynos_pmu_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_pmu_bsh,
reg, regval);
if (IS_EXYNOS4X12_P()) {
- bus_space_write_4(&exynos_bs_tag, exynos_pmu_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_pmu_bsh,
EXYNOS_PMU_USB_HSIC_1_PHY_CTRL, regval);
- bus_space_write_4(&exynos_bs_tag, exynos_pmu_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_pmu_bsh,
EXYNOS_PMU_USB_HSIC_2_PHY_CTRL, regval);
}
}
@@ -744,50 +741,50 @@ exynos4_usb2phy_enable(bus_space_handle_
/* write clock value */
clkreg = FSEL_CLKSEL_24M;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHYCLK, clkreg);
/* set device and host to normal */
- phypwr = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ phypwr = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHYPWR);
/* enable analog, enable otg, unsleep phy0 (host) */
phypwr &= ~PHYPWR_NORMAL_MASK_PHY0;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHYPWR, phypwr);
if (IS_EXYNOS4X12_P()) {
/* enable hsic0 (host), enable hsic1 and phy1 (otg) */
- phypwr = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ phypwr = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHYPWR);
phypwr &= ~(PHYPWR_NORMAL_MASK_HSIC0 |
PHYPWR_NORMAL_MASK_HSIC1 |
PHYPWR_NORMAL_MASK_PHY1);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHYPWR, phypwr);
}
/* reset both phy and link of device */
- rstcon = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ rstcon = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON);
rstcon |= RSTCON_DEVPHY_SWRST;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON, rstcon);
DELAY(10000);
rstcon &= ~RSTCON_DEVPHY_SWRST;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON, rstcon);
if (IS_EXYNOS4X12_P()) {
/* reset both phy and link of host */
- rstcon = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ rstcon = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON);
rstcon |= RSTCON_HOSTPHY_SWRST | RSTCON_HOSTPHYLINK_SWRST;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON, rstcon);
DELAY(10000);
rstcon &= ~(RSTCON_HOSTPHY_SWRST | RSTCON_HOSTPHYLINK_SWRST);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_RSTCON, rstcon);
}
@@ -806,7 +803,7 @@ exynos5410_usb2phy_enable(bus_space_hand
uint32_t ehcictrl, ohcictrl;
/* host configuration: */
- phyhost = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ phyhost = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_HOST_CTRL0);
/* host phy reference clock; assumption its 24 MHz now */
@@ -825,12 +822,12 @@ exynos5410_usb2phy_enable(bus_space_hand
phyhost |= HOST_CTRL0_LINK_SWRST | HOST_CTRL0_UTMI_SWRST |
HOST_CTRL0_COMMONON_N;
/* do the reset */
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HOST_CTRL0,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HOST_CTRL0,
phyhost);
DELAY(10000);
phyhost &= ~(HOST_CTRL0_LINK_SWRST | HOST_CTRL0_UTMI_SWRST);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HOST_CTRL0,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HOST_CTRL0,
phyhost);
/* HSIC control */
@@ -839,22 +836,22 @@ exynos5410_usb2phy_enable(bus_space_hand
__SHIFTIN(HSIC_CTRL_REFCLKSEL_DEFAULT, HSIC_CTRL_REFCLKSEL_MASK) |
HSIC_CTRL_PHY_SWRST;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL1,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL1,
phyhsic);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL2,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL2,
phyhsic);
DELAY(10);
phyhsic &= ~HSIC_CTRL_PHY_SWRST;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL1,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL1,
phyhsic);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL2,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh, USB_PHY_HSIC_CTRL2,
phyhsic);
DELAY(80);
#if 0
/* otg configuration: */
- phyotg = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ phyotg = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_OTG_SYS);
/* otg phy refrence clock: assumption its 24 Mhz now */
@@ -871,29 +868,29 @@ exynos5410_usb2phy_enable(bus_space_hand
OTG_SYS_OTGDISABLE | OTG_SYS_REFCLKSEL_MASK;
/* do the reset */
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_OTG_SYS, phyotg);
DELAY(10000);
phyotg &= ~(OTG_SYS_PHY0_SWRST | OTG_SYS_LINK_SWRST_UOTG |
OTG_SYS_PHYLINK_SWRST);
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_OTG_SYS, phyotg);
#endif
/* enable EHCI DMA burst: */
- ehcictrl = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ ehcictrl = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_HOST_EHCICTRL);
ehcictrl |= HOST_EHCICTRL_ENA_INCRXALIGN |
HOST_EHCICTRL_ENA_INCR4 | HOST_EHCICTRL_ENA_INCR8 |
HOST_EHCICTRL_ENA_INCR16;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_HOST_EHCICTRL, ehcictrl);
/* Set OHCI suspend */
- ohcictrl = bus_space_read_4(&exynos_bs_tag, usb2phy_bsh,
+ ohcictrl = bus_space_read_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_HOST_OHCICTRL);
ohcictrl |= HOST_OHCICTRL_SUSPLGCY;
- bus_space_write_4(&exynos_bs_tag, usb2phy_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, usb2phy_bsh,
USB_PHY_HOST_OHCICTRL, ohcictrl);
}
Index: src/sys/arch/arm/samsung/exynos_wdt.c
diff -u src/sys/arch/arm/samsung/exynos_wdt.c:1.8 src/sys/arch/arm/samsung/exynos_wdt.c:1.9
--- src/sys/arch/arm/samsung/exynos_wdt.c:1.8 Tue Dec 15 23:15:53 2015
+++ src/sys/arch/arm/samsung/exynos_wdt.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_wdt.c,v 1.8 2015/12/15 23:15:53 marty Exp $ */
+/* $NetBSD: exynos_wdt.c,v 1.9 2015/12/21 04:58:50 marty Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "exynos_wdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c,v 1.8 2015/12/15 23:15:53 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c,v 1.9 2015/12/21 04:58:50 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c
#include <dev/sysmon/sysmonvar.h>
-#include <arm/samsung/exynos_io.h>
#include <arm/samsung/exynos_reg.h>
#include <arm/samsung/exynos_var.h>
@@ -281,7 +280,7 @@ exynos_wdt_attach(device_t parent, devic
void
exynos_wdt_reset(void)
{
- bus_space_tag_t bst = &exynos_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_space_handle_t bsh = exynos_wdt_bsh;
(void) splhigh();
Index: src/sys/arch/arm/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.16 src/sys/arch/arm/samsung/files.exynos:1.17
--- src/sys/arch/arm/samsung/files.exynos:1.16 Mon Dec 21 03:34:34 2015
+++ src/sys/arch/arm/samsung/files.exynos Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.exynos,v 1.16 2015/12/21 03:34:34 marty Exp $
+# $NetBSD: files.exynos,v 1.17 2015/12/21 04:58:50 marty Exp $
#
# Configuration info for Samsung Exynos SoC ARM Peripherals
#
@@ -16,8 +16,7 @@ file arch/arm/arm32/armv7_generic_space.
file arch/arm/arm/bus_space_a4x.S
file arch/arm/samsung/exynos_soc.c
-file arch/arm/samsung/exynos_space.c
-#file arch/arm/samsung/exynos_dma.c
+#file arch/arm/samsung/exynos_space.c
file arch/arm/samsung/exynos_smc.S arm_trustzone_firmware
# Console parameters
@@ -49,13 +48,6 @@ device exynosfdt : bus_space_generic, fd
attach exynosfdt at mainbus with exynos_fdt
file arch/arm/samsung/exynos_fdt.c exynos_fdt
-# SoC I/O attach point
-device exyo { [port=-1], [intr=-1] } : bus_space_generic
-attach exyo at mainbus with exyo_io
-file arch/arm/samsung/exynos_io.c exyo_io
-file arch/arm/samsung/exynos4_loc.c exyo_io & exynos4
-file arch/arm/samsung/exynos5_loc.c exyo_io & exynos5
-
# Interrupt combiner
device exyointr
attach exyointr at fdt with exynos_intr
@@ -79,7 +71,7 @@ file arch/arm/samsung/mct.c exyo_mct
# Watchdog
device exyowdt : sysmon_wdog
attach exyowdt at fdt with exynos_wdt
-file arch/arm/samsung/exynos_wdt.c exynos_wdt | exyo_io needs-flag
+file arch/arm/samsung/exynos_wdt.c exynos_wdt needs-flag
# UARTs
device sscom { } : bus_space_generic
@@ -92,13 +84,13 @@ defparam opt_sscom.h SSCOM_FREQ
# PINCTL
device exyopctl : gpiobus
attach exyopctl at fdt with exynos_pinctrl
-file arch/arm/samsung/exynos_pinctrl.c exynos_pinctl | exyo_io needs-flag
-file arch/arm/samsung/exynos_gpio.c exynos_pinctl | exyo_io needs-flag
+file arch/arm/samsung/exynos_pinctrl.c exynos_pinctrl needs-flag
+file arch/arm/samsung/exynos_gpio.c exynos_pinctrl needs-flag
# GPIO
#device exyogpio : gpiobus
#attach exyogpio at fdt with exynos_gpio
-#file arch/arm/samsung/exynos_gpio.c exynos_gpio | exyo_io needs-flag
+#file arch/arm/samsung/exynos_gpio.c exynos_gpio needs-flag
# USB2 Host Controller (EHCI/OHCI)
device exyousb { } : fdtbus
@@ -110,7 +102,7 @@ file arch/arm/samsung/exynos_usb.c exyo
# I2C support, bitbanging trough GPIO
device exyoi2c: i2cbus, i2c_bitbang
attach exyoi2c at fdt with exynos_i2c
-file arch/arm/samsung/exynos_i2c.c exynos_iic | exyo_io needs-flag
+file arch/arm/samsung/exynos_i2c.c exynos_i2c needs-flag
file arch/arm/samsung/exynos5422_dma.c
Index: src/sys/arch/evbarm/conf/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.5 src/sys/arch/evbarm/conf/EXYNOS:1.6
--- src/sys/arch/evbarm/conf/EXYNOS:1.5 Mon Dec 21 03:34:34 2015
+++ src/sys/arch/evbarm/conf/EXYNOS Mon Dec 21 04:58:50 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: EXYNOS,v 1.5 2015/12/21 03:34:34 marty Exp $
+# $NetBSD: EXYNOS,v 1.6 2015/12/21 04:58:50 marty Exp $
#
# ODROID-XU -- ODROID-XU4 Exynos5422 based kernel
#
@@ -213,9 +213,6 @@ fregulator* at fdt?
exyointr0 at fdt?
gic* at fdt?
-# Exynos SoC
-exyo0 at mainbus?
-
# Clock controller
exy5422clk0 at fdt? # Exynos5422 clock controller
Index: src/sys/arch/evbarm/exynos/exynos_machdep.c
diff -u src/sys/arch/evbarm/exynos/exynos_machdep.c:1.6 src/sys/arch/evbarm/exynos/exynos_machdep.c:1.7
--- src/sys/arch/evbarm/exynos/exynos_machdep.c:1.6 Sun Dec 20 05:25:01 2015
+++ src/sys/arch/evbarm/exynos/exynos_machdep.c Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_machdep.c,v 1.6 2015/12/20 05:25:01 marty Exp $ */
+/* $NetBSD: exynos_machdep.c,v 1.7 2015/12/21 04:58:50 marty Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_machdep.c,v 1.6 2015/12/20 05:25:01 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_machdep.c,v 1.7 2015/12/21 04:58:50 marty Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_exynos.h"
@@ -81,7 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_machd
#include <arm/arm32/machdep.h>
#include <arm/mainbus/mainbus.h>
-#include <arm/samsung/exynos4_reg.h>
#include <arm/samsung/exynos5_reg.h>
#include <arm/samsung/exynos_var.h>
@@ -450,7 +449,7 @@ consinit(void)
consinit_called = true;
#if NSSCOM > 0
- bus_space_tag_t bst = &exynos_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_addr_t iobase = armreg_tpidruro_read();
bus_space_handle_t bsh = EXYNOS_IOPHYSTOVIRT(iobase);
u_int i;
@@ -553,7 +552,7 @@ void
exynos_init_clkout_for_usb(void)
{
/* Select XUSBXTI as source for CLKOUT */
- bus_space_write_4(&exynos_bs_tag, exynos_pmu_bsh,
+ bus_space_write_4(&armv7_generic_bs_tag, exynos_pmu_bsh,
EXYNOS_PMU_DEBUG_CLKOUT, 0x1000);
}
