From patchwork Tue Sep 16 20:43:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 4920191 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 53A2F9F32F for ; Tue, 16 Sep 2014 20:44:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FDAE2015D for ; Tue, 16 Sep 2014 20:46:44 +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 DC3E620127 for ; Tue, 16 Sep 2014 20:46:43 +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 1XTzcB-0003FY-IC; Tue, 16 Sep 2014 20:44:43 +0000 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XTzbn-0002x8-Pg for linux-arm-kernel@lists.infradead.org; Tue, 16 Sep 2014 20:44:20 +0000 Received: by mail-wi0-f170.google.com with SMTP id em10so4482784wid.1 for ; Tue, 16 Sep 2014 13:43:57 -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=UDbmcxZG9B9BUn5Kq/FfsE8v38KuHz8SvYAhoDAfMyQ=; b=L80y5M0a2mTuKIzQDAnsMo1k7xjtBxZ9nsMckT6EoRKekWE4Uk6RpP1SvcuG/kmReF Z4XRYr0xewvFZbUy2UT/yLulAyyEygYCG/UoKdWrW47Ro4VswkhlUmphYUzUFnEKmVXE zYlU9eqEIAZceWJAvK4ygNvUqThTrhu38SoF12wLUrzYoira1l6du14IyX9/2YDpIgXb dUZrvJycsTMG56v6pDyNBj2OTRUtSF3W95DPD5/PU4NfFJgeUZdvZ4ARtaXGcM3tkQwS PJ3n6YXuxIrdu25CHqyLPUXeeJvgFonIFP13XOCzrb/EHU91GHd281RwhI1++mAWfnez uWEQ== X-Received: by 10.195.12.103 with SMTP id ep7mr16207636wjd.121.1410900237854; Tue, 16 Sep 2014 13:43:57 -0700 (PDT) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id mx19sm3112105wic.3.2014.09.16.13.43.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Sep 2014 13:43:57 -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 Subject: [PATCH 4/4] ARM: defconfig: update multi_v7_defconfig Date: Tue, 16 Sep 2014 22:43:37 +0200 Message-Id: <1410900217-5162-5-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410900217-5162-1-git-send-email-carlo@caione.org> References: <1410900217-5162-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140916_134420_119619_4C140DB4 X-CRM114-Status: UNSURE ( 9.07 ) 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.4 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. 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