From: jsg <jsg@openbsd.org>
Date: Sun, 17 Jul 2016 00:21:13 +0000 (+0000)
Subject: Set function pointers based on the fdt root node instead of board ids.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d5df157e1e88f99b094ab6398bbabb36f4aad616;p=openbsd

Set function pointers based on the fdt root node instead of board ids.
ok kettenis@
---

diff --git a/sys/arch/armv7/omap/prcm.c b/sys/arch/armv7/omap/prcm.c
index 52b39c4c71c..c91bec66e77 100644
--- a/sys/arch/armv7/omap/prcm.c
+++ b/sys/arch/armv7/omap/prcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prcm.c,v 1.9 2014/05/08 21:17:01 miod Exp $ */
+/* $OpenBSD: prcm.c,v 1.10 2016/07/17 00:21:13 jsg Exp $ */
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  *
@@ -65,6 +65,8 @@
 #include <armv7/omap/omap3_prcmreg.h>
 #include <armv7/omap/omap4_prcmreg.h>
 
+#include <dev/ofw/fdt.h>
+
 #define PRCM_REVISION		0x0800
 #define PRCM_SYSCONFIG		0x0810
 
@@ -120,29 +122,32 @@ prcm_attach(struct device *parent, struct device *self, void *args)
 	struct armv7_attach_args *aa = args;
 	struct prcm_softc *sc = (struct prcm_softc *) self;
 	u_int32_t reg;
+	void *node;
 
 	sc->sc_iot = aa->aa_iot;
 
-	switch (board_id) {
-	case BOARD_ID_AM335X_BEAGLEBONE:
+	node = fdt_find_node("/");
+	if (node == NULL)
+		panic("%s: could not get fdt root node",
+		    sc->sc_dev.dv_xname);
+
+	if (fdt_is_compatible(node, "ti,am33xx")) {
 		sc->sc_setup = NULL;
 		sc->sc_enablemodule = prcm_am335x_enablemodule;
 		sc->sc_setclock = prcm_am335x_setclock;
-		break;
-	case BOARD_ID_OMAP3_BEAGLE:
-	case BOARD_ID_OMAP3_OVERO:
+	} else if (fdt_is_compatible(node, "ti,omap3")) {
 		sc->sc_setup = prcm_v3_setup;
 		sc->sc_enablemodule = prcm_v3_enablemodule;
 		sc->sc_setclock = prcm_v3_setclock;
-		break;
-	case BOARD_ID_OMAP4_PANDA:
+	} else if (fdt_is_compatible(node, "ti,omap4")) {
 		sc->sc_setup = NULL;
 		sc->sc_enablemodule = prcm_v4_enablemodule;
 		sc->sc_setclock = NULL;
 		sc->cm1_avail = 1;
 		sc->cm2_avail = 1;
-		break;
-	}
+	} else
+		panic("%s: could not find a compatible soc",
+		    sc->sc_dev.dv_xname);
 
 	if (bus_space_map(sc->sc_iot, aa->aa_dev->mem[0].addr,
 	    aa->aa_dev->mem[0].size, 0, &sc->sc_prcm))