From patchwork Wed Aug 1 10:04:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 952044 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=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="AhE0OtDx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41gTRf5QCJz9s1x for ; Wed, 1 Aug 2018 20:04:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388919AbeHALtL (ORCPT ); Wed, 1 Aug 2018 07:49:11 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:50783 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388896AbeHALtL (ORCPT ); Wed, 1 Aug 2018 07:49:11 -0400 Received: by mail-wm0-f47.google.com with SMTP id s12-v6so6312046wmc.0 for ; Wed, 01 Aug 2018 03:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VuMSobxqG9WNa9OZiPgkmFIgiBpcY6xQ+KGyfHoGbPg=; b=AhE0OtDx8p4sPmEDFS/iadD5n1O5KeLKyJUt/xUNn0z9hzLPcats6xdPMeP7k/U7BW 9Ld1qziXLrjr/jWML91LrMM8lNZvKwez+MDZTFVodiCDVgTqqeI9nGX+HjpuY3MngHoI dp1ckCxteEK0ae4grNSOASj9hzs3tI9JEtzRMC6p3S9JGS9r7vfuEN3iIzPY/2vt3jBo RZwS29NDpyG/8QVcIWE53wek5uoF/qBEU9MJMlur9C3cEam2g5hWaBI1OjP+D1SHQMY3 Ksg5ykHiJtrI0veNoGMqjL0o7aIFmMLdGmoe8sw9R8fGdFdeDhajZGlauPnA27S0eyIf ubyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VuMSobxqG9WNa9OZiPgkmFIgiBpcY6xQ+KGyfHoGbPg=; b=Z0dnArS9HTsl0WVTRnVYRlUH50dbRlMruyiMhbAZvSc3agd/Xrn9kEYcnonpJ4qHgO m3HhDjC3Bf1UrF8KzdBjRDP9Zk2NSihXL3gTBALKdG+6izoioZuYgfczw9bk/13sUlkY 878E6/rgcGAVwJ9pD7laj815xDlz6gSnSwRyGDb8EZdHLkvosPn4C6R1K9iS64d0EesS +ady3naPUKgXGr4Y5NcZ5yv6hnJrQZbf+ndRGszzQ4dXb2gjCfo2Qor+N0PpRLZ8k7aN TznaUIvE8sYXg4wfqGOxiLUbttQLYbNQOuTeYDhohPtNhCpsAIh4ixlUMv7c+bWsv3n4 cPBQ== X-Gm-Message-State: AOUpUlFpz6eptjzekZXQl8RHlBNR8YEdMQUcGbiTxOfRKnQpZnrj1Txb 7LyPAAGY9nmT6Pm+IxfSq+h5/5HW2hs= X-Google-Smtp-Source: AAOMgpeBib7IEUDCNVwh7P4pMkZ6BpzMeTW8htUSVTXVVlyw6H+1Zoy0pKhzw56KpQkx6BCqIrD/cg== X-Received: by 2002:a1c:3e8f:: with SMTP id l137-v6mr2248949wma.132.1533117851099; Wed, 01 Aug 2018 03:04:11 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id e5-v6sm4579835wmh.29.2018.08.01.03.04.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 03:04:10 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com, linus.walleij@linaro.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] meson_sm: add TEST_N pin direction call Date: Wed, 1 Aug 2018 12:04:08 +0200 Message-Id: <1533117848-28194-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> References: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Amlogic Meson GX and AXG has a Secure Monitor call to change the TEST_N pin gpio direction, add it in the supported call list. Signed-off-by: Neil Armstrong --- drivers/firmware/meson/meson_sm.c | 1 + include/linux/firmware/meson/meson_sm.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index 0ec2ca8..f407001 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -48,6 +48,7 @@ struct meson_sm_chip gxbb_chip = { CMD(SM_EFUSE_READ, 0x82000030), CMD(SM_EFUSE_WRITE, 0x82000031), CMD(SM_EFUSE_USER_MAX, 0x82000033), + CMD(SM_TEST_N_DIR, 0x82000046), { /* sentinel */ }, }, }; diff --git a/include/linux/firmware/meson/meson_sm.h b/include/linux/firmware/meson/meson_sm.h index 37a5eae..133b1c3 100644 --- a/include/linux/firmware/meson/meson_sm.h +++ b/include/linux/firmware/meson/meson_sm.h @@ -17,6 +17,7 @@ enum { SM_EFUSE_READ, SM_EFUSE_WRITE, SM_EFUSE_USER_MAX, + SM_TEST_N_DIR, }; struct meson_sm_firmware; From patchwork Wed Aug 1 10:00:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 952040 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=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="1/ymuEzK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41gTMT0lWcz9s4Z for ; Wed, 1 Aug 2018 20:00:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389030AbeHALpb (ORCPT ); Wed, 1 Aug 2018 07:45:31 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:35789 "EHLO mail-wr1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387534AbeHALpa (ORCPT ); Wed, 1 Aug 2018 07:45:30 -0400 Received: by mail-wr1-f45.google.com with SMTP id a3-v6so19481088wrt.2 for ; Wed, 01 Aug 2018 03:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kuBO+lRjS+AQcV6hL+v/rpCD0Zo/OVQAPDSiaaqeuys=; b=1/ymuEzKs6beJ9HR6UhbZuVnV+OZt1sRGMMs+/QL1apP+tnCEk/ZlfdlHUWOuIq8eH d1MLuXyFfyxJDEL0a+tkn/e2lBZaY+Gnd6/c+J5gEuV33ybwIeIuTQfWlnp6qz/FJAbx qDeKi4Q2fDOCvQRwg2JyFW5VCqFkUgduDCE3QUPy8qAP0EPa1zMrt56bml7ZQZp4M9oa bph+fy9ff7f7DaQf47F5mTQTVbRi/5p6qSqy7Wx+RJeLTo1jtkEjvvER9Mj1I75EzKNP E4M0C5ZtGb3XQ9vEJxZyO+AHa1/HmjpqhyJ+T/lIUVxfrbaWt76q44kHGOywuGT35CpO rEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kuBO+lRjS+AQcV6hL+v/rpCD0Zo/OVQAPDSiaaqeuys=; b=RfbdfKRPXH9yarjX65EsG4LCa4NRT5XMZUXBvtM6yuz8lYzPlIFGL+LsYRvLI7k9WZ cijYHO3aRBQro33Igfod2PFhDCLl4Hc2QoQ4vzS3iFXUZ0j/ttzBBWjVItx2zzUjDtEZ KHAlFEqf1WiLkgNBO9CZqO2lQJFdIhk6XTQwzAVitEguEvQCsrgA10q7PtTqxGmUF9RE 1Jcz5Zgt6CE1dJkiXPylyAoSfLuPSPLqx8vZOrYlyFZhKF2dZS3QptvOav/Dd51Xx/Cy HNl56rvn1vj0PM7z1oE3Atz1AwN0D88mG7XL1v+p602ZzemTaN4VTZ0gKr7mgmpiSXQC 65ew== X-Gm-Message-State: AOUpUlG4GK3UEERI2kycaivadM+MbwZB4RUZde4br6+Bszq+75JPRjJg x/jJS+UuKIVPjkFDcKAwKiULvA== X-Google-Smtp-Source: AAOMgpfmEnPY2ZnCtLVp6HPIOnf2hnSolmMk9pcPCXg7zFYN08OSREUoQbbF91hCn3NNMsk9Qk4u7Q== X-Received: by 2002:adf:b243:: with SMTP id y3-v6mr24607182wra.90.1533117630927; Wed, 01 Aug 2018 03:00:30 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u7-v6sm6317067wmd.46.2018.08.01.03.00.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 03:00:29 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com, linus.walleij@linaro.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] pinctrl: meson: Add support to set direction with a secure monitor call Date: Wed, 1 Aug 2018 12:00:20 +0200 Message-Id: <1533117623-27856-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> References: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Amlogic Meson GX and AXG SoCs needs to do a Secure Monitor call to set the TEST_N pin direction. This patch adds a "smc" boolean to the bank structure to differentiate the TEST_N bank and call the Secure Monitor in the _input/_output functions. Signed-off-by: Neil Armstrong --- drivers/pinctrl/meson/Kconfig | 1 + drivers/pinctrl/meson/pinctrl-meson.c | 31 ++++++++++++++++++++++++++----- drivers/pinctrl/meson/pinctrl-meson.h | 10 +++++++++- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig index c80951d..1b90470 100644 --- a/drivers/pinctrl/meson/Kconfig +++ b/drivers/pinctrl/meson/Kconfig @@ -8,6 +8,7 @@ menuconfig PINCTRL_MESON select GPIOLIB select OF_GPIO select REGMAP_MMIO + select MESON_SM if PINCTRL_MESON diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 29a458d..8e445aa 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -54,6 +54,7 @@ #include #include #include +#include #include "../core.h" #include "../pinctrl-utils.h" @@ -99,8 +100,14 @@ static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin, { struct meson_reg_desc *desc = &bank->regs[reg_type]; - *reg = desc->reg * 4; - *bit = desc->bit + pin - bank->first; + /* TEST_N pin direction needs to be set using a Secure Monitor call */ + if (reg_type == REG_DIR && bank->smc) { + *reg = desc->reg; + *bit = desc->bit; + } else { + *reg = desc->reg * 4; + *bit = desc->bit + pin - bank->first; + } } static int meson_get_groups_count(struct pinctrl_dev *pcdev) @@ -342,6 +349,12 @@ static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) meson_calc_reg_and_bit(bank, gpio, REG_DIR, ®, &bit); + /* TEST_N pin direction needs to be set using a Secure Monitor call */ + if (bank->smc) { + u32 smc_ret = 0; + return meson_sm_call(reg, &smc_ret, 0, 0, 0, 0, 0); + } + return regmap_update_bits(pc->reg_gpio, reg, BIT(bit), BIT(bit)); } @@ -358,9 +371,17 @@ static int meson_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, return ret; meson_calc_reg_and_bit(bank, gpio, REG_DIR, ®, &bit); - ret = regmap_update_bits(pc->reg_gpio, reg, BIT(bit), 0); - if (ret) - return ret; + /* TEST_N pin direction needs to be set using a Secure Monitor call */ + if (bank->smc) { + u32 smc_ret = 0; + ret = meson_sm_call(reg, &smc_ret, bit, 0, 0, 0, 0); + if (ret) + return ret; + } else { + ret = regmap_update_bits(pc->reg_gpio, reg, BIT(bit), 0); + if (ret) + return ret; + } meson_calc_reg_and_bit(bank, gpio, REG_OUT, ®, &bit); return regmap_update_bits(pc->reg_gpio, reg, BIT(bit), diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h index 12a39110..d32e9a9 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -92,6 +92,7 @@ struct meson_bank { const char *name; unsigned int first; unsigned int last; + bool smc; /* Direction needs to use a Secure Monitor call */ int irq_first; int irq_last; struct meson_reg_desc regs[NUM_REG]; @@ -131,11 +132,12 @@ struct meson_pinctrl { .num_groups = ARRAY_SIZE(fn ## _groups), \ } -#define BANK(n, f, l, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) \ +#define __BANK(n, f, l, sm, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) \ { \ .name = n, \ .first = f, \ .last = l, \ + .smc = sm, \ .irq_first = fi, \ .irq_last = li, \ .regs = { \ @@ -147,6 +149,12 @@ struct meson_pinctrl { }, \ } +#define BANK(n, f, l, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) \ + __BANK(n, f, l, false, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) + +#define BANK_SMC(n, f, l, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) \ + __BANK(n, f, l, true, fi, li, per, peb, pr, pb, dr, db, or, ob, ir, ib) + #define MESON_PIN(x) PINCTRL_PIN(x, #x) /* Common pmx functions */ From patchwork Wed Aug 1 10:00:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 952038 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=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="C6xmq3Wh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41gTMR6XWtz9s3x for ; Wed, 1 Aug 2018 20:00:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387534AbeHALpb (ORCPT ); Wed, 1 Aug 2018 07:45:31 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43949 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388979AbeHALpb (ORCPT ); Wed, 1 Aug 2018 07:45:31 -0400 Received: by mail-wr1-f67.google.com with SMTP id b15-v6so19483239wrv.10 for ; Wed, 01 Aug 2018 03:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dKCpiYXulo0kPH2043KgLwLQAz9rpNhmMFF0a3/0vxA=; b=C6xmq3WhHQdiM/pb6xQSID6lTPHX49MMpGMFrg4OaglwO5EzDG6ysLwG0cmRZfu/NO jq4GQkI7+WTGJcX2agiumEB7Z1pR2tqZCvARViS/0HHBTYlHv56Za+ROi/VOU6JO8pwN B/xGTSv+ap5dPD4nntdoT1QxX9U+T7eZWKfJZZFLerhGrRZxx/Z9jnO32CLTfr9NyAQo +TY9TX+McmbXgHeOGAsk10QG7CUybhhBuMJrhoU88gQ8Jmc3HgKMEMiH7o6dfxeEPHcm gTF5N0iv1citaSHVSGDArxGtNmWMxCHMt7apd322pcsEN5tq5QB8aeB/KydeH8qdEKCW z6bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dKCpiYXulo0kPH2043KgLwLQAz9rpNhmMFF0a3/0vxA=; b=Yv4495NFfazKaGrfWjhz568oW+U0k62ubwKo3n4iFktJy7iHN6ggyQpiW3HpmewHja q6bo9eFpeTWiV629FLjFBW++UXbCOYU5Itu/O8LwH/0eohOQ5d01e+XINOdAjA6q33WG 67axe5/Figt+xpMVfC1GOvU/R2WI8RKKTwBMugr8E8r4GTKoMKOjVldtAybujLkwRj8o r5ARWILTI+TObvsqqKwWR2RvIixZeRSDKowLXtwOet/GUBM8iWF4q+aaIS6/z7qpS7z4 /Oqdi58w2iOmcbz+RJZNeZPkl8/hq0NO7Np1NiLzPiQ46GpSh8wvIdMU4aFV1gqUfUFx bmiQ== X-Gm-Message-State: AOUpUlGCTwHueuetIpztckPWH0TwNw/2BxFXXtn5Wh8OkH66LpTiB9G7 7Xr6nVxxSktEjMpQ3RGF1zFJ3w== X-Google-Smtp-Source: AAOMgpf8GNNIsy7ZBIII7Bo1J50fNFQZ/k96scoDbLX5JXxKv+nrrSNmD7msG9HtB1ISiLFuMlLr/A== X-Received: by 2002:adf:9546:: with SMTP id 64-v6mr23008055wrs.257.1533117632093; Wed, 01 Aug 2018 03:00:32 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u7-v6sm6317067wmd.46.2018.08.01.03.00.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 03:00:31 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com, linus.walleij@linaro.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] meson: pinctrl-gxbb: add support for TEST_N pin Date: Wed, 1 Aug 2018 12:00:21 +0200 Message-Id: <1533117623-27856-4-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> References: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Amlogic Meson GXBB SoCs needs a Secure Monitor call to set the TEST_N direction, add a special bank to support this pin. Signed-off-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 2c97a2e0..c0954be 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -15,6 +15,7 @@ #include #include "pinctrl-meson.h" #include "pinctrl-meson8-pmx.h" +#include static const struct pinctrl_pin_desc meson_gxbb_periphs_pins[] = { MESON_PIN(GPIOZ_0), @@ -823,6 +824,9 @@ static struct meson_bank meson_gxbb_periphs_banks[] = { static struct meson_bank meson_gxbb_aobus_banks[] = { /* name first last irq pullen pull dir out in */ BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), + /* This PIN Direction must be set using a SMC call, so dir reg offset is the sm call */ + BANK_SMC("TEST", GPIO_TEST_N, GPIO_TEST_N, + -1, -1, 0, 30, 0, 14, SM_TEST_N_DIR, 1, 0, 31, 1, 31), }; static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = { From patchwork Wed Aug 1 10:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 952041 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=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="nV0JEEPL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41gTMT6MzQz9s1x for ; Wed, 1 Aug 2018 20:00:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389104AbeHALpc (ORCPT ); Wed, 1 Aug 2018 07:45:32 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:40526 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388985AbeHALpc (ORCPT ); Wed, 1 Aug 2018 07:45:32 -0400 Received: by mail-wm0-f67.google.com with SMTP id y9-v6so6353418wma.5 for ; Wed, 01 Aug 2018 03:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dtEVeGwd13XDLfsq1I81oTqBKNMFTLo0eMseg8KFGsA=; b=nV0JEEPL0DykgqL5mZKCigt2AH0nDlpFfGxu8LW7JRiL0f56JMPncRsNrxvKYkndvi uTex8VE6OFRZFrMqvH6pdT5Hyo1CUoxAIzjRRlBjndTnCblEBgSTnIE1CL/l3vEGrtb6 gSTnjowhQoArdcaW5CvZKbCnJkg3G01DJaYn6kjKvUmV6smm8oiQ+q7SWpFpyCiVGVvZ a1PHy0zYBTGchz/rqOoQw84RGyMKZHkej1HbReU4Q0bq7O17oIN+3E3jq9bu2CCUzmZ8 Oev4CVcwR0UA0IZP+0EjVv4g6jViU3tbOVrvUT3u/dofUJZHbOEl9A785XzysmjIZCnM l2Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dtEVeGwd13XDLfsq1I81oTqBKNMFTLo0eMseg8KFGsA=; b=DqxWhSmKLQNdquoendUXIbJ2YBhKCx35omYGMZiJ47Ubl/3Jpm/g7IgA5BHtg1gSyS 8vL0iIHxg+wsVT7dn8jne05ds5XGtxro/KRHzwkf+jAh05yZ2LP6UlvmeYE4sMr6YbWx 3bLQUK6snOg6A83SHg40PHKHShsP5Dy4j3xonKcLksBb2mw3pYcrUWDrWRBp5TF1OBJq b6yUsd6J28yd6hTtyFbET6GPIY/lENKqdoNtIGBar8pQCHQY4rerrRUw+qrjU6RPkCYo Rjv+d1WPKa35fpbFzSqt6LTBlDug3Gg30OjUOy9M1zFrahFc5ypyzqECflwNPxRMDKJv Ndxw== X-Gm-Message-State: AOUpUlEZFO4jmezBZZHcYWYUgfFl56XEDg/AdqysTqCwhxdJyTLnllnh mOH08BK/D0CM36G1F7sfpdPTvA== X-Google-Smtp-Source: AAOMgpfcReKjTlre5Fx11+Cndx1iOJwvn0XUrTVjW5px2JE0a3rl0iMM3iGLunsF0hrv12t+BVh+uA== X-Received: by 2002:a1c:30c3:: with SMTP id w186-v6mr2111943wmw.153.1533117633292; Wed, 01 Aug 2018 03:00:33 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u7-v6sm6317067wmd.46.2018.08.01.03.00.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 03:00:32 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com, linus.walleij@linaro.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] meson: pinctrl-gxl: add support for TEST_N pin Date: Wed, 1 Aug 2018 12:00:22 +0200 Message-Id: <1533117623-27856-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> References: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Amlogic Meson GXL & GXM SoCs needs a Secure Monitor call to set the TEST_N direction, add a special bank to support this pin. Signed-off-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 7dae1d7..d4dc42f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -15,6 +15,7 @@ #include #include "pinctrl-meson.h" #include "pinctrl-meson8-pmx.h" +#include static const struct pinctrl_pin_desc meson_gxl_periphs_pins[] = { MESON_PIN(GPIOZ_0), @@ -808,6 +809,9 @@ static struct meson_bank meson_gxl_periphs_banks[] = { static struct meson_bank meson_gxl_aobus_banks[] = { /* name first last irq pullen pull dir out in */ BANK("AO", GPIOAO_0, GPIOAO_9, 0, 9, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), + /* This PIN Direction must be set using a SMC call, so dir reg offset is the sm call */ + BANK_SMC("TEST", GPIO_TEST_N, GPIO_TEST_N, + -1, -1, 0, 30, 0, 14, SM_TEST_N_DIR, 1, 0, 31, 1, 31), }; static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = { From patchwork Wed Aug 1 10:00:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 952042 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=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="oz32aOzn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41gTMZ6pYhz9s1x for ; Wed, 1 Aug 2018 20:00:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389028AbeHALpe (ORCPT ); Wed, 1 Aug 2018 07:45:34 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45807 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388612AbeHALpd (ORCPT ); Wed, 1 Aug 2018 07:45:33 -0400 Received: by mail-wr1-f67.google.com with SMTP id f12-v6so9573355wrv.12 for ; Wed, 01 Aug 2018 03:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uW+eatmHxK9liMsreOsDXjGltRq9gJbcnas+7BZDc6o=; b=oz32aOznlxpzo6M5L34E9qUE1uNRcQjybrYQIVlFbPfku+aH8xDYNCW34LT/p8Rh12 ykWgszxnU1sPFrUjH2eBViAivPT69vEZRns+7kBh/DAaLPWFd7yGrP9BwxaFnuImeNvg u0O67ECOy7tjVtS+HWKFpP/1opjNeGayORAn6DqD5TDb5sEPkthYSXPiKyP03JckS224 YRSNbmYOFpPd+fhsmh7id0CJRIvia7Vscy8pnd/2AZvYp4qibX6MNGrrb9jD+oC5K0al 8gNV/eYi6++m3I/00Gy/nVacLbpA1FtsabZ5fAmNAjXTV/8UgQNDrS1/nXK85OU+olWh zDuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uW+eatmHxK9liMsreOsDXjGltRq9gJbcnas+7BZDc6o=; b=F0WWh8dpcB5eePa3swVrT6iPyCEVINFO7p0/CnKnh699FWLMgCSvbCc3WVsp9KUg03 pn7nI7zpNWqlbYkc8ZeEjkCd1iAdVxZqqtkQ/5icJ37ASYBY6fD8E5Z2p25lLVU+2fpG 7rCT8uN8RbRefhJAoL0MHPFjcZI0gW+o2JMVoX9pkxSafS3Iu3TsVA5kLguSze9rziPO lgfwjRxEaQg7nplfejdxADx5zykHJuOZDvNeJKRZ8q8wPx8vTBSGUY+ejVMjhj4W/jfH udQpjVDuEIndb5yuYQyUymbYxvWqALWB1xPMIe396HaIpB2donjAzD8slEvzQS+8i4Ry sByg== X-Gm-Message-State: AOUpUlEQxYon1yP8Mn9SAUphraF/CNuNHyHhC8aEps2z8H1TmfKUnqET x05grEdW9oX4TwgmPAnPZ4bd2g== X-Google-Smtp-Source: AAOMgpfqTZetwfJaZSTuSiGTAi0Xp4+g6Rjbk4aYHyGngl/H3Wm3td1j2iPSQI48TyJpI30S3Beg9g== X-Received: by 2002:adf:eb4c:: with SMTP id u12-v6mr24758551wrn.174.1533117634474; Wed, 01 Aug 2018 03:00:34 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u7-v6sm6317067wmd.46.2018.08.01.03.00.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 03:00:33 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com, linus.walleij@linaro.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] meson: pinctrl-axg: add support for TEST_N pin Date: Wed, 1 Aug 2018 12:00:23 +0200 Message-Id: <1533117623-27856-6-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> References: <1533117623-27856-1-git-send-email-narmstrong@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Amlogic Meson AXG SoCs needs a Secure Monitor call to set the TEST_N direction, add a special bank to support this pin. Signed-off-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 46a0918..12615d8 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -10,6 +10,7 @@ #include #include "pinctrl-meson.h" #include "pinctrl-meson-axg-pmx.h" +#include static const struct pinctrl_pin_desc meson_axg_periphs_pins[] = { MESON_PIN(GPIOZ_0), @@ -1006,6 +1007,9 @@ static struct meson_bank meson_axg_periphs_banks[] = { static struct meson_bank meson_axg_aobus_banks[] = { /* name first last irq pullen pull dir out in */ BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), + /* This PIN Direction must be set using a SMC call, so dir reg offset is the sm call */ + BANK_SMC("TEST", GPIO_TEST_N, GPIO_TEST_N, + -1, -1, 0, 30, 0, 14, SM_TEST_N_DIR, 1, 0, 31, 1, 31), }; static struct meson_pmx_bank meson_axg_periphs_pmx_banks[] = {