ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 9 Jul 2014 13:12:42 +0000 (15:12 +0200)
committerSimon Horman <horms+renesas@verge.net.au>
Sun, 17 Aug 2014 00:00:56 +0000 (09:00 +0900)
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7791_add_dt_devices()
function completely.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/mach-shmobile/board-koelsch-reference.c
arch/arm/mach-shmobile/r8a7791.h
arch/arm/mach-shmobile/setup-r8a7791.c

index 23486c081a69891096cd08c157d8dfc7fd94384b..8f36d4f793a8e3160e723277d69f5ff5d5acf273 100644 (file)
        };
 };
 
+&cmt0 {
+       status = "ok";
+};
+
 &sata0 {
        status = "okay";
 };
index 3ff88c138896ad996652df6aec110355ac7f30cf..9db5e6774fb75753d3a8199301d75887132f5640 100644 (file)
@@ -88,7 +88,6 @@ static void __init koelsch_add_du_device(void)
  * devices until they get moved to DT.
  */
 static const struct clk_name clk_names[] __initconst = {
-       { "cmt0", "fck", "sh-cmt-48-gen2.0" },
        { "du0", "du.0", "rcar-du-r8a7791" },
        { "du1", "du.1", "rcar-du-r8a7791" },
        { "lvds0", "lvds.0", "rcar-du-r8a7791" },
@@ -97,7 +96,6 @@ static const struct clk_name clk_names[] __initconst = {
 static void __init koelsch_add_standard_devices(void)
 {
        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-       r8a7791_add_dt_devices();
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
        koelsch_add_du_device();
index 86eae7bceb6fcdfb4b5b4b419d784647ceebba47..c1bf7abefa5a6b0b2a0bdb72999e501afbc42f7e 100644 (file)
@@ -2,7 +2,6 @@
 #define __ASM_R8A7791_H__
 
 void r8a7791_add_standard_devices(void);
-void r8a7791_add_dt_devices(void);
 void r8a7791_clock_init(void);
 void r8a7791_pinmux_init(void);
 void r8a7791_pm_init(void);
index d47d8b16a43f6606ae07dc0291582539ba805fe9..35d78639244fd805d08d2f44954a5f889379ff6c 100644 (file)
@@ -182,11 +182,6 @@ static const struct resource thermal_resources[] __initconst = {
                                        thermal_resources,              \
                                        ARRAY_SIZE(thermal_resources))
 
-void __init r8a7791_add_dt_devices(void)
-{
-       r8a7791_register_cmt(0);
-}
-
 void __init r8a7791_add_standard_devices(void)
 {
        r8a7791_register_scif(0);
@@ -204,7 +199,7 @@ void __init r8a7791_add_standard_devices(void)
        r8a7791_register_scif(12);
        r8a7791_register_scif(13);
        r8a7791_register_scif(14);
-       r8a7791_add_dt_devices();
+       r8a7791_register_cmt(0);
        r8a7791_register_irqc(0);
        r8a7791_register_thermal();
 }