Skip to content

Commit

Permalink
platforms/astbmc: Don't validate model on palmetto
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gavin Shan authored and stewartsmith committed Jun 19, 2017
1 parent d065caf commit 7f5e5d0
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions platforms/astbmc/palmetto.c
Expand Up @@ -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 */
Expand Down

0 comments on commit 7f5e5d0

Please sign in to comment.