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

Commit b12ff416 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: r8a7779: Remove legacy PM Domain remainings 



As of commit c99cd90d ("ARM: shmobile: r8a7779: Remove legacy
SoC code"), r8a7779_init_pm_domains() is no longer called.

Remove all related legacy PM Domain code.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 20e73335

arch/arm/mach-shmobile/pm-r8a7779.c

+0 −99
Original line number Diff line number Diff line
@@ -9,20 +9,8 @@ 
 * for more details.

 */



#include <linux/pm.h>

#include <linux/suspend.h>

#include <linux/err.h>

#include <linux/pm_clock.h>

#include <linux/pm_domain.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/console.h>



#include <asm/io.h>



#include "common.h"

#include "pm-rcar.h"

#include "r8a7779.h"
@@ -30,17 +18,6 @@ 
#define SYSCIER 0x0c

#define SYSCIMR 0x10



struct r8a7779_pm_domain {

	struct generic_pm_domain genpd;

	struct rcar_sysc_ch ch;

};



static inline

const struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)

{

	return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;

}



#if defined(CONFIG_PM) || defined(CONFIG_SMP)



static void __init r8a7779_sysc_init(void)
@@ -58,82 +35,6 @@ static inline void r8a7779_sysc_init(void) {} 


#endif /* CONFIG_PM || CONFIG_SMP */



#ifdef CONFIG_PM



static int pd_power_down(struct generic_pm_domain *genpd)

{

	return rcar_sysc_power_down(to_r8a7779_ch(genpd));

}



static int pd_power_up(struct generic_pm_domain *genpd)

{

	return rcar_sysc_power_up(to_r8a7779_ch(genpd));

}



static bool pd_is_off(struct generic_pm_domain *genpd)

{

	return rcar_sysc_power_is_off(to_r8a7779_ch(genpd));

}



static bool pd_active_wakeup(struct device *dev)

{

	return true;

}



static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd)

{

	struct generic_pm_domain *genpd = &r8a7779_pd->genpd;



	pm_genpd_init(genpd, NULL, false);

	genpd->dev_ops.active_wakeup = pd_active_wakeup;

	genpd->power_off = pd_power_down;

	genpd->power_on = pd_power_up;



	if (pd_is_off(&r8a7779_pd->genpd))

		pd_power_up(&r8a7779_pd->genpd);

}



static struct r8a7779_pm_domain r8a7779_pm_domains[] = {

	{

		.genpd.name = "SH4A",

		.ch = {

			.chan_offs = 0x80, /* PWRSR1 .. PWRER1 */

			.isr_bit = 16, /* SH4A */

		},

	},

	{

		.genpd.name = "SGX",

		.ch = {

			.chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */

			.isr_bit = 20, /* SGX */

		},

	},

	{

		.genpd.name = "VDP1",

		.ch = {

			.chan_offs = 0x100, /* PWRSR3 .. PWRER3 */

			.isr_bit = 21, /* VDP */

		},

	},

	{

		.genpd.name = "IMPX3",

		.ch = {

			.chan_offs = 0x140, /* PWRSR4 .. PWRER4 */

			.isr_bit = 24, /* IMP */

		},

	},

};



void __init r8a7779_init_pm_domains(void)

{

	int j;



	for (j = 0; j < ARRAY_SIZE(r8a7779_pm_domains); j++)

		r8a7779_init_pm_domain(&r8a7779_pm_domains[j]);

}



#endif /* CONFIG_PM */



void __init r8a7779_pm_init(void)

{

	static int once;

arch/arm/mach-shmobile/r8a7779.h

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 


extern void r8a7779_pm_init(void);



#ifdef CONFIG_PM

extern void __init r8a7779_init_pm_domains(void);

#else

static inline void r8a7779_init_pm_domains(void) {}

#endif /* CONFIG_PM */



extern struct smp_operations r8a7779_smp_ops;



#endif /* __ASM_R8A7779_H__ */