From patchwork Tue Jul 24 04:24:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 10541335 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D7EA112B for ; Tue, 24 Jul 2018 04:25:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C5D1285F7 for ; Tue, 24 Jul 2018 04:25:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10AE128639; Tue, 24 Jul 2018 04:25:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6708285F7 for ; Tue, 24 Jul 2018 04:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jasaMC/VYOhb/A2OsHEz5zQ1jIFBPjDjUNZ+bFZ5jSM=; b=B/I/rFg6gkNVBCT2s+3f56/Lf4 oz9uvZ+mwOmeLRr7D4jT1IW7xHEg2A3pEn0huo4tE5s2SBKG5CD2s6gDawLUdpFOGZXMUDboY8dYV ih6TgKGQX7IY79us14qCQPJEQMde7oZjavvjnSt1XRd2KzDrLkxbLhrhjno9VODaqQMth60fmu/i/ GzjPh/V7VcxHX8Qbzp4Sv71RE1TOgjdTVFMSVKmMFN4iLjn2q2RA7EhBz2a2R5tuVY9/bVex7JWoJ fUsDMh0fUWsLzsBWAyVkqxPnB2s/bq11TKDomRf+t7TbNTuaImt84adZaE5XpGJk/lmyrvYxCWLe7 rL8mI/Sg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhosp-0001yV-LT; Tue, 24 Jul 2018 04:25:11 +0000 Received: from gate.crashing.org ([63.228.1.57]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhosP-0001JW-3N for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 04:24:46 +0000 Received: from pasglop.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.14.1) with ESMTP id w6O4O7pI026704; Mon, 23 Jul 2018 23:24:19 -0500 From: Benjamin Herrenschmidt To: Joel Stanley Subject: [PATCH 4/5] arm: dts: Add power8 CFAM dtsi and use it on palmetto Date: Tue, 24 Jul 2018 14:24:05 +1000 Message-Id: <20180724042406.15374-5-benh@kernel.crashing.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724042406.15374-1-benh@kernel.crashing.org> References: <20180724042406.15374-1-benh@kernel.crashing.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_212445_375008_3D56AE2D X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , Benjamin Herrenschmidt , linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP So we get proper chip-id Signed-off-by: Benjamin Herrenschmidt --- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 10 ++++++ arch/arm/boot/dts/ibm-power8-cfam.dtsi | 31 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 arch/arm/boot/dts/ibm-power8-cfam.dtsi diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index e6cfdf3c1a67..e264d817978c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -331,3 +331,13 @@ line-name = "BMC_TPM_INT_N"; }; }; + +/* Instantiate chip 0 */ +#define CFAM_CHIP_ID 0 +&fsi { + cfam@0,0 { + reg = <0 0>; + #include "ibm-power8-cfam.dtsi" + }; +}; +#undef CFAM_CHIP_ID diff --git a/arch/arm/boot/dts/ibm-power8-cfam.dtsi b/arch/arm/boot/dts/ibm-power8-cfam.dtsi new file mode 100644 index 000000000000..a07e9509d9bd --- /dev/null +++ b/arch/arm/boot/dts/ibm-power8-cfam.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2018 IBM Corp + +#define __MAKE_LABEL(p,i) p##i +#define _MAKE_LABEL(p,i) __MAKE_LABEL(p,i) +#define HUB_LABEL _MAKE_LABEL(fsi_hub,CFAM_CHIP_ID) +#define OCC_LABEL _MAKE_LABEL(fsi_occ,CFAM_CHIP_ID) +#define I2C_LABEL(n) _MAKE_LABEL(_MAKE_LABEL(cfam,CFAM_CHIP_ID),_i2c##n) + +#address-cells = <1>; +#size-cells = <1>; +chip-id = ; + +scom@1000 { + compatible = "ibm,fsi2pib"; + reg = <0x1000 0x400>; +}; + +HUB_LABEL: hub@3400 { + compatible = "ibm,fsi-master-hub"; + reg = <0x3400 0x400>; + #address-cells = <2>; + #size-cells = <0>; + no-scan-on-init; +}; + +#undef __MAKE_LABEL +#undef _MAKE_LABEL +#undef HUB_LABEL +#undef OCC_LABEL +#undef I2C_LABEL