From patchwork Fri Apr 10 21:36:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 460243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9ADCB1401AF for ; Sat, 11 Apr 2015 07:39:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753828AbbDJVjE (ORCPT ); Fri, 10 Apr 2015 17:39:04 -0400 Received: from mout.perfora.net ([74.208.4.194]:56605 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754960AbbDJVhJ (ORCPT ); Fri, 10 Apr 2015 17:37:09 -0400 Received: from localhost.localdomain ([84.226.11.10]) by mrelay.perfora.net (mreueus001) with ESMTPSA (Nemesis) id 0MXnyz-1YvnP348tb-00WlBs; Fri, 10 Apr 2015 23:37:03 +0200 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mikko Perttunen , Mark Brown , "Rafael J. Wysocki" , Matt Porter , Paul Walmsley , Eduardo Valentin , Takashi Iwai , Dylan Reid , Stephen Boyd , Mike Turquette , Prashant Gaikwad , Peter De Schrijver , Russell King , Alexandre Courbot , Thierry Reding , Stephen Warren , Kumar Gala , Ian Campbell , Mark Rutland , Pawel Moll , Rob Herring , Marcel Ziswiler Subject: [PATCH 6/9] ARM: tegra: enable watchdog in defconfig Date: Fri, 10 Apr 2015 23:36:01 +0200 Message-Id: <924e2172b8ac0d443ca6b667793ec70b0a44d127.1428700856.git.marcel.ziswiler@toradex.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: X-Provags-ID: V03:K0:YOpLB0QGNnVONe95GfCbkQzL5fs/KGXL19Ky6SDLDvhbxK+xlDK j2c5/FppUbofmyQiW/X+XzcmzdFfxwKlfD2S8BrGyxWOq+wG3JbA3C7w6tALLYfhZ1EaeZh yIbb2iAyzal9jUV+D+DvKFfJWLPRPLLcmC2nWbJzO6XHuIBAt2udrDSnIzLG35rpfajgmpm T9Socmn0+KmBwSow5jOzw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Signed-off-by: Marcel Ziswiler --- arch/arm/configs/tegra_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index d199eb2..18047c4 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -154,6 +154,8 @@ CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y +CONFIG_WATCHDOG=y +CONFIG_TEGRA_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y