[RESEND] platforms/astbmc: Don't validate model on palmetto

Submitted by Gavin Shan on April 3, 2017, 1:18 a.m.

Details

Message ID 1491182328-20556-1-git-send-email-gwshan@linux.vnet.ibm.com
State New
Headers show

Commit Message

Gavin Shan April 3, 2017, 1:18 a.m.
The platform isn't compatible with palmetto until the root device-tree
node's "model" property is NULL or "palmetto". However, we could have
"TN71-BP012" for the property on palmetto.

   linux# cat /proc/device-tree/model
   TN71-BP012

This skips the validation on root device-tree node's "model" property
on palmetto, meaning we check the "compatible" property only.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 platforms/astbmc/palmetto.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c
index aadb2fc..69f111c 100644
--- a/platforms/astbmc/palmetto.c
+++ b/platforms/astbmc/palmetto.c
@@ -105,15 +105,8 @@  static const struct slot_table_entry palmetto_phb_table[] = {
 
 static bool palmetto_probe(void)
 {
-	const char *model;
-
-	if (!dt_node_is_compatible(dt_root, "ibm,powernv"))
-		return false;
-
-	/* Temporary ... eventually we'll get that in compatible */
-	model = dt_prop_get_def(dt_root, "model", NULL);
-	if ((!model || !strstr(model, "palmetto")) &&
-	    (!dt_node_is_compatible(dt_root, "tyan,palmetto")))
+	if (!dt_node_is_compatible(dt_root, "ibm,powernv") ||
+	    !dt_node_is_compatible(dt_root, "tyan,palmetto"))
 		return false;
 
 	/* Lot of common early inits here */