From patchwork Mon Jan 25 09:53:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 8105911 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 607ABBEEE5 for ; Mon, 25 Jan 2016 10:05:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AAE9200ED for ; Mon, 25 Jan 2016 10:05:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7B8F201CD for ; Mon, 25 Jan 2016 10:05:16 +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 1aNe03-0000vB-2X; Mon, 25 Jan 2016 10:03:55 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aNdzW-00006Y-7O; Mon, 25 Jan 2016 10:03:22 +0000 Received: from arrakis.dune.hu ([78.24.191.176]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aNdr8-0003Xs-64; Mon, 25 Jan 2016 09:54:42 +0000 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C778428C66A; Mon, 25 Jan 2016 10:53:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (p548C992E.dip0.t-ipconnect.de [84.140.153.46]) by arrakis.dune.hu (Postfix) with ESMTPSA; Mon, 25 Jan 2016 10:53:24 +0100 (CET) From: John Crispin To: Matthias Brugger Subject: [PATCH V3 10/11] soc: mediatek: PMIC wrap: add mt6323 slave support Date: Mon, 25 Jan 2016 10:53:23 +0100 Message-Id: <1453715604-36856-11-git-send-email-blogic@openwrt.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1453715604-36856-1-git-send-email-blogic@openwrt.org> References: <1453715604-36856-1-git-send-email-blogic@openwrt.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160125_095442_341583_D85D1407 X-CRM114-Status: GOOD ( 17.28 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Steven Liu , Sascha Hauer , linux-kernel@vger.kernel.org, Henry Chen , Flora Fu , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, John Crispin MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for MT6323 slaves. This PMIC can be found on MT2701 and MT7623 EVB. The only function that we need to touch is pwrap_init_cipher(). Signed-off-by: John Crispin --- drivers/soc/mediatek/mtk-pmic-wrap.c | 46 ++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index 21d8e5a..85c4314 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -97,6 +97,31 @@ enum dew_regs { PWRAP_MT8173_DEW_CIPHER_IV3, PWRAP_MT8173_DEW_CIPHER_IV4, PWRAP_MT8173_DEW_CIPHER_IV5, + + /* MT6323 only regs */ + PWRAP_DEW_CRC_SWRST, + PWRAP_DEW_CIPHER_EN, + PWRAP_DEW_RDDMY_NO, + PWRAP_DEW_RDATA_DLY_SEL, +}; + +static const u32 mt6323_regs[] = { + [PWRAP_DEW_BASE] = 0x0000, + [PWRAP_DEW_DIO_EN] = 0x018a, + [PWRAP_DEW_READ_TEST] = 0x018c, + [PWRAP_DEW_WRITE_TEST] = 0x018e, + [PWRAP_DEW_CRC_SWRST] = 0x0190, + [PWRAP_DEW_CRC_EN] = 0x0192, + [PWRAP_DEW_CRC_VAL] = 0x0194, + [PWRAP_DEW_MON_GRP_SEL] = 0x0196, + [PWRAP_DEW_CIPHER_KEY_SEL] = 0x0198, + [PWRAP_DEW_CIPHER_IV_SEL] = 0x019a, + [PWRAP_DEW_CIPHER_EN] = 0x019c, + [PWRAP_DEW_CIPHER_RDY] = 0x019e, + [PWRAP_DEW_CIPHER_MODE] = 0x01a0, + [PWRAP_DEW_CIPHER_SWRST] = 0x01a2, + [PWRAP_DEW_RDDMY_NO] = 0x01a4, + [PWRAP_DEW_RDATA_DLY_SEL] = 0x01a6, }; static const u32 mt6397_regs[] = { @@ -381,6 +406,7 @@ static int mt8135_regs[] = { }; enum pmic_type { + PMIC_MT6323, PMIC_MT6397, }; @@ -676,8 +702,16 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp) pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_SWRST, 0x0); pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_KEY_SEL, 0x1); pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_IV_SEL, 0x2); - pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_LOAD, 0x1); - pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_START, 0x1); + + switch (wrp->slave->type) { + case PMIC_MT6397: + pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_LOAD, 0x1); + pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_START, 0x1); + break; + case PMIC_MT6323: + pwrap_dew_write(wrp, PWRAP_DEW_CIPHER_EN, 0x1); + break; + } /* wait for cipher data ready@AP */ ret = pwrap_wait_for_state(wrp, pwrap_is_cipher_ready); @@ -870,6 +904,11 @@ static const struct regmap_config pwrap_regmap_config = { .max_register = 0xffff, }; +static const struct pwrap_slv_type pmic_mt6323 = { + .dew_regs = mt6323_regs, + .type = PMIC_MT6323, +}; + static const struct pwrap_slv_type pmic_mt6397 = { .dew_regs = mt6397_regs, .type = PMIC_MT6397, @@ -877,6 +916,9 @@ static const struct pwrap_slv_type pmic_mt6397 = { static const struct of_device_id of_slave_match_tbl[] = { { + .compatible = "mediatek,mt6323", + .data = &pmic_mt6323, + }, { .compatible = "mediatek,mt6397", .data = &pmic_mt6397, }, {