diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2017-04-03 11:18:48 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-06-19 14:49:29 +1000 |
| commit | 7f5e5d0c2df88bf265301c57dbc8d96074df0770 (patch) | |
| tree | b7dc6449bff21bc8a4715026c654f9dcd8d1dd3e /platforms/astbmc/palmetto.c | |
| parent | d065caf3b3101400744d4afb915edf57755a0c95 (diff) | |
| download | talos-skiboot-7f5e5d0c2df88bf265301c57dbc8d96074df0770.tar.gz talos-skiboot-7f5e5d0c2df88bf265301c57dbc8d96074df0770.zip | |
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 <gwshan@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'platforms/astbmc/palmetto.c')
| -rw-r--r-- | platforms/astbmc/palmetto.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index aadb2fc6..69f111c7 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 */ |
