summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-04-17 23:04:16 +0200
committerEduardo Valentin <edubezval@gmail.com>2017-04-23 08:55:37 -0700
commit6892cf07e7337776c0b006db3b96a96bf071acb7 (patch)
tree8cecf00c77a5c6eacf4e0df44884f719d01fcd41 /drivers/thermal
parentcb9b323b5395d0d0cea2922d4f8ad588cf064f46 (diff)
downloadlinux-stable-6892cf07e7337776c0b006db3b96a96bf071acb7.tar.gz
linux-stable-6892cf07e7337776c0b006db3b96a96bf071acb7.tar.bz2
linux-stable-6892cf07e7337776c0b006db3b96a96bf071acb7.zip
thermal: bcm2835: move to the broadcom subdirectory
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. Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/Kconfig8
-rw-r--r--drivers/thermal/Makefile1
-rw-r--r--drivers/thermal/broadcom/Kconfig8
-rw-r--r--drivers/thermal/broadcom/Makefile1
-rw-r--r--drivers/thermal/broadcom/bcm2835_thermal.c (renamed from drivers/thermal/bcm2835_thermal.c)0
5 files changed, 9 insertions, 9 deletions
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
index 0ecf80890c84..0ecf80890c84 100644
--- a/drivers/thermal/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c