From patchwork Fri May 30 09:38:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 4269321 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@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 44AD29F1D6 for ; Fri, 30 May 2014 09:39:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9929A2037B for ; Fri, 30 May 2014 09:39:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 770FF2034A for ; Fri, 30 May 2014 09:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932908AbaE3JjV (ORCPT ); Fri, 30 May 2014 05:39:21 -0400 Received: from mail-ie0-f181.google.com ([209.85.223.181]:64583 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932902AbaE3JjS (ORCPT ); Fri, 30 May 2014 05:39:18 -0400 Received: by mail-ie0-f181.google.com with SMTP id rp18so1423722iec.26 for ; Fri, 30 May 2014 02:39:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zfFPyTTJBN3x62yf58ZqQ7YizqiNqxa/0BiqUqHvKk4=; b=DW9Hql9c0TXURraUoW6t995GiRPvxd7X7NaDJ9/8VXEFfV1/a3Oc0ANIxaYQSqpkv5 An7xvH03IJsewSNrqVgjJGOTj2ZuXw8J8SKhM4x1635T7X8EBs092/7nz7eXBz4Jf6zR p2bCnkFvxUBjR3dzEuzEyNsi475qZ1zhb7XKEeM4Vj1viiXAayCSNSTFfTMVa+Orlm+r UfVsgioFd3X1DOfH4D6yZJxbw4GrG7OGy36Kl9g3xVBSk3+lO3W4BPmR64+HCWBUg+4/ ediWmgsZa6TlK+qFezZ/0gRv9YqSnzDPzzsSJ6+foynfqfUGSb3G0ON7g1pyEPT1gVPi zbIA== X-Gm-Message-State: ALoCoQmD3s2RYo2guZIUo08AU5QussYXNKObJ6Kx4T1HXZh+Y74fE8VXA+8Xi45JbTfDDjkpiLeQ X-Received: by 10.42.37.196 with SMTP id z4mr14147633icd.80.1401442757833; Fri, 30 May 2014 02:39:17 -0700 (PDT) Received: from localhost.localdomain (host109-148-113-200.range109-148.btcentralplus.com. [109.148.113.200]) by mx.google.com with ESMTPSA id kw1sm4289587igb.4.2014.05.30.02.39.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 May 2014 02:39:17 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, rui.zhang@intel.com, eduardo.valentin@ti.com, ajitpal.singh@st.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, maxime.coquelin@st.com, patrice.chotard@st.com Subject: [PATCH 6/6] ARM: multi_v7_defconfig: Configure in ST's Thermal Controller Date: Fri, 30 May 2014 10:38:35 +0100 Message-Id: <1401442715-6350-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401442715-6350-1-git-send-email-lee.jones@linaro.org> References: <1401442715-6350-1-git-send-email-lee.jones@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Signed-off-by: Ajit Pal Singh Signed-off-by: Lee Jones --- arch/arm/configs/multi_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d4e8a47..dcc4e3e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -204,6 +204,8 @@ CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_DOVE_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_ST_THERMAL_SYSCFG=y +CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y