ARM: shmobile: lager-reference: Enable CMT0 in device tree
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 9 Jul 2014 13:12:41 +0000 (15:12 +0200)
committerSimon Horman <horms+renesas@verge.net.au>
Sun, 17 Aug 2014 00:00:55 +0000 (09:00 +0900)
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7790_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/r8a7790-lager.dts
arch/arm/mach-shmobile/board-lager-reference.c
arch/arm/mach-shmobile/r8a7790.h
arch/arm/mach-shmobile/setup-r8a7790.c

index 856b4236b67470a6a484116f71cad2ccf58ebb98..7853c2c15ce67e852b2e79bb7c546973ea23c2bc 100644 (file)
        };
 };
 
+&cmt0 {
+       status = "ok";
+};
+
 &mmcif1 {
        pinctrl-0 = <&mmc1_pins>;
        pinctrl-names = "default";
index 41c808e5600563570bd35f87a54bea990934279d..2a05c02bec3965f4f1dc4493b5d7fdaea40af275 100644 (file)
@@ -92,7 +92,6 @@ static void __init lager_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-r8a7790" },
        { "du1", "du.1", "rcar-du-r8a7790" },
        { "du2", "du.2", "rcar-du-r8a7790" },
@@ -103,7 +102,6 @@ static const struct clk_name clk_names[] __initconst = {
 static void __init lager_add_standard_devices(void)
 {
        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-       r8a7790_add_dt_devices();
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
        lager_add_du_device();
index 459827f1369ba180c2b919b085e59ac5979e2e0c..388f0514d931f97378cb15ac40ea88231fe95105 100644 (file)
@@ -27,7 +27,6 @@ enum {
 };
 
 void r8a7790_add_standard_devices(void);
-void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
 void r8a7790_pm_init(void);
index 0c12b01bb9e33c387c959b2f61cb371360d6470c..877fdeb985d0c240e52eea158eeb16edd1b2ef68 100644 (file)
@@ -282,11 +282,6 @@ static struct resource cmt0_resources[] = {
                                          &cmt##idx##_platform_data,    \
                                          sizeof(struct sh_timer_config))
 
-void __init r8a7790_add_dt_devices(void)
-{
-       r8a7790_register_cmt(0);
-}
-
 void __init r8a7790_add_standard_devices(void)
 {
        r8a7790_register_scif(0);
@@ -299,7 +294,7 @@ void __init r8a7790_add_standard_devices(void)
        r8a7790_register_scif(7);
        r8a7790_register_scif(8);
        r8a7790_register_scif(9);
-       r8a7790_add_dt_devices();
+       r8a7790_register_cmt(0);
        r8a7790_register_irqc(0);
        r8a7790_register_thermal();
        r8a7790_register_i2c(0);