* [PATCH] thermal: bcm2835: move to the broadcom subdirectory
@ 2017-04-17 21:04 Rafał Miłecki
2017-04-17 21:19 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Rafał Miłecki @ 2017-04-17 21:04 UTC (permalink / raw)
To: Zhang Rui, Eduardo Valentin
Cc: Stefan Wahren, Jon Mason, linux-pm, bcm-kernel-feedback-list,
Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
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 <rafal@milecki.pl>
---
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
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] thermal: bcm2835: move to the broadcom subdirectory
2017-04-17 21:04 [PATCH] thermal: bcm2835: move to the broadcom subdirectory Rafał Miłecki
@ 2017-04-17 21:19 ` Florian Fainelli
2017-04-17 21:21 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2017-04-17 21:19 UTC (permalink / raw)
To: Rafał Miłecki, Zhang Rui, Eduardo Valentin
Cc: Stefan Wahren, Jon Mason, linux-pm, bcm-kernel-feedback-list,
Rafał Miłecki
On 04/17/2017 02:04 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> 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 <rafal@milecki.pl>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] thermal: bcm2835: move to the broadcom subdirectory
2017-04-17 21:19 ` Florian Fainelli
@ 2017-04-17 21:21 ` Florian Fainelli
0 siblings, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2017-04-17 21:21 UTC (permalink / raw)
To: Florian Fainelli, Rafał Miłecki, Zhang Rui,
Eduardo Valentin
Cc: Stefan Wahren, Jon Mason, linux-pm, bcm-kernel-feedback-list,
Rafał Miłecki
On 04/17/2017 02:19 PM, Florian Fainelli wrote:
> On 04/17/2017 02:04 PM, Rafał Miłecki wrote:
>> From: Rafał Miłecki <rafal@milecki.pl>
>>
>> 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 <rafal@milecki.pl>
>> ---
>> I'm resending this patch including linux-pm mailing list. Sorry for
>> missing it previously.
>> ---
>
> What tree is this against?
Found it here:
https://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git/log/?h=next
with that:
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-17 21:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-17 21:04 [PATCH] thermal: bcm2835: move to the broadcom subdirectory Rafał Miłecki
2017-04-17 21:19 ` Florian Fainelli
2017-04-17 21:21 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox