From patchwork Thu Feb 27 21:28:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 3735991 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 1BBDC9F2F7 for ; Thu, 27 Feb 2014 21:31:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F31B42025A for ; Thu, 27 Feb 2014 21:31:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F292E2024D for ; Thu, 27 Feb 2014 21:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752359AbaB0V3g (ORCPT ); Thu, 27 Feb 2014 16:29:36 -0500 Received: from mail-ee0-f42.google.com ([74.125.83.42]:58820 "EHLO mail-ee0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751202AbaB0V2T (ORCPT ); Thu, 27 Feb 2014 16:28:19 -0500 Received: by mail-ee0-f42.google.com with SMTP id d17so1778939eek.29 for ; Thu, 27 Feb 2014 13:28:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MN5WS9HVNZg1/b9JYV896vSRy/rsMnZZgMqrUs11tiM=; b=oix0fUJ0ZE5IV3mZQdjgD1EfF/LZ3ctntKC8WLt5giQrzHbz0OC1GPL0kjuI5RWXve R9nbVd/K3FAVE2AJl85QC6H4wB4zoCsJmEPqmY6vYG5mYUw6ds3V6UZ8f3rUDzrGEOEy uRwsN/aZEn5ivlld5de64ATBKSbgA1/NMF+9LwUpWJd7SWcVdGfYFm5B5UvsnCDLnxx+ bfQR/MrHmB/6L0qq0UC4sWNDzrKb5PlK9wH/TmvFQd6/dwtdubdRB0weLqeQyFPLdVmH 6Aa8Tvu79YDEmZe6JPr6d1na1zsOfeZleCFeVwvhmRgtrEM7TDtX+F2uj3DwjATZP3LI EYpA== X-Received: by 10.14.2.66 with SMTP id 42mr9287462eee.24.1393536497190; Thu, 27 Feb 2014 13:28:17 -0800 (PST) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id x3sm2219451eep.17.2014.02.27.13.28.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Feb 2014 13:28:16 -0800 (PST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Chris Ball , Zhang Rui , Eduardo Valentin , Wim Van Sebroeck , Liam Girdwood , Mark Brown , Jason Cooper , Andrew Lunn , Gregory Clement , alsa-devel@alsa-project.org, linux-watchdog@vger.kernel.org, linux-pm@vger.kernel.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: dove: prepare new Dove DT Kconfig variable Date: Thu, 27 Feb 2014 22:28:03 +0100 Message-Id: <1393536486-3827-3-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1393536486-3827-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1393536486-3827-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 DT-enabled Dove will move over from ARCH_DOVE in mach-dove to MACH_DOVE in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new DT-only MACH_DOVE to mmc, thermal, wdt, and asoc Kconfigs. Signed-off-by: Sebastian Hesselbarth --- Cc: Chris Ball Cc: Zhang Rui Cc: Eduardo Valentin Cc: Wim Van Sebroeck Cc: Liam Girdwood Cc: Mark Brown Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: alsa-devel@alsa-project.org Cc: linux-watchdog@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/mmc/host/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 1384f67abe21..a69e48b582e5 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX config MMC_SDHCI_DOVE tristate "SDHCI support on Marvell's Dove SoC" - depends on ARCH_DOVE + depends on ARCH_DOVE || MACH_DOVE depends on MMC_SDHCI_PLTFM select MMC_SDHCI_IO_ACCESSORS help diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 35c066489a19..07b5e56e9a97 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -150,7 +150,7 @@ config KIRKWOOD_THERMAL config DOVE_THERMAL tristate "Temperature sensor on Marvell Dove SoCs" - depends on ARCH_DOVE + depends on ARCH_DOVE || MACH_DOVE depends on OF help Support for the Dove thermal sensor driver in the Linux thermal diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 79d25894343a..5659c62a175c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -292,7 +292,7 @@ config DAVINCI_WATCHDOG config ORION_WATCHDOG tristate "Orion watchdog" - depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE + depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE select WATCHDOG_CORE help Say Y here if to include support for the watchdog timer diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index 78ed4a42ad21..a1506d57e646 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig @@ -1,6 +1,6 @@ config SND_KIRKWOOD_SOC tristate "SoC Audio for the Marvell Kirkwood and Dove chips" - depends on ARCH_KIRKWOOD || ARCH_DOVE || COMPILE_TEST + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || COMPILE_TEST help Say Y or M if you want to add support for codecs attached to the Kirkwood I2S interface. You will also need to select the