Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

arm: prefer /proc/device-tree

Browse Source 
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>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Cédric Bosdonnat
2017-02-22 15:07:58 +01:00
committed by Brendan Le Foll
parent 06359e39cd
commit b453f6633b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/arm/arm.c
View File

@@ -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"))

2
src/arm/banana.c
View File

@@ -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)