From patchwork Fri Jan 18 11:40:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 14113 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C4AB523F02 for ; Fri, 18 Jan 2013 11:41:37 +0000 (UTC) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by fiordland.canonical.com (Postfix) with ESMTP id 7942FA181AC for ; Fri, 18 Jan 2013 11:41:37 +0000 (UTC) Received: by mail-vb0-f46.google.com with SMTP id b13so3554814vby.33 for ; Fri, 18 Jan 2013 03:41:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=KIFdOahQFtpkx3dVo2P2iYVS2RFr3CEWKRHMCO0A4Zk=; b=ROKcFuAWUYnwXWpN1sC7MxeziLJhDv8tXBdaWayPzyjtH1AH904mp/BtSVHAwYb68q FZW0lXRWtbVrMKgRO17xtg87ft1zHrP1TFdqSkQWPjsIa8hCsY8IB5Bq/yN60FNmEw4i HSK4GuEJXNFZliHW1xJtWrRcdqKIqPulMd3udbQBHwN5ySRcl0YDHKAbM6HTNV1ndV8c Xn9pbsvZYB12J6EVEKQaGgAcHG9lcuQjuwdv+e3ZAF3mi6x1DO15DxvRjKLBq9I2Qs4e ePI+cbw0aPEGfiwjRpMMSvA+bSY2inufWN6Wgh+K6j++mownJcvKTHX/dTp1HwahYEgs SXIg== X-Received: by 10.52.88.168 with SMTP id bh8mr7879683vdb.51.1358509297013; Fri, 18 Jan 2013 03:41:37 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp79387veb; Fri, 18 Jan 2013 03:41:36 -0800 (PST) X-Received: by 10.194.90.116 with SMTP id bv20mr13581819wjb.33.1358509296128; Fri, 18 Jan 2013 03:41:36 -0800 (PST) Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by mx.google.com with ESMTPS id b7si8045437eep.51.2013.01.18.03.41.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jan 2013 03:41:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.169 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=209.85.215.169; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.215.169 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-ea0-f169.google.com with SMTP id d13so1465933eaa.28 for ; Fri, 18 Jan 2013 03:41:35 -0800 (PST) X-Received: by 10.14.176.66 with SMTP id a42mr25319594eem.34.1358509295542; Fri, 18 Jan 2013 03:41:35 -0800 (PST) Received: from localhost ([2a01:2029:1:1653:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id a2sm6971582eeo.1.2013.01.18.03.41.29 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 18 Jan 2013 03:41:34 -0800 (PST) From: Fabio Baltieri To: linux-watchdog@vger.kernel.org, Samuel Ortiz , Wim Van Sebroeck Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Srinidhi Kasagar , Fabio Baltieri Subject: [PATCH 4/4] mfd: db8500-prcmu: add ux500_wdt mfd_cell Date: Fri, 18 Jan 2013 12:40:14 +0100 Message-Id: <1358509214-22407-5-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1358509214-22407-1-git-send-email-fabio.baltieri@linaro.org> References: <1358509214-22407-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQmZa10vfLj5KJR8p5iLAzUi6f4ni7feuGDE6lLueKZ0U+Vhrr/4opo+wr9XbAv1+Ybt33Pv This patch adds the necessary structures to use the watchdog functionality of PRCMU. The watchdog driver is named ux500_wdt. Acked-by: Lee Jones Signed-off-by: Fabio Baltieri --- drivers/mfd/db8500-prcmu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 7a63fa8..e42a417 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -3074,6 +3075,11 @@ static struct resource ab8500_resources[] = { } }; +static struct ux500_wdt_data db8500_wdt_pdata = { + .timeout = 600, /* 10 minutes */ + .has_28_bits_resolution = true, +}; + static struct mfd_cell db8500_prcmu_devs[] = { { .name = "db8500-prcmu-regulators", @@ -3088,6 +3094,12 @@ static struct mfd_cell db8500_prcmu_devs[] = { .pdata_size = sizeof(db8500_cpufreq_table), }, { + .name = "ux500_wdt", + .platform_data = &db8500_wdt_pdata, + .pdata_size = sizeof(db8500_wdt_pdata), + .id = -1, + }, + { .name = "ab8500-core", .of_compatible = "stericsson,ab8500", .num_resources = ARRAY_SIZE(ab8500_resources),