From patchwork Fri Jul 3 23:07:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 6717071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4CEAD9F52D for ; Fri, 3 Jul 2015 23:10:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7646D2085F for ; Fri, 3 Jul 2015 23:10:48 +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 989C420862 for ; Fri, 3 Jul 2015 23:10:47 +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 1ZBA3S-0006q0-Li; Fri, 03 Jul 2015 23:07:34 +0000 Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZBA3P-0006oY-Lk for linux-arm-kernel@lists.infradead.org; Fri, 03 Jul 2015 23:07:32 +0000 Received: by igblr2 with SMTP id lr2so147707147igb.0 for ; Fri, 03 Jul 2015 16:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=rwgXLgjRbwdbjRuc+Q/MZiuy9YyRMVQRJirqnOqViow=; b=UiVF7nljVpqrGK4lMvlvXlrlMGj0/AQenT0e61Egx9HoNefq5cXXGqiijdCUHdvse9 qzqLcLAM6LHoqtShx1anqBGOjrtfD8nzl3Ce0Kg+9F2nUi2j1qjo4aOMCkNSzSFkObxy NOjqGFiHwbktuUOgzPP+fp8Dg2aeARIJn0KtJMo1MJvt8xOq85pj0u7rXkC9bnalyFZE /qVYhashWx+dwvFMNHbWJgVkugl1yOEyIvsJeUWmcZfbfg1ZVmFHRa52c8QkL4JQCtJF 7I9EiDEBWy0Uqn+efxTDP5CKGw9Bj7FSr9vZHfcTZEsF+7bQyURfwHMe44oaWyUuihJS ohew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=rwgXLgjRbwdbjRuc+Q/MZiuy9YyRMVQRJirqnOqViow=; b=GqWOfR1qDCQPxn+wasNQVm7AkjtmKu3Y4eEImqSfAGFkScu6eX+IN6a7xFoh+1pExG tfMmfY1da+kN1sX9DCVmmJzOYaYUmFlZb8hIagtReYFxx2V8LLA0gAowT+FV6R3Hg5Wm xYf1vV5NYFMF4zXBD4lRrwyu+VDNsgfiGPIsCFFH5Hk/MhXNpRcKMItubBPJ99juD9Rj sEh3kt/JPe4GoCB57wzeOVsBF5ejbdE8m6banjjoEnycqQo9bmBbTI1p4UohsecMWP+n J7xW6fr7Nt6nU1hcgZvWqj4QfC+HicTgJHonbZwAfuZ6+VsCWBB9wZnrjKgi7Kyd0rxi VoLg== X-Gm-Message-State: ALoCoQlipmnFt8drHocx4uIZbAntSGlDtNibFSIFCDCQ18X8g5pQCZyDuAzQkGxB4baR5LgB/t3t X-Received: by 10.107.164.196 with SMTP id d65mr60083063ioj.3.1435964830489; Fri, 03 Jul 2015 16:07:10 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by mx.google.com with ESMTPSA id e10sm4397993igy.11.2015.07.03.16.07.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 16:07:09 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 09702220784; Fri, 3 Jul 2015 17:07:08 -0600 (MDT) From: Simon Glass To: linux-tegra@vger.kernel.org Subject: [PATCH v2] tegra: Enable TPM on tegra124 nyan boards Date: Fri, 3 Jul 2015 17:07:01 -0600 Message-Id: <1435964821-15251-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.4.3.573.g4eafbef X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150703_160731_765829_49C75B05 X-CRM114-Status: GOOD ( 10.33 ) X-Spam-Score: -3.2 (---) 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: Simon Glass , Stephen Warren , linux-arm-kernel@lists.infradead.org, Stephen Warren MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Regenerate the pinmux from the latest tegra-pinmux-scripts. This adds the pinmux settings for the TPM. Signed-off-by: Simon Glass Acked-by: Stephen Warren --- Changes in v2: - Correct USB changes in nyan-blaze arch/arm/boot/dts/tegra124-nyan-big.dts | 20 ++++++++++---------- arch/arm/boot/dts/tegra124-nyan-blaze.dts | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts index 2d21253..c2955c9 100644 --- a/arch/arm/boot/dts/tegra124-nyan-big.dts +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts @@ -1098,19 +1098,19 @@ }; cam_i2c_scl_pbb1 { nvidia,pins = "cam_i2c_scl_pbb1"; - nvidia,function = "rsvd3"; - nvidia,pull = ; - nvidia,tristate = ; - nvidia,enable-input = ; - nvidia,open-drain = ; + nvidia,function = "i2c3"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + nvidia,open-drain = ; }; cam_i2c_sda_pbb2 { nvidia,pins = "cam_i2c_sda_pbb2"; - nvidia,function = "rsvd3"; - nvidia,pull = ; - nvidia,tristate = ; - nvidia,enable-input = ; - nvidia,open-drain = ; + nvidia,function = "i2c3"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + nvidia,open-drain = ; }; pbb3 { nvidia,pins = "pbb3"; diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts index 0d30c51..bef31a8 100644 --- a/arch/arm/boot/dts/tegra124-nyan-blaze.dts +++ b/arch/arm/boot/dts/tegra124-nyan-blaze.dts @@ -1094,19 +1094,19 @@ }; cam_i2c_scl_pbb1 { nvidia,pins = "cam_i2c_scl_pbb1"; - nvidia,function = "rsvd3"; - nvidia,pull = ; - nvidia,tristate = ; - nvidia,enable-input = ; - nvidia,open-drain = ; + nvidia,function = "i2c3"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + nvidia,open-drain = ; }; cam_i2c_sda_pbb2 { nvidia,pins = "cam_i2c_sda_pbb2"; - nvidia,function = "rsvd3"; - nvidia,pull = ; - nvidia,tristate = ; - nvidia,enable-input = ; - nvidia,open-drain = ; + nvidia,function = "i2c3"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + nvidia,open-drain = ; }; pbb3 { nvidia,pins = "pbb3";