Skip to contentSkip to conversation

ARM: EXYNOS4: Add power domain to use generic Power domain Framework

PATCH Superseded Chanwoo Choi 2 participants 3 messages Aug 11, 2011 – Oct 5, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Chanwoo Choi

author
#0 lore raw

PATCH 4/4 ARM: EXYNOS4: Add power domain to use generic Power domain Framework

This patch initializes the power domain of EXYNOS4210. The devices which suppot runtime-PM have to be added in specific power domain.

Signed-off-by Chanwoo Choi <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos4/mach-nuri.c           |   18 ++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkc210.c       |   18 ++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkv310.c       |   15 +++++++++++++++
 arch/arm/mach-exynos4/mach-universal_c210.c |   18 ++++++++++++++++++
 4 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/mach-exynos4/mach-nuri.c +18 -0
index 4c358cb..5844c55 100644
@@ -44,6 +44,7 @@
 #include <plat/mfc.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define NURI_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -1125,6 +1126,21 @@ static void __init nuri_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }
 
+static void __init nuri_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+
+	/* Add device to MFC power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_mfc, &s5p_device_mfc);
+}
+
 static void __init nuri_machine_init(void)
 {
 	nuri_sdhci_init();

@@ -1145,6 +1161,8 @@ static void __init nuri_machine_init(void)
 
 	/* Last */
 	platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
+
+	nuri_power_domain_init();
 }
 
 MACHINE_START(NURI, "NURI")
arch/arm/mach-exynos4/mach-smdkc210.c +18 -0
index 4d1976c..0a3b2a9 100644
@@ -37,6 +37,7 @@
 #include <plat/backlight.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKC210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -273,6 +274,21 @@ static void __init smdkc210_map_io(void)
 	s3c24xx_init_uarts(smdkc210_uartcfgs, ARRAY_SIZE(smdkc210_uartcfgs));
 }
 
+static void __init smdkc210_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+
+	/* Add device to LCD0 power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_lcd0, &s5p_device_fimd0);
+}
+
 static void __init smdkc210_machine_init(void)
 {
 	s3c_i2c1_set_platdata(NULL);

@@ -289,6 +305,8 @@ static void __init smdkc210_machine_init(void)
 	s5p_fimd0_set_platdata(&smdkc210_lcd0_pdata);
 
 	platform_add_devices(smdkc210_devices, ARRAY_SIZE(smdkc210_devices));
+
+	smdkc210_power_domain_init();
 }
 
 MACHINE_START(SMDKC210, "SMDKC210")
arch/arm/mach-exynos4/mach-smdkv310.c +15 -0
index 8c2819b..320c7f3 100644
@@ -33,6 +33,7 @@
 #include <plat/backlight.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKV310_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -225,6 +226,18 @@ static void __init smdkv310_map_io(void)
 	s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs));
 }
 
+static void __init smdkv310_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+}
+
 static void __init smdkv310_machine_init(void)
 {
 	s3c_i2c1_set_platdata(NULL);

@@ -242,6 +255,8 @@ static void __init smdkv310_machine_init(void)
 	samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
 
 	platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
+
+	smdkv310_power_domain_init();
 }
 
 MACHINE_START(SMDKV310, "SMDKV310")
arch/arm/mach-exynos4/mach-universal_c210.c +18 -0
index 43998f0..1ebc907 100644
@@ -36,6 +36,7 @@
 #include <plat/s5p-time.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define UNIVERSAL_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -737,6 +738,21 @@ static void __init universal_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }
 
+static void __init universal_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+
+	/* Add device to MFC power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_mfc, &s5p_device_mfc);
+}
+
 static void __init universal_machine_init(void)
 {
 	universal_sdhci_init();

@@ -757,6 +773,8 @@ static void __init universal_machine_init(void)
 
 	/* Last */
 	platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices));
+
+	universal_power_domain_init();
 }
 
 MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 4/4 ARM: EXYNOS4: Add power domain to use generic Power domain Framework

Quoted 31 lines · Chanwoo Choi

This patch initializes the power domain of EXYNOS4210. The devices which suppot runtime-PM have to be added in specific power domain.

Signed-off-by Chanwoo Choi <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos4/mach-nuri.c           |   18 ++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkc210.c       |   18
++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkv310.c       |   15 +++++++++++++++
 arch/arm/mach-exynos4/mach-universal_c210.c |   18 ++++++++++++++++++
 4 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0 -0

nuri.c
index 4c358cb..5844c55 100644

arch/arm/mach-exynos4/mach-nuri.c +1 -0
@@ -44,6 +44,7 @@
 #include <plat/mfc.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define NURI_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -1125,6 +1126,21 @@ static void __init nuri_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }

arch/arm/mach-exynos4/mach-nuri.c static void __init nuri_reserve(void) · line 1138

Quoted 10 lines
arch/arm/mach-exynos4/mach-nuri.c +10 -0
+static void __init nuri_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);

As you know, the EXYNOS421 boards have same power domains so how about to make array of struct exynos4210_pm_domain and just one calling exynos4210_init_pm_domain()?

arch/arm/mach-exynos4/mach-smdkc210.c

Quoted 23 lines
arch/arm/mach-exynos4/mach-nuri.c +5 -0
+
+	/* Add device to MFC power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_mfc,
 &s5p_device_mfc);
+}
+
 static void __init nuri_machine_init(void)
 {
arch/arm/mach-exynos4/mach-nuri.c +2 -0
 	nuri_sdhci_init();

@@ -1145,6 +1161,8 @@ static void __init nuri_machine_init(void)
 
 	/* Last */
 	platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
+
+	nuri_power_domain_init();
 }
 
 MACHINE_START(NURI, "NURI")
arch/arm/mach- renamed from arch/arm/mach-exynos4/mach-smdkc210.c +0 -0

exynos4/mach-smdkc210.c
index 4d1976c..0a3b2a9 100644

arch/arm/mach-exynos4/mach-smdkc210.c +0 -0

The mach-smdkc210.c and mach-smdkv310.c are merged one mach-smdkv310.c file.

Quoted 130 lines
arch/arm/mach-exynos4/mach-smdkc210.c +16 -0
@@ -37,6 +37,7 @@
 #include <plat/backlight.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKC210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -273,6 +274,21 @@ static void __init smdkc210_map_io(void)
 	s3c24xx_init_uarts(smdkc210_uartcfgs,
 ARRAY_SIZE(smdkc210_uartcfgs));
 }
 
+static void __init smdkc210_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+
+	/* Add device to LCD0 power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_lcd0,
 &s5p_device_fimd0);
+}
+
 static void __init smdkc210_machine_init(void)

{

arch/arm/mach-exynos4/mach-smdkc210.c +2 -0
 	s3c_i2c1_set_platdata(NULL);

@@ -289,6 +305,8 @@ static void __init smdkc210_machine_init(void)
 	s5p_fimd0_set_platdata(&smdkc210_lcd0_pdata);
 
 	platform_add_devices(smdkc210_devices,
 ARRAY_SIZE(smdkc210_devices));
+
+	smdkc210_power_domain_init();
 }

MACHINE_START(SMDKC210, "SMDKC210")

arch/arm/mach- renamed from arch/arm/mach-exynos4/mach-smdkv310.c +0 -0

exynos4/mach-smdkv310.c
index 8c2819b..320c7f3 100644

arch/arm/mach-exynos4/mach-smdkv310.c +13 -0
@@ -33,6 +33,7 @@
 #include <plat/backlight.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKV310_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -225,6 +226,18 @@ static void __init smdkv310_map_io(void)
 	s3c24xx_init_uarts(smdkv310_uartcfgs,
 ARRAY_SIZE(smdkv310_uartcfgs));
 }
 
+static void __init smdkv310_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+}
+
 static void __init smdkv310_machine_init(void)
 {
arch/arm/mach-exynos4/mach-smdkv310.c +2 -0
 	s3c_i2c1_set_platdata(NULL);

@@ -242,6 +255,8 @@ static void __init smdkv310_machine_init(void)
 	samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
 
 	platform_add_devices(smdkv310_devices,
 ARRAY_SIZE(smdkv310_devices));
+
+	smdkv310_power_domain_init();
 }

MACHINE_START(SMDKV310, "SMDKV310")

arch/arm/mach- renamed from arch/arm/mach-exynos4/mach-universal_c210.c +0 -0

exynos4/mach-universal_c210.c
index 43998f0..1ebc907 100644

arch/arm/mach-exynos4/mach-universal_c210.c +16 -0
@@ -36,6 +36,7 @@
 #include <plat/s5p-time.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define UNIVERSAL_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -737,6 +738,21 @@ static void __init universal_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }
 
+static void __init universal_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);
+
+	/* Add device to MFC power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_mfc,
 &s5p_device_mfc);
+}
+
 static void __init universal_machine_init(void)
 {
arch/arm/mach-exynos4/mach-universal_c210.c +2 -0
 	universal_sdhci_init();

@@ -757,6 +773,8 @@ static void __init universal_machine_init(void)
 
 	/* Last */
 	platform_add_devices(universal_devices,
 ARRAY_SIZE(universal_devices));
+
+	universal_power_domain_init();
 }
Quoted 3 lines

MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
--
1.7.0.4

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

author
#2 lore raw

PATCH 4/4 ARM: EXYNOS4: Add power domain to use generic Power domain Framework

Quoted 31 lines · Kukjin Kim
Quoted 30 lines · Chanwoo Choi

This patch initializes the power domain of EXYNOS4210. The devices which suppot runtime-PM have to be added in specific power domain.

Signed-off-by Chanwoo Choi <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos4/mach-nuri.c           |   18 ++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkc210.c       |   18
++++++++++++++++++
 arch/arm/mach-exynos4/mach-smdkv310.c       |   15 +++++++++++++++
 arch/arm/mach-exynos4/mach-universal_c210.c |   18 ++++++++++++++++++
 4 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0 -0

nuri.c
index 4c358cb..5844c55 100644

arch/arm/mach-exynos4/mach-nuri.c +1 -0
@@ -44,6 +44,7 @@
 #include <plat/mfc.h>
 
 #include <mach/map.h>
+#include <mach/pm-exynos4210.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define NURI_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

@@ -1125,6 +1126,21 @@ static void __init nuri_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }
Quoted 13 lines

arch/arm/mach-exynos4/mach-nuri.c static void __init nuri_reserve(void) · line 1138

Quoted 10 lines
arch/arm/mach-exynos4/mach-nuri.c +10 -0
+static void __init nuri_power_domain_init(void)
+{
+	/* Initialize Power domain */
+	exynos4210_init_pm_domain(&exynos4210_pd_mfc);
+	exynos4210_init_pm_domain(&exynos4210_pd_g3d);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd0);
+	exynos4210_init_pm_domain(&exynos4210_pd_lcd1);
+	exynos4210_init_pm_domain(&exynos4210_pd_tv);
+	exynos4210_init_pm_domain(&exynos4210_pd_cam);
+	exynos4210_init_pm_domain(&exynos4210_pd_gps);

As you know, the EXYNOS421 boards have same power domains so how about to make array of struct exynos4210_pm_domain and just one calling exynos4210_init_pm_domain()?

OK, I will reimplement it to remove duplicate function call for initializing the generic power-domain of exynos4210.

Quoted 17 lines
Quoted 17 lines
arch/arm/mach-exynos4/mach-nuri.c +5 -0
+
+	/* Add device to MFC power domain */
+	exynos4210_add_device_to_domain(&exynos4210_pd_mfc,
 &s5p_device_mfc);
+}
+
 static void __init nuri_machine_init(void)
 {
arch/arm/mach-exynos4/mach-nuri.c +2 -0
 	nuri_sdhci_init();

@@ -1145,6 +1161,8 @@ static void __init nuri_machine_init(void)
 
 	/* Last */
 	platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
+
+	nuri_power_domain_init();
 }
Quoted 9 lines

arch/arm/mach-exynos4/mach-smdkc210.c

Quoted 6 lines
arch/arm/mach-exynos4/mach-nuri.c +0 -0
 MACHINE_START(NURI, "NURI")
arch/arm/mach- renamed from arch/arm/mach-exynos4/mach-smdkc210.c +0 -0

exynos4/mach-smdkc210.c
index 4d1976c..0a3b2a9 100644

arch/arm/mach-exynos4/mach-smdkc210.c +0 -0

The mach-smdkc210.c and mach-smdkv310.c are merged one mach-smdkv310.c file.

OK, I will modify it according to merged state of mach-smdkv310.c.

Thanks & Regards,
Chanwoo Choi