From patchwork Thu Jun 26 09:15:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vikas Sajjan X-Patchwork-Id: 4426711 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ED6A1BEEAA for ; Thu, 26 Jun 2014 09:18:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FF6F20394 for ; Thu, 26 Jun 2014 09:18:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5D9420304 for ; Thu, 26 Jun 2014 09:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755476AbaFZJSG (ORCPT ); Thu, 26 Jun 2014 05:18:06 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:41324 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754992AbaFZJSE (ORCPT ); Thu, 26 Jun 2014 05:18:04 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7R0039KR5VRZ90@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 26 Jun 2014 18:17:55 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id B0.31.14704.045EBA35; Thu, 26 Jun 2014 18:17:52 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-cf-53abe540d20a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B3.D3.04943.045EBA35; Thu, 26 Jun 2014 18:17:52 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N7R00J3LR5J2M80@mmp2.samsung.com>; Thu, 26 Jun 2014 18:17:52 +0900 (KST) From: Vikas Sajjan To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, tomasz.figa@gmail.com, joshi@samsung.com, sajjan.linux@gmail.com, dianders@chromium.org, Vikas Sajjan Subject: [PATCH] ARM: dts: Add mask-tpm-reset to the device tree Date: Thu, 26 Jun 2014 14:45:27 +0530 Message-id: <1403774127-21892-1-git-send-email-vikas.sajjan@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsWyRsSkWtfh6epgg+W7FSzOLjvIZvF91xd2 i94FV9ksNj2+xmox4/w+Josnhz+yWqza9YfR4uaz7UwOHB6zGy6yeOycdZfdY/OSeo++LasY PT5vkgtgjeKySUnNySxLLdK3S+DK2Lt/H2PBVr6KCR9mMzYw3uLuYuTkkBAwkfj54wUjhC0m ceHeerYuRi4OIYGljBI3nq1mhyl68aGXFSIxnVFiTXMbM4QzgUni969zLCBVbAK6EitOPQdq 5+AQEfCWWH5NEaSGWWA+o8TEyV+YQWqEBRwk3p7qAZvKIqAq8fdUIxuIzSvgIbHh1QcmkF4J AQWJOZNsQHolBLrZJf5t7GCBqBeQ+Db5EAtEjazEpgPMEMdJShxccYNlAqPgAkaGVYyiqQXJ BcVJ6UXGesWJucWleel6yfm5mxiB4Xv637P+HYx3D1gfYkwGGjeRWUo0OR8Y/nkl8YbGZkYW piamxkbmlmakCSuJ895/mBQkJJCeWJKanZpakFoUX1Sak1p8iJGJg1OqgTFT++Pf4pXM5kKP zJQ+pHHW3t1otuqhnovyWlVD3sk+sZN0bQXVD1QnbXtns2ktf9GvtxrN7DN/RJ6ZX8eUeuDk 6yOJrF62GU+KGi5+mVperc1U0hs1u9FQ9U1C6oG8S/FCqewxv+5VXlzCPIdzl8/vtaxCX8/8 UXFfMD+zY+nzvhUadb/f5ymxFGckGmoxFxUnAgCmGTmGdQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRmVeSWpSXmKPExsVy+t9jQV2Hp6uDDb7/FLU4u+wgm8X3XV/Y LXoXXGWz2PT4GqvFjPP7mCyeHP7IarFq1x9Gi5vPtjM5cHjMbrjI4rFz1l12j81L6j36tqxi 9Pi8SS6ANaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DX LTMH6BYlhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8be/fsYC7byVUz4 MJuxgfEWdxcjJ4eEgInEiw+9rBC2mMSFe+vZuhi5OIQEpjNKrGluY4ZwJjBJ/P51jgWkik1A V2LFqedAVRwcIgLeEsuvKYLUMAvMZ5SYOPkLM0iNsICDxNtTPewgNouAqsTfU41sIDavgIfE hlcfmEB6JQQUJOZMspnAyL2AkWEVo2hqQXJBcVJ6rqFecWJucWleul5yfu4mRnB0PJPawbiy weIQowAHoxIP74fHq4KFWBPLiitzDzFKcDArifB23lkdLMSbklhZlVqUH19UmpNafIjRFGj5 RGYp0eR8YOTmlcQbGpuYmxqbWppYmJhZKonzHmi1DhQSSE8sSc1OTS1ILYLpY+LglGpg3MJy yGnWjMmvGmObKiOK8hw5/s7696DgsFdn/MaoxhtqNyXXdCVO6U0/+ss+ZoeOS6kq7xT2hhsq lyTy9m4/aZEkpaB88JbbJN+PX/8zHmRk2rjRt3hFxf7sX8L/r///VaX70O6I8p2f8bP5I9ap iSy9tfjIpE1ylWtNb53um9Ulk8376xhnjhJLcUaioRZzUXEiAF5EqfGkAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Doug Anderson The mask-tpm-reset GPIO is used by the kernel to prevent the TPM from being reset across sleep/wake. If we don't set it to anything then the TPM will be reset. U-Boot will detect this as invalid and will reset the system on resume time. This GPIO can always be low and not hurt anything. It will get pulled back high again during a normal warm reset when it will default back to an input. To properly preserve the TPM state across suspend/resume and to make the chrome U-Boot happy, properly set the GPIO to mask the reset to the TPM. Signed-off-by: Doug Anderson Signed-off-by: Vikas Sajjan --- arch/arm/boot/dts/exynos5420-peach-pit.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 7649982..8fd990a 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -87,6 +87,18 @@ pinctrl-0 = <&usb301_vbus_en>; enable-active-high; }; + + /* We need GPX0_6 to be low at sleep time; just keep it low always */ + mask_tpm_reset_regulator: mask-tpm-reset-regulator { + compatible = "regulator-fixed"; + regulator-name = "mask-tpm-reset "; + gpio = <&gpx0 6 0>; + enable-active-low; + regulator-boot-on; + regulator-always-on; + pinctrl-names = "default"; + pinctrl-0 = <&mask_tpm_reset>; + }; }; &dp { @@ -210,6 +222,14 @@ &pinctrl_0 { + + mask_tpm_reset: mask-tpm-reset { + samsung,pins = "gpx0-6"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + max98090_irq: max98090-irq { samsung,pins = "gpx0-2"; samsung,pin-function = <0>;