From patchwork Sat Sep 20 17:06:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 4942091 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D8E69F32F for ; Sat, 20 Sep 2014 17:12:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D0D3201D3 for ; Sat, 20 Sep 2014 17:11:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C37F92016C for ; Sat, 20 Sep 2014 17:11:58 +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 1XVOAq-0004es-Se; Sat, 20 Sep 2014 17:10:16 +0000 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XVOAH-00030m-Ja for linux-arm-kernel@lists.infradead.org; Sat, 20 Sep 2014 17:09:42 +0000 Received: by mail-wg0-f46.google.com with SMTP id a1so976994wgh.29 for ; Sat, 20 Sep 2014 10:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lu7mh96Zjm/vD55Q8FPNrhAXPSFN6qcq/1AT8b3l1NE=; b=xW8bc5HbfcPUvwppEcA3kD2N7s3yO0GdC3ffmfvhkMKNgac3DY0y4jGzXFYiCDMLC5 QFOO7kmCoMwEjfjMJ7SGgbqD58+dKWE22inlRPvoh/Vw0pKMDDe5vMYngqnH70rsEDIR 2kXAn10pF2RrsRQxi4WVkmF9S5WXLDiU/1QlcoXToenNeXbON35lZkYWAcC/0nOQG6nF t2dxRQBuZctiXFQWK7pXQ2S1mqDQbDjaYBR7NoUls/ZzSkemlE5XxWWON956nlgp9mLl VTP0hCAIW/vKuBGMBu7AXoBJi6BV+0fxaazPTkSRgRzQCaCiAwLdFsSeEohXpfSbRP/6 4MMw== X-Received: by 10.194.77.243 with SMTP id v19mr8787378wjw.18.1411232958591; Sat, 20 Sep 2014 10:09:18 -0700 (PDT) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id f7sm5955349wix.22.2014.09.20.10.09.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 Sep 2014 10:09:17 -0700 (PDT) From: Carlo Caione To: linux@roeck-us.net, wim@iguana.be, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, maxime.ripard@free-electrons.com, b.galvani@gmail.com, linux@arm.linux.org.uk, jerry.cao@amlogic.com, victor.wan@amlogic.com Subject: [PATCH v4 4/4] ARM: defconfig: update multi_v7_defconfig Date: Sat, 20 Sep 2014 19:06:52 +0200 Message-Id: <1411232812-11594-5-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411232812-11594-1-git-send-email-carlo@caione.org> References: <1411232812-11594-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140920_100941_792374_CFFB1208 X-CRM114-Status: UNSURE ( 8.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Carlo Caione X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Update the multi_v7_defconfig enabling the watchdog driver for Meson SoCs. Reviewed-by: Guenter Roeck Signed-off-by: Carlo Caione --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 5b44796..560e6a9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -242,6 +242,7 @@ CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y +CONFIG_MESON_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_BCM590XX=y CONFIG_MFD_CROS_EC=y