From patchwork Mon Aug 29 23:45:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 74932 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1869139qga; Mon, 29 Aug 2016 16:46:38 -0700 (PDT) X-Received: by 10.67.13.196 with SMTP id fa4mr1047610pad.115.1472514398780; Mon, 29 Aug 2016 16:46:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e74si41705527pfk.131.2016.08.29.16.46.38; Mon, 29 Aug 2016 16:46:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754185AbcH2Xqh (ORCPT + 7 others); Mon, 29 Aug 2016 19:46:37 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36491 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754167AbcH2Xqh (ORCPT ); Mon, 29 Aug 2016 19:46:37 -0400 Received: by mail-oi0-f65.google.com with SMTP id b22so293888oii.3; Mon, 29 Aug 2016 16:46:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UVVGgzGLwJK8whwouuFBrVAuj8QaLW5RYoTiXeP0b9w=; b=Evfj/FwWv44BwJb8HhxeVpkyAja28asTAm8nZXokL26wkPgtVVkRmW77KS1Az24N3O z+NcC2PJjUg1NfloTnAPe5S4WQkpgBjV26CFjrYIDAQJjbysUflu5oWPs5sMGr1jhe6t GE7rrjxvET5TI63n8V+L7kdVVEd3ThFoj8HUY5eXySQZUSGHMiGQyRc2+4DM9ZpisaY5 tZU2BC90m1a57GYktuVjh4oXZTRiXS0x1UyGnUOH9WrVO0uQYWRFcjxQRfK4xgLxiPg9 2y1Jpes5mm1Pm8xlRZGNAVtNjZEXuKci+QnBNCBuOPREnPZ1sCPnaQq5TVj5VnFd07R5 gZ6A== X-Gm-Message-State: AE9vXwOyZwvdmRH7EtaYAFPLjpTr4VS6LE1g8XtJPLryPTTYyqptGo0yESs9vIyUSXEnPQ== X-Received: by 10.157.55.183 with SMTP id x52mr647198otb.68.1472514360438; Mon, 29 Aug 2016 16:46:00 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id g56sm15711754otc.15.2016.08.29.16.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Aug 2016 16:45:59 -0700 (PDT) From: Rob Herring To: Michal Simek Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Rowand Subject: [PATCH] microblaze: move xlnx,compound to default bus matching Date: Mon, 29 Aug 2016 18:45:58 -0500 Message-Id: <20160829234558.2903-1-robh@kernel.org> X-Mailer: git-send-email 2.9.3 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Microblaze bus probing is partially broken because "xlnx,compound" is missing from the default bus probe. Add it to the default and remove from the Microblaze arch code. Fixes: 44a7185c2ae6 ("of/platform: Add common method to populate default bus") Signed-off-by: Rob Herring Cc: Michal Simek Cc: Frank Rowand Cc: devicetree@vger.kernel.org --- arch/microblaze/kernel/platform.c | 9 --------- drivers/of/platform.c | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/microblaze/kernel/platform.c b/arch/microblaze/kernel/platform.c index b9529ca..9d520bf 100644 --- a/arch/microblaze/kernel/platform.c +++ b/arch/microblaze/kernel/platform.c @@ -11,19 +11,10 @@ */ #include -#include -#include #include -static struct of_device_id xilinx_of_bus_ids[] __initdata = { - { .compatible = "simple-bus", }, - { .compatible = "xlnx,compound", }, - {} -}; - static int __init microblaze_device_probe(void) { - of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL); of_platform_reset_gpio_probe(); return 0; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f39ccd5..f0314c4 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -32,6 +32,7 @@ const struct of_device_id of_default_bus_match_table[] = { #ifdef CONFIG_ARM_AMBA { .compatible = "arm,amba-bus", }, #endif /* CONFIG_ARM_AMBA */ + { .compatible = "xlnx,compound", }, {} /* Empty terminated list */ };