[PATCH 0/2] thermal: renesas: Group drivers and update dependencies

[PATCH 0/2] thermal: renesas: Group drivers and update dependencies

[Niklas Söderlund]

Hello,

This small series moves and groups all renesas thermal drivers in a 
vendor directory as done by some other vendors. The idea is to make it 
easier to spot issues they are worked on by the same set of people.

Patch 2/2 fix such an issue where one dependency was missed for one the 
drivers.

@Biju: There is no entry for rzg2l_thermal in MAINTAINERS. Should we 
update that with an entry for you?

Niklas Söderlund (2):
  thermal: renesas: Group all renesas thermal drivers together
  thermal: renesas: rcar: Add dependency on OF

 MAINTAINERS                                   |  4 +--
 drivers/thermal/Kconfig                       | 28 ++-----------------
 drivers/thermal/Makefile                      |  4 +--
 drivers/thermal/renesas/Kconfig               | 28 +++++++++++++++++++
 drivers/thermal/renesas/Makefile              |  5 ++++
 .../thermal/{ => renesas}/rcar_gen3_thermal.c |  2 +-
 drivers/thermal/{ => renesas}/rcar_thermal.c  |  2 +-
 drivers/thermal/{ => renesas}/rzg2l_thermal.c |  2 +-
 8 files changed, 41 insertions(+), 34 deletions(-)
 create mode 100644 drivers/thermal/renesas/Kconfig
 create mode 100644 drivers/thermal/renesas/Makefile
 rename drivers/thermal/{ => renesas}/rcar_gen3_thermal.c (99%)
 rename drivers/thermal/{ => renesas}/rcar_thermal.c (99%)
 rename drivers/thermal/{ => renesas}/rzg2l_thermal.c (99%)

-- 
2.45.0

[PATCH 1/2] thermal: renesas: Group all renesas thermal drivers together

[Niklas Söderlund]

Move all Renesas thermal drivers to a vendor specific directory.

All drivers are moved verbatim apart from the updated include path for
thermal_hwmon.h.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 MAINTAINERS                                   |  4 +--
 drivers/thermal/Kconfig                       | 28 ++-----------------
 drivers/thermal/Makefile                      |  4 +--
 drivers/thermal/renesas/Kconfig               | 27 ++++++++++++++++++
 drivers/thermal/renesas/Makefile              |  5 ++++
 .../thermal/{ => renesas}/rcar_gen3_thermal.c |  2 +-
 drivers/thermal/{ => renesas}/rcar_thermal.c  |  2 +-
 drivers/thermal/{ => renesas}/rzg2l_thermal.c |  2 +-
 8 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 drivers/thermal/renesas/Kconfig
 create mode 100644 drivers/thermal/renesas/Makefile
 rename drivers/thermal/{ => renesas}/rcar_gen3_thermal.c (99%)
 rename drivers/thermal/{ => renesas}/rcar_thermal.c (99%)
 rename drivers/thermal/{ => renesas}/rzg2l_thermal.c (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index ec0284125e8f..ae2f9c7d6c4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18790,8 +18790,8 @@ L:	linux-renesas-soc@vger.kernel.org
 S:	Supported
 F:	Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
 F:	Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
-F:	drivers/thermal/rcar_gen3_thermal.c
-F:	drivers/thermal/rcar_thermal.c
+F:	drivers/thermal/renesas/rcar_gen3_thermal.c
+F:	drivers/thermal/renesas/rcar_thermal.c
 
 RENESAS RIIC DRIVER
 M:	Chris Brandt <chris.brandt@renesas.com>
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 204ed89a3ec9..ed16897584b4 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -343,32 +343,6 @@ config ROCKCHIP_THERMAL
 	  trip point. Cpufreq is used as the cooling device and will throttle
 	  CPUs when the Temperature crosses the passive trip point.
 
-config RCAR_THERMAL
-	tristate "Renesas R-Car thermal driver"
-	depends on ARCH_RENESAS || COMPILE_TEST
-	depends on HAS_IOMEM
-	help
-	  Enable this to plug the R-Car thermal sensor driver into the Linux
-	  thermal framework.
-
-config RCAR_GEN3_THERMAL
-	tristate "Renesas R-Car Gen3 and RZ/G2 thermal driver"
-	depends on ARCH_RENESAS || COMPILE_TEST
-	depends on HAS_IOMEM
-	depends on OF
-	help
-	  Enable this to plug the R-Car Gen3 or RZ/G2 thermal sensor driver into
-	  the Linux thermal framework.
-
-config RZG2L_THERMAL
-	tristate "Renesas RZ/G2L thermal driver"
-	depends on ARCH_RENESAS || COMPILE_TEST
-	depends on HAS_IOMEM
-	depends on OF
-	help
-	  Enable this to plug the RZ/G2L thermal sensor driver into the Linux
-	  thermal framework.
-
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
 	depends on MACH_KIRKWOOD || COMPILE_TEST
@@ -459,6 +433,8 @@ depends on (ARCH_STI || ARCH_STM32) && OF
 source "drivers/thermal/st/Kconfig"
 endmenu
 
+source "drivers/thermal/renesas/Kconfig"
+
 source "drivers/thermal/tegra/Kconfig"
 
 config GENERIC_ADC_THERMAL
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 5cdf7d68687f..ce7a4752ef52 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -38,9 +38,7 @@ obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
 obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
-obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
-obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
-obj-$(CONFIG_RZG2L_THERMAL)	+= rzg2l_thermal.o
+obj-y				+= renesas/
 obj-$(CONFIG_KIRKWOOD_THERMAL)  += kirkwood_thermal.o
 obj-y				+= samsung/
 obj-$(CONFIG_DOVE_THERMAL)	+= dove_thermal.o
diff --git a/drivers/thermal/renesas/Kconfig b/drivers/thermal/renesas/Kconfig
new file mode 100644
index 000000000000..1be65a03d290
--- /dev/null
+++ b/drivers/thermal/renesas/Kconfig
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config RCAR_THERMAL
+	tristate "Renesas R-Car thermal driver"
+	depends on ARCH_RENESAS || COMPILE_TEST
+	depends on HAS_IOMEM
+	help
+	  Enable this to plug the R-Car thermal sensor driver into the Linux
+	  thermal framework.
+
+config RCAR_GEN3_THERMAL
+	tristate "Renesas R-Car Gen3 and RZ/G2 thermal driver"
+	depends on ARCH_RENESAS || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on OF
+	help
+	  Enable this to plug the R-Car Gen3 or RZ/G2 thermal sensor driver into
+	  the Linux thermal framework.
+
+config RZG2L_THERMAL
+	tristate "Renesas RZ/G2L thermal driver"
+	depends on ARCH_RENESAS || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on OF
+	help
+	  Enable this to plug the RZ/G2L thermal sensor driver into the Linux
+	  thermal framework.
diff --git a/drivers/thermal/renesas/Makefile b/drivers/thermal/renesas/Makefile
new file mode 100644
index 000000000000..bf9cb3cb94d6
--- /dev/null
+++ b/drivers/thermal/renesas/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
+obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
+obj-$(CONFIG_RZG2L_THERMAL)	+= rzg2l_thermal.o
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
similarity index 99%
rename from drivers/thermal/rcar_gen3_thermal.c
rename to drivers/thermal/renesas/rcar_gen3_thermal.c
index a764cb1115a5..c5a3895bb405 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
@@ -16,7 +16,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/thermal.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 /* Register offsets */
 #define REG_GEN3_IRQSTR		0x04
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/renesas/rcar_thermal.c
similarity index 99%
rename from drivers/thermal/rcar_thermal.c
rename to drivers/thermal/renesas/rcar_thermal.c
index 925183753fcb..1e93f60b6d74 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/renesas/rcar_thermal.c
@@ -19,7 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/thermal.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 #define IDLE_INTERVAL	5000
 
diff --git a/drivers/thermal/rzg2l_thermal.c b/drivers/thermal/renesas/rzg2l_thermal.c
similarity index 99%
rename from drivers/thermal/rzg2l_thermal.c
rename to drivers/thermal/renesas/rzg2l_thermal.c
index 04efd824ac4c..0e1cb9045ee6 100644
--- a/drivers/thermal/rzg2l_thermal.c
+++ b/drivers/thermal/renesas/rzg2l_thermal.c
@@ -17,7 +17,7 @@
 #include <linux/thermal.h>
 #include <linux/units.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 #define CTEMP_MASK	0xFFF
 
-- 
2.45.0

[PATCH 2/2] thermal: renesas: rcar: Add dependency on OF

[Niklas Söderlund]

The R-Car thermal driver depends on OF, describe this.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 drivers/thermal/renesas/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/thermal/renesas/Kconfig b/drivers/thermal/renesas/Kconfig
index 1be65a03d290..dcf5fc5ae08e 100644
--- a/drivers/thermal/renesas/Kconfig
+++ b/drivers/thermal/renesas/Kconfig
@@ -4,6 +4,7 @@ config RCAR_THERMAL
 	tristate "Renesas R-Car thermal driver"
 	depends on ARCH_RENESAS || COMPILE_TEST
 	depends on HAS_IOMEM
+	depends on OF
 	help
 	  Enable this to plug the R-Car thermal sensor driver into the Linux
 	  thermal framework.
-- 
2.45.0

RE: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies

[Biju Das]

Hi Niklas,

> -----Original Message-----
> From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Subject: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies
> 
> Hello,
> 
> This small series moves and groups all renesas thermal drivers in a vendor directory as done by
> some other vendors. The idea is to make it easier to spot issues they are worked on by the same set
> of people.
> 
> Patch 2/2 fix such an issue where one dependency was missed for one the drivers.
> 
> @Biju: There is no entry for rzg2l_thermal in MAINTAINERS. Should we update that with an entry for
> you?

Yes Please.

Thanks,
Biju

> 
> Niklas Söderlund (2):
>   thermal: renesas: Group all renesas thermal drivers together
>   thermal: renesas: rcar: Add dependency on OF
> 
>  MAINTAINERS                                   |  4 +--
>  drivers/thermal/Kconfig                       | 28 ++-----------------
>  drivers/thermal/Makefile                      |  4 +--
>  drivers/thermal/renesas/Kconfig               | 28 +++++++++++++++++++
>  drivers/thermal/renesas/Makefile              |  5 ++++
>  .../thermal/{ => renesas}/rcar_gen3_thermal.c |  2 +-  drivers/thermal/{ =>
> renesas}/rcar_thermal.c  |  2 +-  drivers/thermal/{ => renesas}/rzg2l_thermal.c |  2 +-
>  8 files changed, 41 insertions(+), 34 deletions(-)  create mode 100644
> drivers/thermal/renesas/Kconfig  create mode 100644 drivers/thermal/renesas/Makefile  rename
> drivers/thermal/{ => renesas}/rcar_gen3_thermal.c (99%)  rename drivers/thermal/{ =>
> renesas}/rcar_thermal.c (99%)  rename drivers/thermal/{ => renesas}/rzg2l_thermal.c (99%)
> 
> --
> 2.45.0

Re: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies

[Niklas Söderlund]

Hello Biju,

On 2024-05-07 06:58:59 +0000, Biju Das wrote:
> Hi Niklas,
> 
> > -----Original Message-----
> > From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > Subject: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies
> > 
> > Hello,
> > 
> > This small series moves and groups all renesas thermal drivers in a vendor directory as done by
> > some other vendors. The idea is to make it easier to spot issues they are worked on by the same set
> > of people.
> > 
> > Patch 2/2 fix such an issue where one dependency was missed for one the drivers.
> > 
> > @Biju: There is no entry for rzg2l_thermal in MAINTAINERS. Should we update that with an entry for
> > you?
> 
> Yes Please.

Sounds good, once this series is merged could you send a patch adding 
yourself?

> 
> Thanks,
> Biju
> 
> > 
> > Niklas Söderlund (2):
> >   thermal: renesas: Group all renesas thermal drivers together
> >   thermal: renesas: rcar: Add dependency on OF
> > 
> >  MAINTAINERS                                   |  4 +--
> >  drivers/thermal/Kconfig                       | 28 ++-----------------
> >  drivers/thermal/Makefile                      |  4 +--
> >  drivers/thermal/renesas/Kconfig               | 28 +++++++++++++++++++
> >  drivers/thermal/renesas/Makefile              |  5 ++++
> >  .../thermal/{ => renesas}/rcar_gen3_thermal.c |  2 +-  drivers/thermal/{ =>
> > renesas}/rcar_thermal.c  |  2 +-  drivers/thermal/{ => renesas}/rzg2l_thermal.c |  2 +-
> >  8 files changed, 41 insertions(+), 34 deletions(-)  create mode 100644
> > drivers/thermal/renesas/Kconfig  create mode 100644 drivers/thermal/renesas/Makefile  rename
> > drivers/thermal/{ => renesas}/rcar_gen3_thermal.c (99%)  rename drivers/thermal/{ =>
> > renesas}/rcar_thermal.c (99%)  rename drivers/thermal/{ => renesas}/rzg2l_thermal.c (99%)
> > 
> > --
> > 2.45.0
> 

-- 
Kind Regards,
Niklas Söderlund

RE: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies

[Biju Das]

Hi Niklas,

> -----Original Message-----
> From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Sent: Wednesday, May 8, 2024 1:26 PM
> Subject: Re: [PATCH 0/2] thermal: renesas: Group drivers and update dependencies
> 
> Hello Biju,
> 
> On 2024-05-07 06:58:59 +0000, Biju Das wrote:
> > Hi Niklas,
> >
> > > -----Original Message-----
> > > From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > > Subject: [PATCH 0/2] thermal: renesas: Group drivers and update
> > > dependencies
> > >
> > > Hello,
> > >
> > > This small series moves and groups all renesas thermal drivers in a
> > > vendor directory as done by some other vendors. The idea is to make
> > > it easier to spot issues they are worked on by the same set of people.
> > >
> > > Patch 2/2 fix such an issue where one dependency was missed for one the drivers.
> > >
> > > @Biju: There is no entry for rzg2l_thermal in MAINTAINERS. Should we
> > > update that with an entry for you?
> >
> > Yes Please.
> 
> Sounds good, once this series is merged could you send a patch adding yourself?

Sure, will do.

Cheers,
Biju