thermal: renesas: Fix RZ/G3E fall-out

 - Restore sort order in MAINTAINERS and Kconfig,
 - Remove empty trailing line from Makefile.

Fixes: 19d3a401a617c68e ("thermal/drivers/renesas/rzg3e: Add thermal driver for the Renesas RZ/G3E SoC")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index caed82f4e950e96ec2b66f4ec037499b92c5c53f..24ad408f21ed5995ecce0786f887b5fc2de33235 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21701,13 +21701,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/iio/potentiometer/renesas,x9250.yaml
 F:     drivers/iio/potentiometer/x9250.c
 
-RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER
-M:     Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
-L:     linux-pm@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml
-F:     drivers/thermal/renesas/rzg3s_thermal.c
-
 RENESAS RZ/G3E THERMAL SENSOR UNIT DRIVER
 M:     John Madieu <john.madieu.xa@bp.renesas.com>
 L:     linux-pm@vger.kernel.org
@@ -21715,6 +21708,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/thermal/renesas,r9a09g047-tsu.yaml
 F:     drivers/thermal/renesas/rzg3e_thermal.c
 
+RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER
+M:     Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml
+F:     drivers/thermal/renesas/rzg3s_thermal.c
+
 RESET CONTROLLER FRAMEWORK
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 S:     Maintained

diff --git a/drivers/thermal/renesas/Kconfig b/drivers/thermal/renesas/Kconfig
index c762c1c30d5a211ae277bde728985f3b768e982a..5735c8728a31fcb52c464d360e0af64a6b5dc384 100644 (file)
--- a/drivers/thermal/renesas/Kconfig
+++ b/drivers/thermal/renesas/Kconfig
@@ -27,6 +27,13 @@ config RZG2L_THERMAL
          Enable this to plug the RZ/G2L thermal sensor driver into the Linux
          thermal framework.
 
+config RZG3E_THERMAL
+       tristate "Renesas RZ/G3E thermal driver"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       help
+         Enable this to plug the RZ/G3E thermal sensor driver into the Linux
+         thermal framework.
+
 config RZG3S_THERMAL
        tristate "Renesas RZ/G3S thermal driver"
        depends on ARCH_R9A08G045 || COMPILE_TEST
@@ -34,10 +41,3 @@ config RZG3S_THERMAL
        help
          Enable this to plug the RZ/G3S thermal sensor driver into the Linux
          thermal framework.
-
-config RZG3E_THERMAL
-       tristate "Renesas RZ/G3E thermal driver"
-       depends on ARCH_RENESAS || COMPILE_TEST
-       help
-         Enable this to plug the RZ/G3E thermal sensor driver into the Linux
-         thermal framework.

diff --git a/drivers/thermal/renesas/Makefile b/drivers/thermal/renesas/Makefile
index 0ea59224757226cc62bc2c736dff8d731f0e259e..8f5ae9af277cab5e0a141bd3e73b337249df7993 100644 (file)
--- a/drivers/thermal/renesas/Makefile
+++ b/drivers/thermal/renesas/Makefile
@@ -5,4 +5,3 @@ obj-$(CONFIG_RCAR_THERMAL)      += rcar_thermal.o
 obj-$(CONFIG_RZG2L_THERMAL)    += rzg2l_thermal.o
 obj-$(CONFIG_RZG3E_THERMAL)    += rzg3e_thermal.o
 obj-$(CONFIG_RZG3S_THERMAL)    += rzg3s_thermal.o
-