Skip to content

Commit

Permalink
ARM: shmobile: lager-reference: Enable CMT0 in device tree
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Aug 17, 2014
1 parent ef890ea commit 247fd5e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/r8a7790-lager.dts
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@
};
};

&cmt0 {
status = "ok";
};

&mmcif1 {
pinctrl-0 = <&mmc1_pins>;
pinctrl-names = "default";
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-shmobile/board-lager-reference.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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();
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-shmobile/r8a7790.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 1 addition & 6 deletions arch/arm/mach-shmobile/setup-r8a7790.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 247fd5e

Please sign in to comment.