File 0003-arm-prefer-proc-device-tree.patch of Package mraa

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-arm-prefer-proc-device-tree.patch of Package mraa (Revision db620713c265735a882cffd7e2e7397e)

Currently displaying revision db620713c265735a882cffd7e2e7397e , Show latest

From 869a5bab625171e67af5b61eac3a0f10c0fdbab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 22 Feb 2017 15:07:58 +0100
Subject: [PATCH 3/6] arm: prefer /proc/device-tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per Documentation/ABI/testing/sysfs-firmware-ofw, perfer
/proc/device-tree over /sys/firmware/devicetree/base as this
is the stable one.

Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>
---
 src/arm/arm.c    | 10 +++++-----
 src/arm/banana.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: mraa-1.5.1/src/arm/arm.c
===================================================================
--- mraa-1.5.1.orig/src/arm/arm.c
+++ mraa-1.5.1/src/arm/arm.c
@@ -57,10 +57,10 @@ mraa_arm_platform()
                     platform_type = MRAA_96BOARDS;
                 }
                 else if (strstr(line, "sun7i")) {
-                    if (mraa_file_contains("/sys/firmware/devicetree/base/model", "Banana Pro")) {
+                    if (mraa_file_contains("/proc/device-tree/model", "Banana Pro")) {
                         platform_type = MRAA_BANANA;
                     }
-                    else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "Banana Pi")) {
+                    else if (mraa_file_contains("/proc/device-tree/base/model", "Banana Pi")) {
                         platform_type = MRAA_BANANA;
                     }
                     // For old kernels
@@ -77,9 +77,9 @@ mraa_arm_platform()
 
     /* Get compatible string from Device tree for boards that dont have enough info in /proc/cpuinfo */
     if (platform_type == MRAA_UNKNOWN_PLATFORM) {
-        if (mraa_file_contains("/sys/firmware/devicetree/base/compatible", "qcom,apq8016-sbc"))
+        if (mraa_file_contains("/proc/device-tree/compatible", "qcom,apq8016-sbc"))
                    platform_type = MRAA_96BOARDS;
-        else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "HiKey Development Board"))
+        else if (mraa_file_contains("/proc/device-tree/model", "HiKey Development Board"))
                    platform_type = MRAA_96BOARDS;
      }
 
Index: mraa-1.5.1/src/arm/banana.c
===================================================================
--- mraa-1.5.1.orig/src/arm/banana.c
+++ mraa-1.5.1/src/arm/banana.c
@@ -37,7 +37,7 @@
 #define PLATFORM_NAME_BANANA_PRO "Banana Pro"
 #define PLATFORM_BANANA_PRO 2
 #define MMAP_PATH "/dev/mem"
-#define DT_BASE "/sys/firmware/devicetree/base"
+#define DT_BASE "/proc/device-tree"
 
 #define SUNXI_BASE (0x01C20000)
 #define SUNXI_BLOCK_SIZE (4 * 1024)

Places

File 0003-arm-prefer-proc-device-tree.patch of Package mraa (Revision db620713c265735a882cffd7e2e7397e)

Places