|
 |
bd7bb7 |
From 26f621009875f3bf1312d64750734420cdd1de03 Mon Sep 17 00:00:00 2001
|
|
|
bd7bb7 |
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
bd7bb7 |
Date: Tue, 16 Jan 2018 15:29:36 +0530
|
|
|
bd7bb7 |
Subject: [PATCH 2/5] devtree: Revert "vendor" property for Power System
|
|
|
bd7bb7 |
|
|
|
bd7bb7 |
Commit f95aa917 removed vendor property for Power System PowerNV platform.
|
|
|
bd7bb7 |
We have "/vendor" property in device tree which gives Vendor name.
|
|
|
bd7bb7 |
|
|
|
bd7bb7 |
Hence revert changes. Note that this only reverts "vendor" property for
|
|
|
bd7bb7 |
particular platform and no side effect on other platform.
|
|
|
bd7bb7 |
|
|
|
bd7bb7 |
Fixes: f95aa917 (merge patches from beaker-fork)
|
|
|
bd7bb7 |
CC: Lyonel Vincent <lyonel@ezix.org>
|
|
|
bd7bb7 |
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
bd7bb7 |
---
|
|
|
bd7bb7 |
src/core/device-tree.cc | 2 ++
|
|
|
bd7bb7 |
1 file changed, 2 insertions(+)
|
|
|
bd7bb7 |
|
|
|
bd7bb7 |
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
|
|
|
bd7bb7 |
index e14a3b3..2981130 100644
|
|
|
bd7bb7 |
--- a/src/core/device-tree.cc
|
|
|
bd7bb7 |
+++ b/src/core/device-tree.cc
|
|
|
bd7bb7 |
@@ -1432,6 +1432,8 @@ bool scan_device_tree(hwNode & n)
|
|
|
bd7bb7 |
get_ibm_model(n);
|
|
|
bd7bb7 |
if (matches(get_string(DEVICETREE "/compatible"), "^ibm,powernv"))
|
|
|
bd7bb7 |
{
|
|
|
bd7bb7 |
+ n.setVendor(get_string(DEVICETREE "/vendor", "IBM"));
|
|
|
bd7bb7 |
+
|
|
|
bd7bb7 |
if (exists(DEVICETREE "/model-name"))
|
|
|
bd7bb7 |
n.setProduct(n.getProduct() + " (" +
|
|
|
bd7bb7 |
hw::strip(get_string(DEVICETREE "/model-name")) + ")");
|
|
|
bd7bb7 |
--
|
|
|
bd7bb7 |
1.8.3.1
|
|
|
bd7bb7 |
|