From patchwork Mon Dec 19 12:26:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 34503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2356122wrn; Mon, 19 Dec 2022 04:28:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf6x8tvtLjnpY6bDEhCSmKuIWHMlUlOuZftLyyGVVERavXq7ikiqUW7mICJpoxqN/mf9rBX+ X-Received: by 2002:a17:906:698f:b0:7ad:d250:b903 with SMTP id i15-20020a170906698f00b007add250b903mr47207717ejr.56.1671452913829; Mon, 19 Dec 2022 04:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671452913; cv=none; d=google.com; s=arc-20160816; b=gVEeKqL6ae0V4PhFAr5pyT00OfChy9BH/jdq1OkROek+ips2HScFBwZKsXx+QNXUVR zjl5s+6gNiafwiIBjRPe2SWs5A8zq49fBsn6NPUEKd+d8iTMGavLc8DV+SUQUDzmFkfI dhlMN5BSzkQAi7aHL4Zs9Y08So0OyngmS+OpfAvo5tL6BNN37Aj41VC5leM58fJHriDc /e2nHsGDm7K93CcfyhHMGPZehr08vj94it92TFvxfemQFuH+dAUFobHx6OJdPu24KIRw SVxj/GdCwYe8QHb+NvdlIfOmS0Ghw8auql6fEAqpNxMhgn0uXl7uoVO6ik6XrTT692HV F+Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=viM65xn2s8qiJ+iIOPDsExjr/4c3dtuR0S5EVimI5Gg=; b=YMU/+04NtgKn6D23uqRpqEaS9/V0AmDmLU6KJ551tzABVoyttKnCRlkYO/CEkQVFRI ZuxyVDa6nAJDNN1s0vt8kckrhWqZzN6h1un65svugT+lXd6wMl08UeMy7O73UhTJ+UAB 0xfAWnhzREn/G2sxQ5jhBJ5Ba8Idmsra+aRUPJHNgzDy718SrYnzh+DuAy2H3n+WQbVn 0G+QSCLWo8VxN2R4725jhfATmJnsCrCZTYzor5GcBdM4IOFr4375/NR7iluTFiie02x0 VVwLDdxHp88ljrrujOYwSZRJ5kPFh6RTNkqS8FWAWZebh16w3lvxMuvPXbmFyJpXi7pM 57Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UfJmYLau; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds1-20020a0564021cc100b00479dd91ecdesi2397057edb.96.2022.12.19.04.28.10; Mon, 19 Dec 2022 04:28:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UfJmYLau; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231942AbiLSM0l (ORCPT + 99 others); Mon, 19 Dec 2022 07:26:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbiLSM02 (ORCPT ); Mon, 19 Dec 2022 07:26:28 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C40DFA7; Mon, 19 Dec 2022 04:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671452787; x=1702988787; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F2kaFIJwpZLRN2gttdbsTFc1z4ASTxYvGJRufqUmT/s=; b=UfJmYLauj5+pRjEseC1JS/u3ajecrG8kehuEEmr+5+iY9YGIIqLGmIsC LotjF+fQFTVGuM4gZVouyuysd2ekXsM/m9NEf4cX6z22ceOwcvSxJmNuI QEOatHjeVpleIyhcaW/2gnSl4WzlkW/LeBPEEJFJsKa/84pz9S6RiGzaw uB5YKveHtEt9r02pJlwgmMLLnuI/hoYRDBxje65Q/EvoxGj5maGH3z+tB S2X15WckZsUd7uh5/MxUawocFok1XggQyHmaqRhQBFKso5XLbQO7PiynX wv3SSFf24SzHitagvxNlwIlB9vl5HmGe3H+JuD5YwxdT8amRZXPinnc5f w==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="302762240" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="302762240" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:26:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="824831629" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="824831629" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 19 Dec 2022 04:26:24 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id BD3421C3; Mon, 19 Dec 2022 14:26:54 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Andy Shevchenko , Linus Walleij Subject: [PATCH v1 04/17] pinctrl: cannonlake: Replace CNL_COMMUNITY() by INTEL_COMMUNITY_GPPS() Date: Mon, 19 Dec 2022 14:26:30 +0200 Message-Id: <20221219122643.3513-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221219122643.3513-1-andriy.shevchenko@linux.intel.com> References: <20221219122643.3513-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752645410892838364?= X-GMAIL-MSGID: =?utf-8?q?1752645410892838364?= Use INTEL_COMMUNITY_GPPS() common macro instead custom CNL_COMMUNITY(). Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-cannonlake.c | 31 ++++++++-------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c index f8a8b9b14de9..88142ec57b25 100644 --- a/drivers/pinctrl/intel/pinctrl-cannonlake.c +++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c @@ -15,12 +15,17 @@ #include "pinctrl-intel.h" -#define CNL_PAD_OWN 0x020 -#define CNL_PADCFGLOCK 0x080 +#define CNL_LP_PAD_OWN 0x020 +#define CNL_LP_PADCFGLOCK 0x080 #define CNL_LP_HOSTSW_OWN 0x0b0 +#define CNL_LP_GPI_IS 0x100 +#define CNL_LP_GPI_IE 0x120 + +#define CNL_H_PAD_OWN 0x020 +#define CNL_H_PADCFGLOCK 0x080 #define CNL_H_HOSTSW_OWN 0x0c0 -#define CNL_GPI_IS 0x100 -#define CNL_GPI_IE 0x120 +#define CNL_H_GPI_IS 0x100 +#define CNL_H_GPI_IE 0x120 #define CNL_GPP(r, s, e, g) \ { \ @@ -30,25 +35,11 @@ .gpio_base = (g), \ } -#define CNL_COMMUNITY(b, s, e, g, v) \ - { \ - .barno = (b), \ - .padown_offset = CNL_PAD_OWN, \ - .padcfglock_offset = CNL_PADCFGLOCK, \ - .hostown_offset = CNL_##v##_HOSTSW_OWN, \ - .is_offset = CNL_GPI_IS, \ - .ie_offset = CNL_GPI_IE, \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ - .gpps = (g), \ - .ngpps = ARRAY_SIZE(g), \ - } - #define CNL_LP_COMMUNITY(b, s, e, g) \ - CNL_COMMUNITY(b, s, e, g, LP) + INTEL_COMMUNITY_GPPS(b, s, e, g, CNL_LP) #define CNL_H_COMMUNITY(b, s, e, g) \ - CNL_COMMUNITY(b, s, e, g, H) + INTEL_COMMUNITY_GPPS(b, s, e, g, CNL_H) /* Cannon Lake-H */ static const struct pinctrl_pin_desc cnlh_pins[] = {