Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a1d9460 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: koelsch-reference: Enable CMT0 in device tree 



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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 247fd5ec

arch/arm/boot/dts/r8a7791-koelsch.dts

+4 −0
Original line number Diff line number Diff line
@@ -307,6 +307,10 @@ 
	};

};



&cmt0 {

	status = "ok";

};



&sata0 {

	status = "okay";

};

arch/arm/mach-shmobile/board-koelsch-reference.c

+0 −2
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-shmobile/r8a7791.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-shmobile/setup-r8a7791.c

+1 −6
Original line number Diff line number Diff line
@@ -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();

}