From patchwork Thu Oct 4 15:33:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 979001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Qxk43gnMz9s7W for ; Fri, 5 Oct 2018 01:33:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727505AbeJDW1S (ORCPT ); Thu, 4 Oct 2018 18:27:18 -0400 Received: from mga04.intel.com ([192.55.52.120]:33807 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727472AbeJDW1R (ORCPT ); Thu, 4 Oct 2018 18:27:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Oct 2018 08:33:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,340,1534834800"; d="scan'208";a="85749572" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 04 Oct 2018 08:33:22 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 89F5D1FF; Thu, 4 Oct 2018 18:33:21 +0300 (EEST) From: Andy Shevchenko To: Linus Walleij , linux-gpio@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 1/4] pinctrl: geminilake: Update pin list for B0 stepping Date: Thu, 4 Oct 2018 18:33:18 +0300 Message-Id: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org According to an updated pin list few names of the pins can be spelled better, taking into account their primary functions. Thus, update a pin list to cover B0 stepping. Note, SPI numbering had been fixed even in A0 public documentation. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-geminilake.c | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c index 55c87d95207a..105881e5c042 100644 --- a/drivers/pinctrl/intel/pinctrl-geminilake.c +++ b/drivers/pinctrl/intel/pinctrl-geminilake.c @@ -58,16 +58,16 @@ static const struct pinctrl_pin_desc glk_northwest_pins[] = { PINCTRL_PIN(23, "GPIO_23"), PINCTRL_PIN(24, "GPIO_24"), PINCTRL_PIN(25, "GPIO_25"), - PINCTRL_PIN(26, "GPIO_26"), - PINCTRL_PIN(27, "GPIO_27"), - PINCTRL_PIN(28, "GPIO_28"), - PINCTRL_PIN(29, "GPIO_29"), - PINCTRL_PIN(30, "GPIO_30"), - PINCTRL_PIN(31, "GPIO_31"), - PINCTRL_PIN(32, "GPIO_32"), - PINCTRL_PIN(33, "GPIO_33"), - PINCTRL_PIN(34, "GPIO_34"), - PINCTRL_PIN(35, "GPIO_35"), + PINCTRL_PIN(26, "ISH_GPIO_0"), + PINCTRL_PIN(27, "ISH_GPIO_1"), + PINCTRL_PIN(28, "ISH_GPIO_2"), + PINCTRL_PIN(29, "ISH_GPIO_3"), + PINCTRL_PIN(30, "ISH_GPIO_4"), + PINCTRL_PIN(31, "ISH_GPIO_5"), + PINCTRL_PIN(32, "ISH_GPIO_6"), + PINCTRL_PIN(33, "ISH_GPIO_7"), + PINCTRL_PIN(34, "ISH_GPIO_8"), + PINCTRL_PIN(35, "ISH_GPIO_9"), PINCTRL_PIN(36, "GPIO_36"), PINCTRL_PIN(37, "GPIO_37"), PINCTRL_PIN(38, "GPIO_38"), @@ -195,12 +195,12 @@ static const struct pinctrl_pin_desc glk_north_pins[] = { PINCTRL_PIN(5, "LPSS_SPI_0_FS1"), PINCTRL_PIN(6, "LPSS_SPI_0_RXD"), PINCTRL_PIN(7, "LPSS_SPI_0_TXD"), - PINCTRL_PIN(8, "LPSS_SPI_1_CLK"), - PINCTRL_PIN(9, "LPSS_SPI_1_FS0"), - PINCTRL_PIN(10, "LPSS_SPI_1_FS1"), - PINCTRL_PIN(11, "LPSS_SPI_1_FS2"), - PINCTRL_PIN(12, "LPSS_SPI_1_RXD"), - PINCTRL_PIN(13, "LPSS_SPI_1_TXD"), + PINCTRL_PIN(8, "LPSS_SPI_2_CLK"), + PINCTRL_PIN(9, "LPSS_SPI_2_FS0"), + PINCTRL_PIN(10, "LPSS_SPI_2_FS1"), + PINCTRL_PIN(11, "LPSS_SPI_2_FS2"), + PINCTRL_PIN(12, "LPSS_SPI_2_RXD"), + PINCTRL_PIN(13, "LPSS_SPI_2_TXD"), PINCTRL_PIN(14, "FST_SPI_CS0_B"), PINCTRL_PIN(15, "FST_SPI_CS1_B"), PINCTRL_PIN(16, "FST_SPI_MOSI_IO0"), @@ -215,8 +215,8 @@ static const struct pinctrl_pin_desc glk_north_pins[] = { PINCTRL_PIN(25, "PMU_SLP_S3_B"), PINCTRL_PIN(26, "PMU_SLP_S4_B"), PINCTRL_PIN(27, "SUSPWRDNACK"), - PINCTRL_PIN(28, "EMMC_PWR_EN_B"), - PINCTRL_PIN(29, "PMU_AC_PRESENT"), + PINCTRL_PIN(28, "EMMC_DNX_PWR_EN_B"), + PINCTRL_PIN(29, "GPIO_105"), PINCTRL_PIN(30, "PMU_BATLOW_B"), PINCTRL_PIN(31, "PMU_RESETBUTTON_B"), PINCTRL_PIN(32, "PMU_SUSCLK"), From patchwork Thu Oct 4 15:33:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 978999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Qxjy2MVLz9s8J for ; Fri, 5 Oct 2018 01:33:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727432AbeJDW1L (ORCPT ); Thu, 4 Oct 2018 18:27:11 -0400 Received: from mga12.intel.com ([192.55.52.136]:5963 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727472AbeJDW1L (ORCPT ); Thu, 4 Oct 2018 18:27:11 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Oct 2018 08:33:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,340,1534834800"; d="scan'208";a="78480343" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 04 Oct 2018 08:33:22 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9949081; Thu, 4 Oct 2018 18:33:21 +0300 (EEST) From: Andy Shevchenko To: Linus Walleij , linux-gpio@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 2/4] pinctrl: geminilake: Add vGPIO pins Date: Thu, 4 Oct 2018 18:33:19 +0300 Message-Id: <20181004153321.34757-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> References: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Intel Gemini Lake provides vGPIO pins which are now missed from the list. Add them here. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-geminilake.c | 43 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c index 105881e5c042..189527bee47e 100644 --- a/drivers/pinctrl/intel/pinctrl-geminilake.c +++ b/drivers/pinctrl/intel/pinctrl-geminilake.c @@ -112,6 +112,37 @@ static const struct pinctrl_pin_desc glk_northwest_pins[] = { PINCTRL_PIN(77, "GPIO_212"), PINCTRL_PIN(78, "GPIO_213"), PINCTRL_PIN(79, "GPIO_214"), + PINCTRL_PIN(80, "vCNV_BTEN"), + PINCTRL_PIN(81, "vCNV_GNEN"), + PINCTRL_PIN(82, "vCNV_WFEN"), + PINCTRL_PIN(83, "vCNV_WCEN"), + PINCTRL_PIN(84, "vCNV_BT_HOST_WAKEB"), + PINCTRL_PIN(85, "vCNV_BT_IF_SELECT"), + PINCTRL_PIN(86, "vCNV_BT_UART_TXD"), + PINCTRL_PIN(87, "vCNV_BT_UART_RXD"), + PINCTRL_PIN(88, "vCNV_BT_UART_CTS_B"), + PINCTRL_PIN(89, "vCNV_BT_UART_RTS_B"), + PINCTRL_PIN(90, "vCNV_MFUART1_TXD"), + PINCTRL_PIN(91, "vCNV_MFUART1_RXD"), + PINCTRL_PIN(92, "vCNV_MFUART1_CTS_B"), + PINCTRL_PIN(93, "vCNV_MFUART1_RTS_B"), + PINCTRL_PIN(94, "vCNV_GNSS_UART_TXD"), + PINCTRL_PIN(95, "vCNV_GNSS_UART_RXD"), + PINCTRL_PIN(96, "vCNV_GNSS_UART_CTS_B"), + PINCTRL_PIN(97, "vCNV_GNSS_UART_RTS_B"), + PINCTRL_PIN(98, "vLPSS_UART0_TXD"), + PINCTRL_PIN(99, "vLPSS_UART0_RXD"), + PINCTRL_PIN(100, "vLPSS_UART0_CTS_B"), + PINCTRL_PIN(101, "vLPSS_UART0_RTS_B"), + PINCTRL_PIN(102, "vLPSS_UART1_TXD"), + PINCTRL_PIN(103, "vLPSS_UART1_RXD"), + PINCTRL_PIN(104, "vLPSS_UART1_CTS_B"), + PINCTRL_PIN(105, "vLPSS_UART1_RTS_B"), + PINCTRL_PIN(106, "vLPSS_UART2_TXD"), + PINCTRL_PIN(107, "vLPSS_UART2_RXD"), + PINCTRL_PIN(108, "vLPSS_UART2_CTS_B"), + PINCTRL_PIN(109, "vLPSS_UART2_RTS_B"), + PINCTRL_PIN(110, "vCNV_GNSS_HOST_WAKEB"), }; static const unsigned int glk_northwest_uart1_pins[] = { 26, 27, 28, 29 }; @@ -171,7 +202,7 @@ static const struct intel_function glk_northwest_functions[] = { }; static const struct intel_community glk_northwest_communities[] = { - GLK_COMMUNITY(0, 79), + GLK_COMMUNITY(0, 110), }; static const struct intel_pinctrl_soc_data glk_northwest_soc_data = { @@ -340,10 +371,18 @@ static const struct pinctrl_pin_desc glk_audio_pins[] = { PINCTRL_PIN(17, "AVS_M_DATA_1"), PINCTRL_PIN(18, "AVS_M_CLK_AB2"), PINCTRL_PIN(19, "AVS_M_DATA_2"), + PINCTRL_PIN(20, "vCNV_BT_I2S_BCLK"), + PINCTRL_PIN(21, "vCNV_BT_I2S_WS_SYNC"), + PINCTRL_PIN(22, "vCNV_BT_I2S_SDO"), + PINCTRL_PIN(23, "vCNV_BT_I2S_SDI"), + PINCTRL_PIN(24, "vAVS_I2S0_BCLK"), + PINCTRL_PIN(25, "vAVS_I2S0_WS_SYNC"), + PINCTRL_PIN(26, "vAVS_I2S0_SDO"), + PINCTRL_PIN(27, "vAVS_I2S0_SDI"), }; static const struct intel_community glk_audio_communities[] = { - GLK_COMMUNITY(0, 19), + GLK_COMMUNITY(0, 27), }; static const struct intel_pinctrl_soc_data glk_audio_soc_data = { From patchwork Thu Oct 4 15:33:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 979003 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42QxkV2Stsz9s7W for ; Fri, 5 Oct 2018 01:33:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727526AbeJDW1k (ORCPT ); Thu, 4 Oct 2018 18:27:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:14274 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727472AbeJDW1k (ORCPT ); Thu, 4 Oct 2018 18:27:40 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Oct 2018 08:33:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,340,1534834800"; d="scan'208";a="97418570" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 04 Oct 2018 08:33:22 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id A7A27339; Thu, 4 Oct 2018 18:33:21 +0300 (EEST) From: Andy Shevchenko To: Linus Walleij , linux-gpio@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 3/4] pinctrl: geminilake: Get rid of unneeded ->probe() stub Date: Thu, 4 Oct 2018 18:33:20 +0300 Message-Id: <20181004153321.34757-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> References: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The local ->probe() stub does nothing except calling a generic Intel pin control probe function. Thus, it's not needed and generic function may be called directly. This patch converts the driver accordingly. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-geminilake.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c index 189527bee47e..84e7c00371be 100644 --- a/drivers/pinctrl/intel/pinctrl-geminilake.c +++ b/drivers/pinctrl/intel/pinctrl-geminilake.c @@ -493,15 +493,10 @@ static const struct acpi_device_id glk_pinctrl_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, glk_pinctrl_acpi_match); -static int glk_pinctrl_probe(struct platform_device *pdev) -{ - return intel_pinctrl_probe_by_uid(pdev); -} - static INTEL_PINCTRL_PM_OPS(glk_pinctrl_pm_ops); static struct platform_driver glk_pinctrl_driver = { - .probe = glk_pinctrl_probe, + .probe = intel_pinctrl_probe_by_uid, .driver = { .name = "geminilake-pinctrl", .acpi_match_table = glk_pinctrl_acpi_match, From patchwork Thu Oct 4 15:33:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 978998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Qxjx1GGmz9s7W for ; Fri, 5 Oct 2018 01:33:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727484AbeJDW1L (ORCPT ); Thu, 4 Oct 2018 18:27:11 -0400 Received: from mga01.intel.com ([192.55.52.88]:27930 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727432AbeJDW1L (ORCPT ); Thu, 4 Oct 2018 18:27:11 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Oct 2018 08:33:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,340,1534834800"; d="scan'208";a="96075365" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Oct 2018 08:33:22 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B7652829; Thu, 4 Oct 2018 18:33:21 +0300 (EEST) From: Andy Shevchenko To: Linus Walleij , linux-gpio@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 4/4] pinctrl: geminilake: Sort register offsets by value Date: Thu, 4 Oct 2018 18:33:21 +0300 Message-Id: <20181004153321.34757-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> References: <20181004153321.34757-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org No functional change. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-geminilake.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c index 84e7c00371be..7d46fa77c736 100644 --- a/drivers/pinctrl/intel/pinctrl-geminilake.c +++ b/drivers/pinctrl/intel/pinctrl-geminilake.c @@ -15,8 +15,8 @@ #include "pinctrl-intel.h" #define GLK_PAD_OWN 0x020 -#define GLK_HOSTSW_OWN 0x0b0 #define GLK_PADCFGLOCK 0x080 +#define GLK_HOSTSW_OWN 0x0b0 #define GLK_GPI_IE 0x110 #define GLK_COMMUNITY(s, e) \