From patchwork Fri Mar 22 22:25:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2323141 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 1CC86400E6 for ; Fri, 22 Mar 2013 22:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423418Ab3CVW0S (ORCPT ); Fri, 22 Mar 2013 18:26:18 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:33512 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423375Ab3CVW0S (ORCPT ); Fri, 22 Mar 2013 18:26:18 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 14ECF24C2; Fri, 22 Mar 2013 23:26:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (20.222.3.200.ros.express.com.ar [200.3.222.20]) by mail.free-electrons.com (Postfix) with ESMTPA id 656E07DE; Fri, 22 Mar 2013 23:26:14 +0100 (CET) From: Ezequiel Garcia To: , Cc: Jason Cooper , Lior Amsalem , Zhang Rui , Nobuhiro Iwamatsu , Thomas Petazzoni , Gregory Clement , Sebastian Hesselbarth , Andrew Lunn , Ezequiel Garcia Subject: [PATCH v2 14/14] ARM: configs: Update mvebu, dove and kirkwood defconfigs for thermal Date: Fri, 22 Mar 2013 19:25:14 -0300 Message-Id: <1363991114-4225-15-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The driver for Dove, Kirkwood and Armada XP/370 SoC has been integrated in a single driver called mvebu-thermal. Update the defconfig for each platform to reflect this. Signed-off-by: Ezequiel Garcia --- Please note that this change was done independentely from the thermal driver patch in order to facilitate its merge by the respective maintainers. arch/arm/configs/dove_defconfig | 2 +- arch/arm/configs/kirkwood_defconfig | 2 +- arch/arm/configs/mvebu_defconfig | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 4364eff..2136442 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -76,7 +76,7 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y # CONFIG_HWMON is not set CONFIG_THERMAL=y -CONFIG_DOVE_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 8f0065b..081d39f 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -120,7 +120,7 @@ CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set CONFIG_THERMAL=y -CONFIG_KIRKWOOD_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_HID_DRAGONRISE=y diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 2ec8119..f2ac593 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -49,6 +49,8 @@ CONFIG_MTD_M25P80=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y