From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: Re: [PATCH] thermal: bcm2835: move to the broadcom subdirectory Date: Mon, 17 Apr 2017 14:19:37 -0700 Message-ID: <4d01beef-41a4-1a21-5aea-af4c9b698269@gmail.com> References: <20170417210416.16426-1-zajec5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from mail-oi0-f68.google.com ([209.85.218.68]:34438 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755163AbdDQVTk (ORCPT ); Mon, 17 Apr 2017 17:19:40 -0400 Received: by mail-oi0-f68.google.com with SMTP id t14so21461948oif.1 for ; Mon, 17 Apr 2017 14:19:39 -0700 (PDT) In-Reply-To: <20170417210416.16426-1-zajec5@gmail.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Zhang Rui , Eduardo Valentin Cc: Stefan Wahren , Jon Mason , linux-pm@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= On 04/17/2017 02:04 PM, Rafał Miłecki wrote: > 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 > --- > I'm resending this patch including linux-pm mailing list. Sorry for > missing it previously. > --- What tree is this against? > 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 How are we recursing into drivers/thermal/broadcom? > 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. > + Don't we also need a: source drivers/thermal/broadcom/Kconfig to be placed within drivers/thermal/Kconfig? > 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 > -- Florian