can: rcar_can: Move Renesas CAN driver to rcar dir

This patch clubs the Renesas controller drivers in one rcar dir.

Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 13003a9472f2334c03fd5a760fb34c77fc74c2d8..22570ea3a8d217c13fde588a014b4c8010eb28da 100644 (file)
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -104,16 +104,6 @@ config CAN_JANZ_ICAN3
          This driver can also be built as a module. If so, the module will be
          called janz-ican3.ko.
 
-config CAN_RCAR
-       tristate "Renesas R-Car CAN controller"
-       depends on ARCH_RENESAS || ARM
-       ---help---
-         Say Y here if you want to use CAN controller found on Renesas R-Car
-         SoCs.
-
-         To compile this driver as a module, choose M here: the module will
-         be called rcar_can.
-
 config CAN_SUN4I
        tristate "Allwinner A10 CAN controller"
        depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST

diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 226d5b516746ad72696b04a78a75a9ff11b4c575..26ba4b794a0bd0b62ec3149ee851d396baea1029 100644 (file)
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_CAN_IFI_CANFD)   += ifi_canfd/
 obj-$(CONFIG_CAN_JANZ_ICAN3)   += janz-ican3.o
 obj-$(CONFIG_CAN_MSCAN)                += mscan/
 obj-$(CONFIG_CAN_M_CAN)                += m_can/
-obj-$(CONFIG_CAN_RCAR)         += rcar_can.o
 obj-$(CONFIG_CAN_SJA1000)      += sja1000/
 obj-$(CONFIG_CAN_SUN4I)                += sun4i_can.o
 obj-$(CONFIG_CAN_TI_HECC)      += ti_hecc.o

diff --git a/drivers/net/can/rcar/Kconfig b/drivers/net/can/rcar/Kconfig
index 6ea64d19ec26cc545b5a609f911832b8c0d38147..7b03a3a37db7e1158ea8e27671f306f8cd878904 100644 (file)
--- a/drivers/net/can/rcar/Kconfig
+++ b/drivers/net/can/rcar/Kconfig
@@ -1,3 +1,13 @@
+config CAN_RCAR
+       tristate "Renesas R-Car CAN controller"
+       depends on ARCH_RENESAS || ARM
+       ---help---
+         Say Y here if you want to use CAN controller found on Renesas R-Car
+         SoCs.
+
+         To compile this driver as a module, choose M here: the module will
+         be called rcar_can.
+
 config CAN_RCAR_CANFD
        tristate "Renesas R-Car CAN FD controller"
        depends on ARCH_RENESAS || ARM

diff --git a/drivers/net/can/rcar/Makefile b/drivers/net/can/rcar/Makefile
index cbaf498e1ac7751b344a8fb7af19443d49afe312..08de36a4cfccdc18a58cf560017b1dee7343f0b3 100644 (file)
--- a/drivers/net/can/rcar/Makefile
+++ b/drivers/net/can/rcar/Makefile
@@ -1,5 +1,6 @@
 #
-#  Makefile for the Renesas R-Car CAN FD controller driver
+#  Makefile for the Renesas R-Car CAN & CAN FD controller drivers
 #
 
+obj-$(CONFIG_CAN_RCAR)         += rcar_can.o
 obj-$(CONFIG_CAN_RCAR_CANFD)   += rcar_canfd.o

diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
similarity index 100%
rename from drivers/net/can/rcar_can.c
rename to drivers/net/can/rcar/rcar_can.c