Module Name: src
Committed By: skrll
Date: Tue Aug 13 09:56:09 UTC 2019
Modified Files:
src/sys/arch/arm/amlogic: meson8b_clkc.c meson_platform.c
src/sys/arch/arm/dts: meson8b.dtsi
src/sys/arch/evbarm/conf: GENERIC
Log Message:
Updates to get Odroid-C1 in better shape since the last DTS import
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/meson8b_clkc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/meson8b.dtsi
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/GENERIC
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/amlogic/meson8b_clkc.c
diff -u src/sys/arch/arm/amlogic/meson8b_clkc.c:1.3 src/sys/arch/arm/amlogic/meson8b_clkc.c:1.4
--- src/sys/arch/arm/amlogic/meson8b_clkc.c:1.3 Mon Feb 25 19:30:17 2019
+++ src/sys/arch/arm/amlogic/meson8b_clkc.c Tue Aug 13 09:56:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b_clkc.c,v 1.3 2019/02/25 19:30:17 jmcneill Exp $ */
+/* $NetBSD: meson8b_clkc.c,v 1.4 2019/08/13 09:56:08 skrll Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.3 2019/02/25 19:30:17 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.4 2019/08/13 09:56:08 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -74,6 +74,7 @@ static int meson8b_clkc_match(device_t,
static void meson8b_clkc_attach(device_t, device_t, void *);
static const char * const compatible[] = {
+ "amlogic,meson8-clkc",
"amlogic,meson8b-clkc",
NULL
};
@@ -333,18 +334,12 @@ meson8b_clkc_attach(device_t parent, dev
{
struct meson_clk_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
- bus_addr_t addr;
- bus_size_t size;
sc->sc_dev = self;
sc->sc_phandle = faa->faa_phandle;
- sc->sc_bst = faa->faa_bst;
- if (fdtbus_get_reg(sc->sc_phandle, MESON8B_CLKC_REG_INDEX, &addr, &size) != 0) {
- aprint_error(": couldn't get registers\n");
- return;
- }
- if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
- aprint_error(": couldn't map registers\n");
+ sc->sc_syscon = fdtbus_syscon_lookup(OF_parent(sc->sc_phandle));
+ if (sc->sc_syscon == NULL) {
+ aprint_error(": couldn't get syscon registers\n");
return;
}
Index: src/sys/arch/arm/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.12 src/sys/arch/arm/amlogic/meson_platform.c:1.13
--- src/sys/arch/arm/amlogic/meson_platform.c:1.12 Tue Aug 13 09:52:57 2019
+++ src/sys/arch/arm/amlogic/meson_platform.c Tue Aug 13 09:56:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.12 2019/08/13 09:52:57 skrll Exp $ */
+/* $NetBSD: meson_platform.c,v 1.13 2019/08/13 09:56:08 skrll Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.12 2019/08/13 09:52:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.13 2019/08/13 09:56:08 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -447,7 +447,7 @@ static const struct arm_platform meson8b
.ap_init_attach_args = meson_platform_init_attach_args,
.ap_device_register = meson8b_platform_device_register,
.ap_reset = meson8b_platform_reset,
- .ap_delay = a9tmr_delay,
+ .ap_delay = a9ptmr_delay,
.ap_uart_freq = meson_platform_uart_freq,
.ap_mpstart = meson8b_mpstart,
};
Index: src/sys/arch/arm/dts/meson8b.dtsi
diff -u src/sys/arch/arm/dts/meson8b.dtsi:1.5 src/sys/arch/arm/dts/meson8b.dtsi:1.6
--- src/sys/arch/arm/dts/meson8b.dtsi:1.5 Sun Jan 20 17:57:29 2019
+++ src/sys/arch/arm/dts/meson8b.dtsi Tue Aug 13 09:56:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b.dtsi,v 1.5 2019/01/20 17:57:29 jmcneill Exp $ */
+/* $NetBSD: meson8b.dtsi,v 1.6 2019/08/13 09:56:08 skrll Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -29,13 +29,6 @@
#define CLKID_PERIPH 126
/ {
- timer@c4300200 {
- compatible = "arm,cortex-a5-global-timer";
- reg = <0xc4300200 0x20>;
- interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
- clocks = <&clkc CLKID_PERIPH>;
- };
-
genfb: fb@c8006000 {
compatible = "amlogic,meson8b-fb";
reg = <0xc8006000 0x400>, /* DMC */
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.49 src/sys/arch/evbarm/conf/GENERIC:1.50
--- src/sys/arch/evbarm/conf/GENERIC:1.49 Sat Aug 3 13:33:10 2019
+++ src/sys/arch/evbarm/conf/GENERIC Tue Aug 13 09:56:09 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.49 2019/08/03 13:33:10 tnn Exp $
+# $NetBSD: GENERIC,v 1.50 2019/08/13 09:56:09 skrll Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -298,6 +298,8 @@ syscon* at fdt? pass 1 # Generic Syste
#zynqslcr* at fdt? pass 1 # Zynq 7000 system Controller
# Timer
+a9ptmr* at fdt? pass 2 # ARM Cortex A5/A9 Private Timer
+arma9ptmr* at a9ptmr?
a9tmr* at fdt? pass 2 # ARM Cortex A5/A9 Timer
arma9tmr* at a9tmr?
gtmr* at fdt? pass 1 # ARM Generic Timer
