From patchwork Tue Aug 23 02:06:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 661687 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sJDbT5y5Zz9sC4 for ; Tue, 23 Aug 2016 12:17:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PBv1NjwO; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sJDbT4NH5zDrfL for ; Tue, 23 Aug 2016 12:17:09 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PBv1NjwO; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yw0-x244.google.com (mail-yw0-x244.google.com [IPv6:2607:f8b0:4002:c05::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sJDNQ4Hz5zDrcZ for ; Tue, 23 Aug 2016 12:07:34 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PBv1NjwO; dkim-atps=neutral Received: by mail-yw0-x244.google.com with SMTP id u134so4425724ywg.3 for ; Mon, 22 Aug 2016 19:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2nqsUGP3mWKIQfQGeF6kWRZ216qJPus/+RCDpLGwuQM=; b=PBv1NjwOvakmx4lY84KRY+mDljF7e5q9PZuiR10pL/NfP9/eJvq6YH9zGfV9VOaFX7 qw7QbiZLFaBxD6b6X7NCx2CbrJZvxtOGqzM3nF/zvUXb45y/Mn0nBLApl5EqMvGGnung YkF7EPAHEE2up5Bp00tXEkoXrDdx7Wik2pzd0cIlkN1rKbkcL9e7tbGKyh+5YlP9aUxz fkBUYlRjJ4uZMT+GMIIBkwOih/CwX+jsLSVuVnL+ypvwpR7nFVAtZlY7UPT8NwBGwlEq j4Zx/lZTaKBJLhFqXGvu/qcUpA5yJDMW5vOJeT61KWtUE4mv6es33lzXKlZ/lE/DeDWn 9vDg== 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:in-reply-to :references; bh=2nqsUGP3mWKIQfQGeF6kWRZ216qJPus/+RCDpLGwuQM=; b=UN/Mld9dljj7UhIWABYxWVUprOXnQ5kzDAtdYyGb99p8W6QAXFlPxnq7r+ze6ZH/hO vJ7qKcp6VzYIEtPTeqeLhoTwdEwWezAH9gf0xXJwFSaRFT1DmcwXZt6bJiTW8gu3WP7B s3ZPUc15z8nVCsXCHI13hayN6WnotA00jNX+wBbra91TvpNkFo/HqcH9aY+0GIUVXmi3 vr1tV98BvRVBUfX192EO0kUeIRjUEUVqUdXg7URjRX/TO0IiqXZfbEwyLa4W36lPbg+G IFT+lgLQ+xO8Pyb3GEnGWNl3EGWOJu5pq0DrgPTs8MZ3ecFPjjlOHMM496Ko5ySTliE9 Ab3g== X-Gm-Message-State: AEkoouso5xvT+0vTjqqOe1Lsu9hWFYjPyFiF4LIf2cri+zwvZmU5L504bxqHXhkVivQkIQ== X-Received: by 10.13.222.131 with SMTP id h125mr19197799ywe.6.1471918052349; Mon, 22 Aug 2016 19:07:32 -0700 (PDT) Received: from pek-khao-d1.wrs.com (unknown-178-22.windriver.com. [147.11.178.22]) by smtp.gmail.com with ESMTPSA id u187sm533582ywu.27.2016.08.22.19.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Aug 2016 19:07:31 -0700 (PDT) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org Subject: [PATCH 5/5] powerpc/83xx: enable the default of probe Date: Tue, 23 Aug 2016 10:06:59 +0800 Message-Id: <1471918019-19472-6-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1471918019-19472-1-git-send-email-haokexin@gmail.com> References: <1471918019-19472-1-git-send-email-haokexin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , Rob Herring Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use the default of probe function of_platform_default_populate_init() to kill the arch specific duplicated codes. Signed-off-by: Kevin Hao --- arch/powerpc/platforms/83xx/asp834x.c | 2 -- arch/powerpc/platforms/83xx/km83xx.c | 2 -- arch/powerpc/platforms/83xx/misc.c | 25 ++++++++----------------- arch/powerpc/platforms/83xx/mpc830x_rdb.c | 2 -- arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 -- arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 -- arch/powerpc/platforms/83xx/mpc834x_itx.c | 12 ------------ arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 2 -- arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 -- arch/powerpc/platforms/83xx/mpc83xx.h | 1 - arch/powerpc/platforms/83xx/sbc834x.c | 2 -- 15 files changed, 8 insertions(+), 54 deletions(-) diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c index 575afd6eb36a..2219a1f8c535 100644 --- a/arch/powerpc/platforms/83xx/asp834x.c +++ b/arch/powerpc/platforms/83xx/asp834x.c @@ -34,8 +34,6 @@ static void __init asp834x_setup_arch(void) mpc834x_usb_cfg(); } -machine_device_initcall(asp834x, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */ diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index d8642a4afc74..e2276f12eafe 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -154,8 +154,6 @@ static void __init mpc83xx_km_setup_arch(void) #endif /* CONFIG_QUICC_ENGINE */ } -machine_device_initcall(mpc83xx_km, mpc83xx_declare_of_platform_devices); - /* list of the supported boards */ static char *board[] __initdata = { "Keymile,KMETER1", diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index d75c9816a5c9..4a88edd51d1a 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -114,23 +114,6 @@ void __init mpc83xx_ipic_and_qe_init_IRQ(void) } #endif /* CONFIG_QUICC_ENGINE */ -static const struct of_device_id of_bus_ids[] __initconst = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus" }, - { .compatible = "gianfar" }, - { .compatible = "gpio-leds", }, - { .type = "qe", }, - { .compatible = "fsl,qe", }, - {}, -}; - -int __init mpc83xx_declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - return 0; -} - #ifdef CONFIG_PCI void __init mpc83xx_setup_pci(void) { @@ -149,4 +132,12 @@ void __init mpc83xx_setup_arch(void) ppc_md.progress("mpc83xx_setup_arch()", 0); mpc83xx_setup_pci(); + arch_enable_default_of_probe(); } + +BUS_OF_DECLARE_TYPE(type_soc, "soc"); +BUS_OF_DECLARE_TYPE(type_qe, "qe"); +BUS_OF_DECLARE_COMPAT(simple_bus, "simple-bus"); +BUS_OF_DECLARE_COMPAT(gianfar, "gianfar"); +BUS_OF_DECLARE_COMPAT(gpio_leds, "gpio-leds"); +BUS_OF_DECLARE_COMPAT(qe, "fsl,qe"); diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c index 272c41c387b9..0d073102cfbb 100644 --- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c @@ -46,8 +46,6 @@ static int __init mpc830x_rdb_probe(void) return of_device_compatible_match(of_root, board); } -machine_device_initcall(mpc830x_rdb, mpc83xx_declare_of_platform_devices); - define_machine(mpc830x_rdb) { .name = "MPC830x RDB", .probe = mpc830x_rdb_probe, diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index fd80fd570e67..16926fb95592 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c @@ -46,8 +46,6 @@ static int __init mpc831x_rdb_probe(void) return of_device_compatible_match(of_root, board); } -machine_device_initcall(mpc831x_rdb, mpc83xx_declare_of_platform_devices); - define_machine(mpc831x_rdb) { .name = "MPC831x RDB", .probe = mpc831x_rdb_probe, diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index bb7b25acf26f..01c0602347a7 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -92,8 +92,6 @@ static void __init mpc832x_sys_setup_arch(void) #endif /* CONFIG_QUICC_ENGINE */ } -machine_device_initcall(mpc832x_mds, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */ diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 09d1bbf25b5d..4626d909e7fa 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -210,8 +210,6 @@ static void __init mpc832x_rdb_setup_arch(void) #endif /* CONFIG_QUICC_ENGINE */ } -machine_device_initcall(mpc832x_rdb, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */ diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c index 73a5267df497..60717eb6b029 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_itx.c +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c @@ -38,18 +38,6 @@ #include "mpc83xx.h" -static const struct of_device_id mpc834x_itx_ids[] __initconst = { - { .compatible = "fsl,pq2pro-localbus", }, - {}, -}; - -static int __init mpc834x_itx_declare_of_platform_devices(void) -{ - mpc83xx_declare_of_platform_devices(); - return of_platform_bus_probe(NULL, mpc834x_itx_ids, NULL); -} -machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices); - /* ************************************************************************ * * Setup the architecture diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c index 009cfc18a4ee..64ba2f8eab9f 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c @@ -81,8 +81,6 @@ static void __init mpc834x_mds_setup_arch(void) mpc834xemds_usb_cfg(); } -machine_device_initcall(mpc834x_mds, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */ diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 4fc3051c2b2e..0cc26696ca06 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c @@ -135,8 +135,6 @@ static void __init mpc836x_mds_setup_arch(void) #endif /* CONFIG_QUICC_ENGINE */ } -machine_device_initcall(mpc836x_mds, mpc83xx_declare_of_platform_devices); - #ifdef CONFIG_QE_USB static int __init mpc836x_usb_cfg(void) { diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c index 93f024fd9b45..ac36ea02c0a2 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c @@ -27,8 +27,6 @@ #include "mpc83xx.h" -machine_device_initcall(mpc836x_rdk, mpc83xx_declare_of_platform_devices); - static void __init mpc836x_rdk_setup_arch(void) { mpc83xx_setup_arch(); diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 3b34cc1f626c..2e4f29190844 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c @@ -83,8 +83,6 @@ static void __init mpc837x_mds_setup_arch(void) mpc837xmds_usb_cfg(); } -machine_device_initcall(mpc837x_mds, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */ diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index 0c55fa6af2d5..9d0c9c6af736 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c @@ -55,8 +55,6 @@ static void __init mpc837x_rdb_setup_arch(void) mpc837x_rdb_sd_cfg(); } -machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices); - static const char * const board[] __initconst = { "fsl,mpc8377rdb", "fsl,mpc8378rdb", diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h index 636eb9d0401a..77f9658aa22e 100644 --- a/arch/powerpc/platforms/83xx/mpc83xx.h +++ b/arch/powerpc/platforms/83xx/mpc83xx.h @@ -85,7 +85,6 @@ extern void mpc83xx_setup_pci(void); #define mpc83xx_setup_pci() do {} while (0) #endif -extern int mpc83xx_declare_of_platform_devices(void); extern void mpc83xx_setup_arch(void); #endif /* __MPC83XX_H__ */ diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c index cb4bdabfdf1c..e750a0ed644a 100644 --- a/arch/powerpc/platforms/83xx/sbc834x.c +++ b/arch/powerpc/platforms/83xx/sbc834x.c @@ -50,8 +50,6 @@ static void __init sbc834x_setup_arch(void) mpc83xx_setup_arch(); } -machine_device_initcall(sbc834x, mpc83xx_declare_of_platform_devices); - /* * Called very early, MMU is off, device-tree isn't unflattened */