From patchwork Tue Nov 4 15:03:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 5228481 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E82F1C11AC for ; Tue, 4 Nov 2014 15:07:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19F5C20122 for ; Tue, 4 Nov 2014 15:07:00 +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 EAC362010E for ; Tue, 4 Nov 2014 15:06: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 1Xlfeq-0007JM-61; Tue, 04 Nov 2014 15:04:32 +0000 Received: from mail-bn1bon0131.outbound.protection.outlook.com ([157.56.111.131] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xlfed-0006n0-7G for linux-arm-kernel@lists.infradead.org; Tue, 04 Nov 2014 15:04:20 +0000 Received: from BLUPR03MB246.namprd03.prod.outlook.com (10.255.213.18) by BLUPR03MB166.namprd03.prod.outlook.com (10.255.212.142) with Microsoft SMTP Server (TLS) id 15.1.11.14; Tue, 4 Nov 2014 15:03:57 +0000 Received: from BN3PR0301CA0082.namprd03.prod.outlook.com (25.160.152.178) by BLUPR03MB246.namprd03.prod.outlook.com (10.255.213.18) with Microsoft SMTP Server (TLS) id 15.1.11.14; Tue, 4 Nov 2014 15:03:55 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::188) by BN3PR0301CA0082.outlook.office365.com (2a01:111:e400:401e::50) with Microsoft SMTP Server (TLS) id 15.1.11.14 via Frontend Transport; Tue, 4 Nov 2014 15:03:55 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) with Microsoft SMTP Server (TLS) id 15.1.6.13 via Frontend Transport; Tue, 4 Nov 2014 15:03:55 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.77]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id sA4F3p2g005952; Tue, 4 Nov 2014 08:03:52 -0700 From: Fabio Estevam To: Subject: [PATCH v3] ARM: imx: Fix the removal of CONFIG_SPI option Date: Tue, 4 Nov 2014 13:03:32 -0200 Message-ID: <1415113412-6782-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(106466001)(97736003)(23676002)(4396001)(95666004)(102836001)(21056001)(62966003)(31966008)(64706001)(105606002)(229853001)(20776003)(47776003)(50226001)(2351001)(36756003)(107046002)(81156004)(77156002)(33646002)(92726001)(92566001)(99396003)(46102003)(50466002)(110136001)(89996001)(26826002)(87936001)(87286001)(88136002)(19580405001)(104016003)(120916001)(86362001)(6806004)(575784001)(68736004)(44976005)(50986999)(104166001)(19580395003)(84676001)(93916002)(69596002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB246; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB246; X-Exchange-Antispam-Report-Test: UriScan:; X-Forefront-PRVS: 03853D523D Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Fabio.Estevam@freescale.com; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB166; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141104_070419_449512_0B4855A9 X-CRM114-Status: UNSURE ( 7.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org, u.kleine-koenig@pengutronix.de 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig. The reason for savedefconfig dropping CONFIG_SPI=y is well explained by Uwe Kleine-König: "on top of 64546e9fe3a5b8c doing make imx_v6_v7_defconfig resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects SPI and has default y. So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0 ([media] Kconfig: do not select SPI bus on sub-driver auto-select)." In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back. Signed-off-by: Fabio Estevam --- Changes since v2: - Add an explanation as to why savedefconfig dropped CONFIG_SPI Changes since v1: - Add commit id's that caused the issue. Shawn, If possible, please apply this as a bug fix for 3.18. arch/arm/configs/imx_v4_v5_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index e688741..e6b0007 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C_CHARDEV=y CONFIG_I2C_IMX=y +CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 8fca6e2..6790f1b 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_IMX=y +CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MC9S08DZ60=y