From patchwork Mon Apr 20 18:50:25 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: 6243971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3CAD2BF4A6 for ; Mon, 20 Apr 2015 19:00:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3239B203AB for ; Mon, 20 Apr 2015 18:59:59 +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 2295F2034B for ; Mon, 20 Apr 2015 18:59:58 +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 1YkGsu-0000jm-SK; Mon, 20 Apr 2015 18:57:32 +0000 Received: from mail-by2on0088.outbound.protection.outlook.com ([207.46.100.88] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkGrp-0008VS-Om for linux-arm-kernel@lists.infradead.org; Mon, 20 Apr 2015 18:56:27 +0000 Received: from DM2PR03CA0006.namprd03.prod.outlook.com (10.141.96.16) by BY2PR0301MB0662.namprd03.prod.outlook.com (0.160.63.142) with Microsoft SMTP Server (TLS) id 15.1.136.25; Mon, 20 Apr 2015 18:55:57 +0000 Received: from BL2FFO11FD050.protection.gbl (2a01:111:f400:7c09::117) by DM2PR03CA0006.outlook.office365.com (2a01:111:e400:2428::16) with Microsoft SMTP Server (TLS) id 15.1.136.25 via Frontend Transport; Mon, 20 Apr 2015 18:55:57 +0000 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; lixom.net; 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.236 as permitted sender) receiver=protection.outlook.com; client-ip=66.35.236.236; helo=sj-itexedge04.altera.priv.altera.com; Received: from sj-itexedge04.altera.priv.altera.com (66.35.236.236) by BL2FFO11FD050.mail.protection.outlook.com (10.173.161.212) with Microsoft SMTP Server (TLS) id 15.1.148.11 via Frontend Transport; Mon, 20 Apr 2015 18:55:56 +0000 Received: from na01-bn1-obe.outbound.protection.outlook.com (207.46.163.184) by webmail.altera.com (66.35.236.236) with Microsoft SMTP Server (TLS) id 14.3.174.1; Mon, 20 Apr 2015 11:55:19 -0700 Received: from BY1PR03MB1370.namprd03.prod.outlook.com (0.162.109.28) by BY1PR03MB1355.namprd03.prod.outlook.com (0.162.109.25) with Microsoft SMTP Server (TLS) id 15.1.136.25; Mon, 20 Apr 2015 18:55:51 +0000 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from linux-builds1.altera.com (64.129.157.38) by BY1PR03MB1370.namprd03.prod.outlook.com (0.162.109.28) with Microsoft SMTP Server (TLS) id 15.1.148.15; Mon, 20 Apr 2015 18:55:50 +0000 From: To: , , , , Subject: [PATCHv2 4/4] ARM: socfpga: rename socdk board file to socdk_sdmmc Date: Mon, 20 Apr 2015 13:50:25 -0500 Message-ID: <1429555825-23560-5-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1429555825-23560-1-git-send-email-dinguyen@opensource.altera.com> References: <1429555825-23560-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BY2PR06CA035.namprd06.prod.outlook.com (10.141.250.153) To BY1PR03MB1370.namprd03.prod.outlook.com (25.162.109.28) X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1370; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1355; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0662; X-Forefront-Antispam-Report-Untrusted: BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(2201001)(86152002)(33646002)(62966003)(77156002)(50466002)(50226001)(48376002)(87976001)(5001770100001)(19580395003)(19580405001)(40100003)(86362001)(53416004)(46102003)(229853001)(47776003)(92566002)(2950100001)(15975445007)(42186005)(76176999)(50986999)(66066001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR03MB1370; 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:BY1PR03MB1370; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1370; BCL:0; PCL:0; RULEID:(601004)(5005006)(5002010); SRVR:BY2PR0301MB0662; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0662; X-Forefront-PRVS: 05529C6FDB X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1370 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BL2FFO11FD050.protection.gbl X-Forefront-Antispam-Report: CIP:66.35.236.236; CTRY:US; IPV:NLI; EFV:NLI; BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(33646002)(122386002)(2201001)(106466001)(105606002)(2950100001)(50986999)(5001770100001)(76176999)(229853001)(50466002)(48376002)(92566002)(62966003)(87936001)(77156002)(50226001)(6806004)(86362001)(85426001)(66066001)(86152002)(19580405001)(19580395003)(40100003)(15975445007)(53416004)(47776003)(46102003)(81156007)(7099027)(2004002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0662; H:sj-itexedge04.altera.priv.altera.com; FPR:; SPF:Fail; MLV:ovrnspm; A:0; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Forefront-PRVS: 05529C6FDB X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2015 18:55:56.7350 (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.236]; Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0662 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150420_115625_873086_B5FD6E19 X-CRM114-Status: GOOD ( 11.76 ) X-Spam-Score: 1.0 (+) Cc: devicetree@vger.kernel.org, dinh.linux@gmail.com, arnd@arndb.de, linux-kernel@vger.kernel.org, olof@lixom.net, Dinh Nguyen , 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=-2.9 required=5.0 tests=BAYES_00,RCVD_ILLEGAL_IP, 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 +- arch/arm/boot/dts/socfpga_arria10_socdk.dts | 48 ----------------------- arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 46 ++++++++++++++++++++++ arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 26 ++++++++++++ 4 files changed, 73 insertions(+), 49 deletions(-) delete mode 100755 arch/arm/boot/dts/socfpga_arria10_socdk.dts create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi 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.dts deleted file mode 100755 index 811a61c..0000000 --- a/arch/arm/boot/dts/socfpga_arria10_socdk.dts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2014 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.dtsi" - -/ { - model = "Altera SOCFPGA Arria 10"; - compatible = "altr,socfpga-arria10", "altr,socfpga"; - - chosen { - bootargs = "console=ttyS0,115200 rootwait"; - }; - - memory { - name = "memory"; - device_type = "memory"; - reg = <0x0 0x40000000>; /* 1GB */ - }; - - soc { - clkmgr@ffd04000 { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; - }; -}; - -&uart1 { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi new file mode 100644 index 0000000..347ca4e --- /dev/null +++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi @@ -0,0 +1,46 @@ +/* + * 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 + * 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 . + */ +#include "socfpga_arria10.dtsi" + +/ { + model = "Altera SOCFPGA Arria 10"; + compatible = "altr,socfpga-arria10", "altr,socfpga"; + + chosen { + bootargs = "console=ttyS0,115200 rootwait"; + }; + + memory { + name = "memory"; + device_type = "memory"; + reg = <0x0 0x40000000>; /* 1GB */ + }; + + soc { + clkmgr@ffd04000 { + clocks { + osc1 { + clock-frequency = <25000000>; + }; + }; + }; + }; +}; + +&uart1 { + status = "okay"; +}; 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>; +};