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

Commit 1096ffd7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-drivers-soc-pmu-4.11-2' of... 

Merge tag 'samsung-drivers-soc-pmu-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers

Continuation of improvements for Exynos PM drivers for v4.11:
1. Add support for Exynos5433 to Power Management Unit (PMU) and Power
   Domains drivers.
2. Cleanups of duplicated and unused defines.

* tag 'samsung-drivers-soc-pmu-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
  soc: samsung: pmu: Remove unused and duplicated defines
  soc: samsung: pm_domains: Add new Exynos5433 compatible
  soc: samsung: pmu: Add dummy support for Exynos5433 SoC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2a742e1b ee55ae61

Documentation/devicetree/bindings/power/pd-samsung.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ to gate power to one or more peripherals on the processor. 
Required Properties:

- compatible: should be one of the following.

    * samsung,exynos4210-pd - for exynos4210 type power domain.

    * samsung,exynos5433-pd - for exynos5433 type power domain.

- reg: physical base address of the controller and length of memory mapped

    region.

- #power-domain-cells: number of cells in power domain specifier;

arch/arm/mach-exynos/suspend.c

+3 −3
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ static void exynos5420_pm_prepare(void) 
	if (IS_ENABLED(CONFIG_EXYNOS5420_MCPM))

		pmu_raw_writel(virt_to_phys(mcpm_entry_point), S5P_INFORM0);



	tmp = pmu_raw_readl(EXYNOS5_ARM_L2_OPTION);

	tmp &= ~EXYNOS5_USE_RETENTION;

	pmu_raw_writel(tmp, EXYNOS5_ARM_L2_OPTION);

	tmp = pmu_raw_readl(EXYNOS_L2_OPTION(0));

	tmp &= ~EXYNOS_L2_USE_RETENTION;

	pmu_raw_writel(tmp, EXYNOS_L2_OPTION(0));



	tmp = pmu_raw_readl(EXYNOS5420_SFR_AXI_CGDIS1);

	tmp |= EXYNOS5420_UFS;

drivers/soc/samsung/exynos-pmu.c

+4 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode) 
	unsigned int i;

	const struct exynos_pmu_data *pmu_data;



	if (!pmu_context)

	if (!pmu_context || !pmu_context->pmu_data)

		return;



	pmu_data = pmu_context->pmu_data;
@@ -90,6 +90,8 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = { 
	}, {

		.compatible = "samsung,exynos5420-pmu",

		.data = &exynos5420_pmu_data,

	}, {

		.compatible = "samsung,exynos5433-pmu",

	},

	{ /*sentinel*/ },

};
@@ -122,7 +124,7 @@ static int exynos_pmu_probe(struct platform_device *pdev) 
	pmu_context->dev = dev;

	pmu_context->pmu_data = of_device_get_match_data(dev);



	if (pmu_context->pmu_data->pmu_init)

	if (pmu_context->pmu_data && pmu_context->pmu_data->pmu_init)

		pmu_context->pmu_data->pmu_init();



	platform_set_drvdata(pdev, pmu_context);

drivers/soc/samsung/exynos5250-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static const struct exynos_pmu_conf exynos5250_pmu_config[] = { 
	{ EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG,	{ 0x0, 0x0, 0x0} },

	{ EXYNOS5_ARM_COMMON_SYS_PWR_REG,		{ 0x0, 0x0, 0x2} },

	{ EXYNOS5_ARM_L2_SYS_PWR_REG,			{ 0x3, 0x3, 0x3} },

	{ EXYNOS5_ARM_L2_OPTION,			{ 0x10, 0x10, 0x0 } },

	{ EXYNOS_L2_OPTION(0),				{ 0x10, 0x10, 0x0 } },

	{ EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG,		{ 0x1, 0x0, 0x1} },

	{ EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG,		{ 0x1, 0x0, 0x1} },

	{ EXYNOS5_CMU_RESET_SYS_PWR_REG,		{ 0x1, 0x1, 0x0} },

drivers/soc/samsung/exynos5420-pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -230,11 +230,11 @@ static void exynos5420_pmu_init(void) 
	pmu_raw_writel(EXYNOS5420_USE_STANDBY_WFI_ALL, S5P_CENTRAL_SEQ_OPTION);



	value  = pmu_raw_readl(EXYNOS_L2_OPTION(0));

	value &= ~EXYNOS5_USE_RETENTION;

	value &= ~EXYNOS_L2_USE_RETENTION;

	pmu_raw_writel(value, EXYNOS_L2_OPTION(0));



	value = pmu_raw_readl(EXYNOS_L2_OPTION(1));

	value &= ~EXYNOS5_USE_RETENTION;

	value &= ~EXYNOS_L2_USE_RETENTION;

	pmu_raw_writel(value, EXYNOS_L2_OPTION(1));



	/*