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

Commit 201dbd81 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ARM: shmobile: Rework adding devices to PM domains on AP4EVB 



Use the function rmobile_add_devices_to_domains() introduced
previously for adding devices to PM domains during the AP4EVB
initialization instead of a series of rmobile_add_device_to_domain*()
calls.  This also causes the default device PM QoS latencies to be
used on that board in analogy with Mackerel.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
parent ac18e02d

arch/arm/mach-shmobile/board-ap4evb.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -1229,6 +1229,15 @@ static struct i2c_board_info i2c1_devices[] = { 
#define USCCR1		0xE6058144

#define USCCR1		0xE6058144

static void __init ap4evb_init(void)

static void __init ap4evb_init(void)

{

{

	struct pm_domain_device domain_devices[] = {

		{ "A4LC", &lcdc1_device, },

		{ "A4LC", &lcdc_device, },

		{ "A4MP", &fsi_device, },

		{ "A3SP", &sh_mmcif_device, },

		{ "A3SP", &sdhi0_device, },

		{ "A3SP", &sdhi1_device, },

		{ "A4R", &ceu_device, },

	};

	u32 srcr4;

	u32 srcr4;

	struct clk *clk;

	struct clk *clk;
@@ -1461,14 +1470,8 @@ static void __init ap4evb_init(void) 




	platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));

	platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));





	rmobile_add_device_to_domain("A4LC", &lcdc1_device);

	rmobile_add_devices_to_domains(domain_devices,

	rmobile_add_device_to_domain("A4LC", &lcdc_device);

				       ARRAY_SIZE(domain_devices));

	rmobile_add_device_to_domain("A4MP", &fsi_device);



	rmobile_add_device_to_domain("A3SP", &sh_mmcif_device);

	rmobile_add_device_to_domain("A3SP", &sdhi0_device);

	rmobile_add_device_to_domain("A3SP", &sdhi1_device);

	rmobile_add_device_to_domain("A4R", &ceu_device);





	hdmi_init_pm_clock();

	hdmi_init_pm_clock();

	fsi_init_pm_clock();

	fsi_init_pm_clock();