From patchwork Thu Jun 5 15:06:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 4306481 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 03898BEEA7 for ; Thu, 5 Jun 2014 15:08:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 729152020F for ; Thu, 5 Jun 2014 15:08:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA8A22015A for ; Thu, 5 Jun 2014 15:08:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679AbaFEPH4 (ORCPT ); Thu, 5 Jun 2014 11:07:56 -0400 Received: from mail-ie0-f176.google.com ([209.85.223.176]:61041 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523AbaFEPHy (ORCPT ); Thu, 5 Jun 2014 11:07:54 -0400 Received: by mail-ie0-f176.google.com with SMTP id rl12so1003392iec.35 for ; Thu, 05 Jun 2014 08:07:53 -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=dzTiFmgryoNtXuTvOfselAinWdmbLIa20xAh2N/texIQtKbCocwOV/EC3sMUA643xf Q7SbxDTmz5mPGcWx2VwV8pGO+pMJtrDrs0FKY5tdJf51XrbYT0Ts26ulh/0fPhUH//0g PCAixPDVFdao/ekS/4Jmqkt6DhszQMJTgnb2LD72PcjY40gWn2UM1hnO6CmZdPY6ZZz+ F1Q3sZQufgM5HDCoHLBTCA9b/AQfTvihf9nvdBuut7HtmcBAjScgJlXEFUmbHBpuiR3W 7A0EkUg0GbJVX/JrI4P5FejO/SJiarCwfBLTsLPgAuEg24PQ/l9Wij6PIHebNlE6BAK5 K05A== X-Gm-Message-State: ALoCoQnaNXhLAi2Oo7XOjkBH98v1xyehQwKLJ842HcMd61nzV2WKPR37IoI2KvmXClFmQNz2V+4e X-Received: by 10.50.79.196 with SMTP id l4mr21200345igx.16.1401980873466; Thu, 05 Jun 2014 08:07:53 -0700 (PDT) Received: from localhost.localdomain (host86-181-29-77.range86-181.btcentralplus.com. [86.181.29.77]) by mx.google.com with ESMTPSA id 2sm19108949igs.17.2014.06.05.08.07.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Jun 2014 08:07:53 -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, ajitpal.singh@st.com, edubezval@gmail.com, rui.zhang@intel.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: Thu, 5 Jun 2014 16:06:59 +0100 Message-Id: <1401980819-19962-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401980819-19962-1-git-send-email-lee.jones@linaro.org> References: <1401980819-19962-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