From patchwork Thu Jan 18 21:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125048 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp297608lja; Thu, 18 Jan 2018 13:07:28 -0800 (PST) X-Google-Smtp-Source: ACJfBotG4suX6UxBH5GbaCKZFWB6+SVKKZV7iwIaqSPDFYIS8hYcfLiWg4H+SESVqpJThN7c9fBW X-Received: by 10.101.96.78 with SMTP id b14mr10991966pgv.339.1516309647911; Thu, 18 Jan 2018 13:07:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309647; cv=none; d=google.com; s=arc-20160816; b=PLBX6Cz4TMDVs6fAdUjB9S4oAYgAknug03uuQ+5O4drslgOMHvs2YYn/W1vwGz1ymR u+iDjE6qEpzha6A7XgtTXCrrJjN2TQuDX9DaP5daQO+qUP8aLWgTppl+ZFsjprqljBhd Xl1xT8v/EG4tjOM5EnYnkW9Xn4WfNTalXfNCMKCAkT1fnfrph/nw04oIjxlcFSJhBaz1 fyYdgY9X4fw+wnDRqC29tcrjZhHdcvTWQJUVCtKhg3+Tb3I1lYIkOL55S++rxWN+6Wit FxhZpp3dayWKUKnDR2GxD3h+m7Oo+3snfZmZ//KCF3aEOyjt9kX8c6fX/sqpiuL0PXPi //7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=st5T845IBEh+xWKFnc0+uIA3Q3xos0NBc7iwgjBegqM=; b=QdaxYVzZ2R9czcp0rz1ydY2WsaRv2V6FWk/hpInl1MxhnfzRAbefsYwiqsvPO1o6Ks zuafovgKKP04LylmS3RltBsKXWMoV/Oxl0QwZUeYCHihc306QaNFq7GxXYRmKoiQhP1L qt0fzEjLm1m9g/xLUnCfxzMbtSK1fbBvURAFTEjhH5DlqVzKNr+Y/EDSMb1O3sKY0sUF 0Miquaa+jyl6wAVbClYoZyroByGZZ+Ycdkgij4BoDjcLoqust4hdNvvainbC2jYCcGre +5VrWtKyztlAprtGBJ7wxjwEaLz2Tmxn3TSW3yu3LhVHmVFST8y38mEQnyCcAFrh8ixR S40g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=CC2zmQK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p1si6869097pgs.755.2018.01.18.13.07.27; Thu, 18 Jan 2018 13:07:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=CC2zmQK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932749AbeARVH0 (ORCPT + 10 others); Thu, 18 Jan 2018 16:07:26 -0500 Received: from mail-by2nam03on0122.outbound.protection.outlook.com ([104.47.42.122]:29968 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932706AbeARVHN (ORCPT ); Thu, 18 Jan 2018 16:07:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=st5T845IBEh+xWKFnc0+uIA3Q3xos0NBc7iwgjBegqM=; b=CC2zmQK5JTcl2pI8OauunreWlhaM1x+2EPi5d6Nb++JTcxynAwGPBVxMtO8P7zCnzX18CpsB5TGu2YaEVaIeJxHM5QcQIS32rwVcS260fRc1q/S166ySdJ72Kavq5ozvJnEv/FvVtBkQMM9gZhZdTA6WU6HiPsezcRYOA8cEjH0= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.5; Thu, 18 Jan 2018 21:07:03 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:07:03 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Linus Walleij , Sasha Levin Subject: [added to the 4.1 stable tree] pinctrl: adi2: Fix Kconfig build problem Thread-Topic: [added to the 4.1 stable tree] pinctrl: adi2: Fix Kconfig build problem Thread-Index: AQHTkJ+Rz0evtthI80qZa5ttOcdirQ== Date: Thu, 18 Jan 2018 21:01:54 +0000 Message-ID: <20180118205908.3220-280-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.60.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1014; 6:OoN0w2lShPGFq5LeyaAzdj9UBfj35qlnLmOYx6TNMhY80ebU1Hi+4XWuesVPBs+xBRMACFHzyRf+SfxnKOzKcITFLDqOAV3+fz7g/CVUAR2dyPZT7OEs3IwxrUwNROP2MoXj346UDguMCBq9fnb7uva9jumsiZ+qStuUoRaWJwRuM80XNWTTX0CKBX89+anymY0OnqnLogODXH7apvWAGz+4KC6+7145l91UxRlbTiP2GnNnxzSH26vdjV7CKU15vAT6OVcRqOUjK0J5lyjvYsC4lNaHrTJQWyLcxYptzobPBvj9zVdbrqP3GoNsILf+Fh/AB8fNMq8efHmG2Yekuf4kpwJspdTI2oft3X0QsoNURDqGmxDFCGz+RFfFEJPr; 5:r3/yizXtH5aYZAG0M3Fh99Glzrxv4PRegAUXZbJXbPPkGd6sLoBl6RqomDMi+3K55pFQUmFhA2mr2l4xUkVZ/Am70Ttklxklw2UGMec4zWpr8cxR/iyGk3S0jnZe0NPHQ+GiUmmKW6SACm55n5BoezXJ4+I8gsxQwgSaLsGPjoo=; 24:yErMpyXOY+qOYRCTI8GbKjOlpANZPB2BWX/r6P7jJL9J6hLWnO8V74+uVRp/B5NwZ4VtGB9GBtjvun5V+vGNDG8Oo3KinVrNifkU712wBcc=; 7:nJt+IHm8qw6SfaKH7gkVibQIvoMwd4a/XUnGc29JpyYGw/9WL5KW2fsdA/ZVOfg2fY3vS42suDUZsQCy2CmggHJD7vdqXOGODVW5LvBB6pDFeflwGRMyATEyJjspLLndlyf1r1jpBUA2+5jo7SJKa5HRlyS73m3ExxwVIk7GaLUy1ugXFwaSjh/wGlr+Kqp/DNaEVzbQDk3naoxoPu0DwpibcQVl8BKn8R+wy3UzlWSgnjhCErI4soAESZEPajOE x-ms-office365-filtering-correlation-id: 3d69231e-7abf-4b9e-8af6-08d55eb76c60 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(232431446821674)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231046)(2400067)(944501161)(6055026)(61426038)(61427038)(6041282)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB1014; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(376002)(346002)(366004)(396003)(189003)(199004)(22452003)(5660300001)(575784001)(2501003)(6116002)(1076002)(2906002)(14454004)(3846002)(86362001)(86612001)(6436002)(6486002)(10090500001)(105586002)(106356001)(99286004)(110136005)(72206003)(54906003)(316002)(10290500003)(478600001)(36756003)(2950100002)(6666003)(3280700002)(305945005)(6506007)(7736002)(25786009)(5250100002)(66066001)(26005)(6346003)(2900100001)(97736004)(68736007)(4326008)(53936002)(76176011)(102836004)(8936002)(107886003)(3660700001)(8676002)(81166006)(81156014)(6512007)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: +BPoh9BVnENLSoLdEbP3W9+eACzzFukIE1CwpdKlLcL6zNiDRjGRN5oDBHAaF76NMIwb2H+pHqS0EBbBml2P0Q== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d69231e-7abf-4b9e-8af6-08d55eb76c60 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:01:54.4143 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 1c363531dd814dc4fe10865722bf6b0f72ce4673 ] The build robot is complaining on Blackfin: drivers/pinctrl/pinctrl-adi2.c: In function 'port_setup': >> drivers/pinctrl/pinctrl-adi2.c:221:21: error: dereferencing pointer to incomplete type 'struct gpio_port_t' writew(readw(®s->port_fer) & ~BIT(offset), ^~ drivers/pinctrl/pinctrl-adi2.c: In function 'adi_gpio_ack_irq': >> drivers/pinctrl/pinctrl-adi2.c:266:18: error: dereferencing pointer to incomplete type 'struct bfin_pint_regs' if (readl(®s->invert_set) & pintbit) ^~ It seems the driver need to include and to compile. The Blackfin architecture was re-defining the Kconfig PINCTRL symbol which is not OK, so replaced this with PINCTRL_BLACKFIN_ADI2 which selects PINCTRL and PINCTRL_ADI2 just like most arches do. Further, the old GPIO driver symbol GPIO_ADI was possible to select at the same time as selecting PINCTRL. This was not working because the arch-local header contains an explicit #ifndef PINCTRL clause making compilation break if you combine them. The same is true for DEBUG_MMRS. Make sure the ADI2 pinctrl driver is not selected at the same time as the old GPIO implementation. (This should be converted to use gpiolib or pincontrol and move to drivers/...) Also make sure the old GPIO_ADI driver or DEBUG_MMRS is not selected at the same time as the new PINCTRL implementation, and only make PINCTRL_ADI2 selectable for the Blackfin families that actually have it. This way it is still possible to add e.g. I2C-based pin control expanders on the Blackfin. Cc: Steven Miao Cc: Huanhuan Feng Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/blackfin/Kconfig | 7 +++++-- arch/blackfin/Kconfig.debug | 1 + drivers/pinctrl/Kconfig | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index af76634f8d98..934573cc1134 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -318,11 +318,14 @@ config BF53x config GPIO_ADI def_bool y + depends on !PINCTRL depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561) -config PINCTRL +config PINCTRL_BLACKFIN_ADI2 def_bool y - depends on BF54x || BF60x + depends on (BF54x || BF60x) + select PINCTRL + select PINCTRL_ADI2 config MEM_MT48LC64M4A2FB_7E bool diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug index f3337ee03621..a93cf06a4d6f 100644 --- a/arch/blackfin/Kconfig.debug +++ b/arch/blackfin/Kconfig.debug @@ -17,6 +17,7 @@ config DEBUG_VERBOSE config DEBUG_MMRS tristate "Generate Blackfin MMR tree" + depends on !PINCTRL select DEBUG_FS help Create a tree of Blackfin MMRs via the debugfs tree. If diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index aeb5729fbda6..029ff74ec53c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -28,7 +28,8 @@ config DEBUG_PINCTRL config PINCTRL_ADI2 bool "ADI pin controller driver" - depends on BLACKFIN + depends on (BF54x || BF60x) + depends on !GPIO_ADI select PINMUX select IRQ_DOMAIN help