From patchwork Mon Apr 17 21:04:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9684553 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EFB460326 for ; Mon, 17 Apr 2017 21:04:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F77028236 for ; Mon, 17 Apr 2017 21:04:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 127D12832B; Mon, 17 Apr 2017 21:04:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F7EA28236 for ; Mon, 17 Apr 2017 21:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755475AbdDQVEl (ORCPT ); Mon, 17 Apr 2017 17:04:41 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:34992 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755453AbdDQVEk (ORCPT ); Mon, 17 Apr 2017 17:04:40 -0400 Received: by mail-lf0-f66.google.com with SMTP id i3so17473756lfh.2 for ; Mon, 17 Apr 2017 14:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LcnHWUJIOFvAagbTvXdvFf+sS1W5IeU6+3lqZJ3ZOWY=; b=uMORdkJ+dcCLTVgL0Q46Ybu3ttdrIVO8y2FdLEc3Nhs3TCzFQ2q4iGzDeDn1+Z3kN1 6jO5mLLtfDAkAO8eejduTdm8cHsOyfwcUuRRfDVzE7Lnpk4/gCB0b1gfjnTT223G9vCx lVm/PVvRKvhKNmI/0mwOSEwNz8kROjCoMq/2HIj7IHNj1slnr6lC4C5FJuzFgJpVEkBT FV/OJmx3Ouo1Gi/HEFP1AWP31jj2LK0wA8fwlHIQio1u+A1oj+Ch2UoD7Y8fppY9jFXG 5y5tZOX2Egrk1nUIbgYhun5JSCiSHrsc9ifuUfFXhfjFwANPcptg3ztlbFvdcLCnrdH9 Trmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LcnHWUJIOFvAagbTvXdvFf+sS1W5IeU6+3lqZJ3ZOWY=; b=GNRwY6OTSrBmfmjH+etX5S4WCT6S3EbFn8lsF8hBqNcvXo7j/aV63zyPG6/db77ynW 1M8r2Un358h0vCAbsYk2ns9yjMVCEe8QDwblGBPizOHsyFxBD+djNr1O3RvnsMAG9qr2 qD/+2RAXbHYMA5dXfgU/aH3KPmc6VBnqQnZai0Q8GkadgY+U8ISIaqgWXMlfDfpS8tQk yJeN15sf1f9VxJr3SxxzNIbTMFNo50T4LMxSoitxbw1jH4w2TtD/1U1xhCZKiv8wJ44Q O/+bWneBYj73CU9NaOT52RJhkhrA9JwPbidhmP9t+gyPCJgUokuq8EZwuju3A2adG2SU a6vg== X-Gm-Message-State: AN3rC/4RX3SW9Je48uUS5kX0A/1xEOm9Q3W2e/R63JaktAIrYYnF1oZa fqgZ5XbeTc9Z7A== X-Received: by 10.25.99.86 with SMTP id x83mr3964994lfb.104.1492463079300; Mon, 17 Apr 2017 14:04:39 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id q84sm2194628lfi.31.2017.04.17.14.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Apr 2017 14:04:38 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Zhang Rui , Eduardo Valentin Cc: Stefan Wahren , Jon Mason , linux-pm@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH] thermal: bcm2835: move to the broadcom subdirectory Date: Mon, 17 Apr 2017 23:04:16 +0200 Message-Id: <20170417210416.16426-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki We already have 2 Broadcom drivers and at least 1 more is coming. This made us create broadcom subdirectory where bcm2835 should be moves now. Signed-off-by: Rafał Miłecki Acked-by: Florian Fainelli --- I'm resending this patch including linux-pm mailing list. Sorry for missing it previously. --- drivers/thermal/Kconfig | 8 -------- drivers/thermal/Makefile | 1 - drivers/thermal/broadcom/Kconfig | 8 ++++++++ drivers/thermal/broadcom/Makefile | 1 + drivers/thermal/{ => broadcom}/bcm2835_thermal.c | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename drivers/thermal/{ => broadcom}/bcm2835_thermal.c (100%) diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 6699843918fa..f786ae433032 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -468,12 +468,4 @@ config ZX2967_THERMAL the primitive temperature sensor embedded in zx2967 SoCs. This sensor generates the real time die temperature. -config BCM2835_THERMAL - tristate "Thermal sensors on bcm2835 SoC" - depends on ARCH_BCM2835 || COMPILE_TEST - depends on HAS_IOMEM - depends on THERMAL_OF - help - Support for thermal sensors on Broadcom bcm2835 SoCs. - endif diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index a1e9b8b4e897..e6834061da28 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -60,4 +60,3 @@ obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o -obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig index f0dea8a8e002..ab08af4654ef 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig @@ -1,3 +1,11 @@ +config BCM2835_THERMAL + tristate "Thermal sensors on bcm2835 SoC" + depends on ARCH_BCM2835 || COMPILE_TEST + depends on HAS_IOMEM + depends on THERMAL_OF + help + Support for thermal sensors on Broadcom bcm2835 SoCs. + config BCM_NS_THERMAL tristate "Northstar thermal driver" depends on ARCH_BCM_IPROC || COMPILE_TEST diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile index 059df9a0ed69..c6f62e4fd0ee 100644 --- a/drivers/thermal/broadcom/Makefile +++ b/drivers/thermal/broadcom/Makefile @@ -1 +1,2 @@ +obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o diff --git a/drivers/thermal/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c similarity index 100% rename from drivers/thermal/bcm2835_thermal.c rename to drivers/thermal/broadcom/bcm2835_thermal.c