From b453f6633be1053969e649f15f337457065dbe36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 22 Feb 2017 15:07:58 +0100 Subject: [PATCH] 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 Signed-off-by: Brendan Le Foll --- src/arm/arm.c | 10 +++++----- src/arm/banana.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/arm/arm.c b/src/arm/arm.c index 47e18ee..d9692d1 100644 --- a/src/arm/arm.c +++ b/src/arm/arm.c @@ -50,7 +50,7 @@ mraa_arm_platform() } else if (strstr(line, "BCM2709")) { platform_type = MRAA_RASPBERRY_PI; } else if (strstr(line, "Generic AM33XX")) { - if(mraa_file_contains("/sys/firmware/devicetree/base/model", "phyBOARD-WEGA")) { + if(mraa_file_contains("/proc/device-tree/model", "phyBOARD-WEGA")) { platform_type = MRAA_PHYBOARD_WEGA; } else { platform_type = MRAA_BEAGLEBONE; @@ -60,9 +60,9 @@ mraa_arm_platform() } else if (strstr(line, "s900")) { 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", + } else if (mraa_file_contains("/proc/device-tree/model", "Banana Pi")) { platform_type = MRAA_BANANA; } @@ -80,9 +80,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", + else if (mraa_file_contains("/proc/device-tree/model", "HiKey Development Board")) platform_type = MRAA_96BOARDS; else if (mraa_file_contains("/proc/device-tree/model", "s900")) diff --git a/src/arm/banana.c b/src/arm/banana.c index 59d44c7..83643bd 100644 --- a/src/arm/banana.c +++ b/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)