From 7f5e5d0c2df88bf265301c57dbc8d96074df0770 Mon Sep 17 00:00:00 2001 From: Gavin Shan Date: Mon, 3 Apr 2017 11:18:48 +1000 Subject: [PATCH] platforms/astbmc: Don't validate model on palmetto 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 Acked-by: Benjamin Herrenschmidt Signed-off-by: Stewart Smith --- platforms/astbmc/palmetto.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index aadb2fc68555..69f111c72b4f 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 */