kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2014-07-09 15:12:41 +02:00 committed by Simon Horman
parent ef890ea26a
commit 247fd5ec6e
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/r8a7790-lager.dts
View file

@ -252,6 +252,10 @@
}; };
}; };
&cmt0 {
status = "ok";
};
&mmcif1 { &mmcif1 {
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
pinctrl-names = "default"; pinctrl-names = "default";

2
arch/arm/mach-shmobile/board-lager-reference.c
View file

@ -92,7 +92,6 @@ static void __init lager_add_du_device(void)
* devices until they get moved to DT. * devices until they get moved to DT.
*/ */
static const struct clk_name clk_names[] __initconst = { static const struct clk_name clk_names[] __initconst = {
{ "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "du0", "du.0", "rcar-du-r8a7790" }, { "du0", "du.0", "rcar-du-r8a7790" },
{ "du1", "du.1", "rcar-du-r8a7790" }, { "du1", "du.1", "rcar-du-r8a7790" },
{ "du2", "du.2", "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) static void __init lager_add_standard_devices(void)
{ {
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); 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); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
lager_add_du_device(); lager_add_du_device();

1
arch/arm/mach-shmobile/r8a7790.h
View file

@ -27,7 +27,6 @@ enum {
}; };
void r8a7790_add_standard_devices(void); void r8a7790_add_standard_devices(void);
void r8a7790_add_dt_devices(void);
void r8a7790_clock_init(void); void r8a7790_clock_init(void);
void r8a7790_pinmux_init(void); void r8a7790_pinmux_init(void);
void r8a7790_pm_init(void); void r8a7790_pm_init(void);

7
arch/arm/mach-shmobile/setup-r8a7790.c
View file

@ -282,11 +282,6 @@ static struct resource cmt0_resources[] = {
&cmt##idx##_platform_data, \ &cmt##idx##_platform_data, \
sizeof(struct sh_timer_config)) sizeof(struct sh_timer_config))
void __init r8a7790_add_dt_devices(void)
{
r8a7790_register_cmt(0);
}
void __init r8a7790_add_standard_devices(void) void __init r8a7790_add_standard_devices(void)
{ {
r8a7790_register_scif(0); r8a7790_register_scif(0);
@ -299,7 +294,7 @@ void __init r8a7790_add_standard_devices(void)
r8a7790_register_scif(7); r8a7790_register_scif(7);
r8a7790_register_scif(8); r8a7790_register_scif(8);
r8a7790_register_scif(9); r8a7790_register_scif(9);
r8a7790_add_dt_devices(); r8a7790_register_cmt(0);
r8a7790_register_irqc(0); r8a7790_register_irqc(0);
r8a7790_register_thermal(); r8a7790_register_thermal();
r8a7790_register_i2c(0); r8a7790_register_i2c(0);