From e85c7c8554693e68853d489750de9968b9cbcd3e Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@raspberrypi>
Date: Tue, 16 May 2017 12:26:22 -0700
Subject: [PATCH] Update model identification code

---
 src/gpclk.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/gpclk.c b/src/gpclk.c
index 4bf75e2..2b8eba5 100755
--- a/src/gpclk.c
+++ b/src/gpclk.c
@@ -73,24 +73,32 @@ void gpclk(int idiv)
     unsigned int arm_base = ARMv6_PERI_BASE; // Default to ARMv6 peripheral base
 
     FILE *cpuinfo;
-    char keystr[1024], valstr[128];
+    char rasstr[1024], pistr[128];
+    int version;
 
-    if ((cpuinfo = fopen("/proc/cpuinfo", "r") ) == NULL)
+    if ((cpuinfo = fopen("/proc/device-tree/model", "r") ) == NULL)
     {
-        printf("can't open /proc/cpuinfo\n");
+        printf("can't open /proc/device-tree/model\n");
         exit(-1);
     }
-    while (!feof(cpuinfo))
+    if (fscanf(cpuinfo, "%s %s %d", rasstr, pistr, &version) == 3)
     {
-        if (fscanf(cpuinfo, "%s : %s\n", keystr, valstr) == 2)
+        if (strcmp(rasstr, "Raspberry") == 0 && strcmp(pistr, "Pi") == 0)
         {
-            if (strcmp(keystr, "Hardware") == 0 && strcmp(valstr, "BCM2709") == 0)
+            //printf("Found %s %s version %d\n", rasstr, pistr, version);
+            switch (version)
             {
-                arm_base = ARMv7_PERI_BASE; // Pi version 2 (ARMv7)
-                break;
+                case 0:
+                case 1:
+                    arm_base = ARMv6_PERI_BASE; // Pi version 1 (ARMv6)
+                    break;
+                case 2:
+                case 3:
+                    arm_base = ARMv7_PERI_BASE; // Pi version 2 and 3 (ARMv7)
+                    break;
             }
         }
-    }       
+    }
     fclose(cpuinfo);
     // Set up gpi pointer for direct register access
     cmgp = setup_io(arm_base + CMGP_OFFSET);