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

Commit 247fd5ec authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: lager-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 r8a7790_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 ef890ea2

arch/arm/boot/dts/r8a7790-lager.dts

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

};



&cmt0 {

	status = "ok";

};



&mmcif1 {

	pinctrl-0 = <&mmc1_pins>;

	pinctrl-names = "default";

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

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

arch/arm/mach-shmobile/r8a7790.h

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

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

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