From patchwork Mon Sep 14 02:32:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 517262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 84E6914076C for ; Mon, 14 Sep 2015 12:33:35 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 5129A1A2C00 for ; Mon, 14 Sep 2015 12:33:35 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C29D91A2BD5 for ; Mon, 14 Sep 2015 12:33:31 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id A82F214076E; Mon, 14 Sep 2015 12:33:31 +1000 (AEST) From: Jeremy Kerr To: skiboot@lists.ozlabs.org Date: Mon, 14 Sep 2015 10:32:34 +0800 Message-Id: <1442197954-8361-1-git-send-email-jk@ozlabs.org> X-Mailer: git-send-email 2.1.4 Subject: [Skiboot] [PATCH] platforms/astbmc: Move prd_init calls to astbmc_early_init() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Currently, most astbmc platforms do their own call to prd_init(), but garrison is out-of-sync. This change moves the prd_init call to astbmc_early_init, so we don't need to enable it on every platform. Signed-off-by: Jeremy Kerr Reviewed-by: Joel Stanley --- platforms/astbmc/common.c | 2 ++ platforms/astbmc/firestone.c | 1 - platforms/astbmc/habanero.c | 2 -- platforms/astbmc/palmetto.c | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 8d37785..40a9fc8 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -348,4 +348,6 @@ void astbmc_early_init(void) /* Setup UART and use it as console with interrupts */ uart_init(true); + + prd_init(); } diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c index 4eed429..aaed13e 100644 --- a/platforms/astbmc/firestone.c +++ b/platforms/astbmc/firestone.c @@ -138,7 +138,6 @@ static bool firestone_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); slot_table_init(firestone_phb_table); return true; diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c index 4ab2cdc..738aa63 100644 --- a/platforms/astbmc/habanero.c +++ b/platforms/astbmc/habanero.c @@ -134,8 +134,6 @@ static bool habanero_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); - slot_table_init(habanero_phb_table); return true; diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index ca91908..033f103 100644 --- a/platforms/astbmc/palmetto.c +++ b/platforms/astbmc/palmetto.c @@ -39,8 +39,6 @@ static bool palmetto_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); - return true; }