Module Name: src
Committed By: nisimura
Date: Tue Mar 24 11:26:21 UTC 2020
Modified Files:
src/sys/arch/arm/sociox: if_scx.c
Log Message:
fix FDT 2nd addr to map EEPROM store. mention ACPI _DSD contains FDT equiv
parameters.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sociox/if_scx.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/sociox/if_scx.c
diff -u src/sys/arch/arm/sociox/if_scx.c:1.9 src/sys/arch/arm/sociox/if_scx.c:1.10
--- src/sys/arch/arm/sociox/if_scx.c:1.9 Tue Mar 24 10:47:03 2020
+++ src/sys/arch/arm/sociox/if_scx.c Tue Mar 24 11:26:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_scx.c,v 1.9 2020/03/24 10:47:03 nisimura Exp $ */
+/* $NetBSD: if_scx.c,v 1.10 2020/03/24 11:26:21 nisimura Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.9 2020/03/24 10:47:03 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.10 2020/03/24 11:26:21 nisimura Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -438,7 +438,7 @@ scx_fdt_attach(device_t parent, device_t
goto fail;
}
if (fdtbus_get_reg(phandle, 1, addr+1, size+1) != 0
- || bus_space_map(faa->faa_bst, addr[0], size[1], 0, &eebsh) != 0) {
+ || bus_space_map(faa->faa_bst, addr[1], size[1], 0, &eebsh) != 0) {
aprint_error(": unable to map device eeprom\n");
goto fail;
}
@@ -504,6 +504,7 @@ scx_acpi_attach(device_t parent, device_
&res, &acpi_resource_parse_ops_default);
if (ACPI_FAILURE(rv))
return;
+acpi_resource_print(self, &res);
mem = acpi_res_mem(&res, 0);
irq = acpi_res_irq(&res, 0);
if (mem == NULL || irq == NULL || mem->ar_length == 0) {
@@ -541,6 +542,8 @@ scx_acpi_attach(device_t parent, device_
sc->sc_eesh = eebsh;
sc->sc_dmat = aa->aa_dmat64;
+/* dig _DSD to see parameters. safe to assume RGMII/spd1000 though */
+
scx_attach_i(sc);
acpi_resource_cleanup(&res);
