From patchwork Fri Apr 3 04:39:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dinguyen@opensource.altera.com X-Patchwork-Id: 6153511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 025069F350 for ; Fri, 3 Apr 2015 04:50:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E627203B0 for ; Fri, 3 Apr 2015 04:50:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9A9E203AA for ; Fri, 3 Apr 2015 04:50:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdtVc-0001ON-Rs; Fri, 03 Apr 2015 04:47:08 +0000 Received: from mail-bl2on0094.outbound.protection.outlook.com ([65.55.169.94] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdtUs-0000qx-NT for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 04:46:24 +0000 Received: from BN3PR0301CA0008.namprd03.prod.outlook.com (25.160.180.146) by SN2PR03MB014.namprd03.prod.outlook.com (10.255.175.36) with Microsoft SMTP Server (TLS) id 15.1.136.17; Fri, 3 Apr 2015 04:45:52 +0000 Received: from BN1AFFO11FD031.protection.gbl (2a01:111:f400:7c10::123) by BN3PR0301CA0008.outlook.office365.com (2a01:111:e400:4000::18) with Microsoft SMTP Server (TLS) id 15.1.130.23 via Frontend Transport; Fri, 3 Apr 2015 04:45:51 +0000 Authentication-Results: spf=fail (sender IP is 66.35.236.227) smtp.mailfrom=opensource.altera.com; arm.linux.org.uk; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of opensource.altera.com does not designate 66.35.236.227 as permitted sender) receiver=protection.outlook.com; client-ip=66.35.236.227; helo=sj-itexedge03.altera.priv.altera.com; Received: from sj-itexedge03.altera.priv.altera.com (66.35.236.227) by BN1AFFO11FD031.mail.protection.outlook.com (10.58.52.185) with Microsoft SMTP Server (TLS) id 15.1.136.16 via Frontend Transport; Fri, 3 Apr 2015 04:45:51 +0000 Received: from na01-bl2-obe.outbound.protection.outlook.com (207.46.163.206) by webmail.altera.com (66.35.236.227) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 2 Apr 2015 21:43:57 -0700 Received: from linux-builds1.altera.com (64.129.157.38) by BN3PR03MB1368.namprd03.prod.outlook.com (25.163.34.154) with Microsoft SMTP Server (TLS) id 15.1.118.21; Fri, 3 Apr 2015 04:45:31 +0000 From: To: , , , , , , , , Subject: [PATCH 4/7] ARM: socfpga: rename socdk board file to socdk_sdmmc Date: Thu, 2 Apr 2015 23:39:55 -0500 Message-ID: <1428035998-27542-5-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1428035998-27542-1-git-send-email-dinguyen@opensource.altera.com> References: <1428035998-27542-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR01CA021.prod.exchangelabs.com (25.160.23.11) To BN3PR03MB1368.namprd03.prod.outlook.com (25.163.34.154) Authentication-Results: arm.linux.org.uk; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1368; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:SN2PR03MB014; X-Forefront-Antispam-Report-Untrusted: BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(19580405001)(122386002)(87976001)(19580395003)(229853001)(86152002)(40100003)(15975445007)(62966003)(2201001)(48376002)(77156002)(86362001)(2950100001)(92566002)(33646002)(46102003)(66066001)(47776003)(42186005)(50466002)(50986999)(53416004)(76176999)(50226001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB1368; H:linux-builds1.altera.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002010)(5005006); SRVR:BN3PR03MB1368; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1368; BCL:0; PCL:0; RULEID:(601004)(5005006)(5002010); SRVR:SN2PR03MB014; BCL:0; PCL:0; RULEID:; SRVR:SN2PR03MB014; X-Forefront-PRVS: 05352A48BE X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1368 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN1AFFO11FD031.protection.gbl X-Forefront-Antispam-Report: CIP:66.35.236.227; CTRY:US; IPV:NLI; EFV:NLI; BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(53416004)(86152002)(48376002)(40100003)(50226001)(87936001)(66066001)(76176999)(64706001)(2201001)(85426001)(122386002)(229853001)(50466002)(2950100001)(33646002)(86362001)(15975445007)(47776003)(46102003)(92566002)(77156002)(106466001)(19580405001)(62966003)(105606002)(50986999)(6806004)(16796002)(19580395003)(7099025)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB014; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:0; PTR:InfoDomainNonexistent; LANG:en; X-Forefront-PRVS: 05352A48BE X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2015 04:45:51.3198 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a; Ip=[66.35.236.227]; Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB014 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150402_214622_981970_138EF60C X-CRM114-Status: GOOD ( 10.97 ) X-Spam-Score: -0.0 (/) Cc: devicetree@vger.kernel.org, Dinh Nguyen , dinh.linux@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dinh Nguyen Rename the socfpga_arria10_socdk board file to socfpga_arria10_socdk_sdmmc as Arria 10 devkit cannot support SDMMC and QSPI at the same time. Thus we will need to have 2 separate board files, one for SDMMC and one for QSPI. We also add a new base board dtsi file, socfpga_arria10_socdk.dtsi so that we use common peripherals for each flavor of the devkits. Add the sdmmc node to the socfpga_arria10_socdk_sdmmc.dts board file. Signed-off-by: Dinh Nguyen --- arch/arm/boot/dts/Makefile | 2 +- ...rria10_socdk.dts => socfpga_arria10_socdk.dtsi} | 4 +--- arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 26 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) rename arch/arm/boot/dts/{socfpga_arria10_socdk.dts => socfpga_arria10_socdk.dtsi} (94%) mode change 100755 => 100644 create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a1c776b..e50441a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -485,7 +485,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ r8a7794-alt.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ - socfpga_arria10_socdk.dtb \ + socfpga_arria10_socdk_sdmmc.dtb \ socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_socrates.dtb \ diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dts b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi old mode 100755 new mode 100644 similarity index 94% rename from arch/arm/boot/dts/socfpga_arria10_socdk.dts rename to arch/arm/boot/dts/socfpga_arria10_socdk.dtsi index addec61..2791f09 --- a/arch/arm/boot/dts/socfpga_arria10_socdk.dts +++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Altera Corporation + * Copyright (C) 2015 Altera Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -/dts-v1/; #include "socfpga_arria10.dtsi" / { diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts b/arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts new file mode 100644 index 0000000..dbbb751 --- /dev/null +++ b/arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2014-2015 Altera Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/dts-v1/; +#include "socfpga_arria10_socdk.dtsi" + +&mmc { + status = "okay"; + num-slots = <1>; + broken-cd; + bus-width = <4>; +};