ARM: EXYNOS4: Support for generic I/O power domains on EXYNOS4210
Subsystems (3)
PATCH v3 1/1 ARM: EXYNOS4: Support for generic I/O power domains on EXYNOS4210
Use the generic power domains support to implement support for power domain on EXYNOS4210.
I refer to the following patch to implement what configure the clock-gating control register for block to turn off/on:
http://git.infradead.org/users/kmpark/linux-2.6-samsung/commit/39a81876d034dcbdc2a4c4c4b847b3b49e38870c
This patch is based on following "pm-domains" branch.
http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-2.6.git;a=shortlog;h=refs/heads/pm-domains
--- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/include/mach/pm-exynos4210.h | 53 ++++++ arch/arm/mach-exynos4/include/mach/regs-clock.h | 8 + arch/arm/mach-exynos4/mach-nuri.c | 18 ++ arch/arm/mach-exynos4/pm-exynos4210.c | 184 ++++++++++++++++++++ 6 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/pm-exynos4210.h create mode 100644 arch/arm/mach-exynos4/pm-exynos4210.c
arch/arm/mach-exynos4/Kconfig +1 -0
@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PM help Machine support for Samsung Mobile NURI Board.
arch/arm/mach-exynos4/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o +obj-$(CONFIG_CPU_EXYNOS4210) += pm-exynos4210.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +53 -0
53 lines not on this page · raw message
arch/arm/mach-exynos4/include/mach/regs-clock.h +8 -0
@@ -171,6 +171,14 @@#define S5P_CLKDIV_BUS_GPLR_SHIFT (4)#define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT) +#define S5P_CLKGATE_BLOCK_CAM (1<<0) +#define S5P_CLKGATE_BLOCK_TV (1<<1) +#define S5P_CLKGATE_BLOCK_MFC (1<<2) +#define S5P_CLKGATE_BLOCK_G3D (1<<3) +#define S5P_CLKGATE_BLOCK_LCD0 (1<<4) +#define S5P_CLKGATE_BLOCK_LCD1 (1<<5) +#define S5P_CLKGATE_BLOCK_GPS (1<<7) +/* Compatibility defines and inclusion */ #include <mach/regs-pmu.h>
arch/arm/mach-exynos4/mach-nuri.c +18 -0
@@ -37,6 +37,7 @@#include <plat/iic.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 | \
@@ -376,6 +377,21 @@ static struct platform_device *nuri_devices[] __initdata = { &nuri_backlight_device, }; +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 power-domain */ +exynos4210_add_device_to_domain (&exynos4210_pd_lcd0, &nuri_lcd_device); +} +static void __init nuri_map_io (void ) {s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );
@@ -398,6 +414,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/pm-exynos4210.c new file +184 -0
184 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Quoted 9 lines · Chanwoo Choi
Use the generic power domains support to implement support for power domain on EXYNOS4210.
I refer to the following patch to implement what configure the clock-gating control register for block to turn off/on:
http://git.infradead.org/users/kmpark/linux-2.6-
samsung/commit/39a81876d034dcbdc2a4c4c4b847b3b49e38870c
I think, this should be moved under "---"
Quoted 4 lines
This patch is based on following "pm-domains" branch.
http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-
2.6.git;a=shortlog;h=refs/heads/pm-domains
Same as above.
Quoted 3 lines
Signed-off-by Chanwoo Choi <[email protected]>Signed-off-by Myungjoo Ham <[email protected]>Signed-off-by Kyungmin.park <[email protected]>
Kyungmin Park?
Quoted 17 lines
--- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/include/mach/pm-exynos4210.h | 53 ++++++ arch/arm/mach-exynos4/include/mach/regs-clock.h | 8 + arch/arm/mach-exynos4/mach-nuri.c | 18 ++ arch/arm/mach-exynos4/pm-exynos4210.c | 184 ++++++++++++++++++++ 6 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/pm-exynos4210.h create mode 100644 arch/arm/mach-exynos4/pm-exynos4210.carch/arm/mach-exynos4/Kconfig +0
-0
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 4 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PM
Do you _really_ think this should be under MACH_NURI?
Quoted 23 lines
arch/arm/mach-exynos4/Kconfig +0
-0help Machine support for Samsung Mobile NURI Board.arch/arm/mach-exynos4/Makefile +0
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.oarch/arm/mach-exynos4/Makefile +1
-0+obj-$(CONFIG_CPU_EXYNOS4210) += pm-exynos4210.o obj-$(CONFIG_SMP) += platsmp.o headsmp.oarch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +0
-0
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 1 line
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h
According to your file name, should be linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h ?
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 3
Quoted 2 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +2
-0+* +* Exynos4 Power management support
Is this for EXYNOS4 or only EXYNOS4210?
Quoted 58 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +42
-0+* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef PM_EXYNOS4210_H +#define PM_EXYNOS4210_H + +#include <linux/pm_domain.h> +#include <plat/pd.h> + +struct platform_device ; + +struct exynos4210_pm_domain { +struct generic_pm_domain genpd; + +const char *name; +void __iomem *base; +u32 mask; +int boot_on; +}; + +static inline struct exynos4210_pm_domain *to_exynos4210_pd ( +struct generic_pm_domain *pd) +{ + return container_of(pd, struct exynos4210_pm_domain, genpd); +} + +#ifdef CONFIG_PM +extern struct exynos4210_pm_domain exynos4210_pd_mfc; +extern struct exynos4210_pm_domain exynos4210_pd_g3d; +extern struct exynos4210_pm_domain exynos4210_pd_lcd0; +extern struct exynos4210_pm_domain exynos4210_pd_lcd1; +extern struct exynos4210_pm_domain exynos4210_pd_tv; +extern struct exynos4210_pm_domain exynos4210_pd_cam; +extern struct exynos4210_pm_domain exynos4210_pd_gps; + +extern void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd);
+extern void exynos4210_add_device_to_domain(structexynos4210_pm_domain*exynos4210_pd,arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +7
-0+ struct platform_device *pdev); +#else +#define exynos4210_init_pm_domain (pd) do { } while(0) +#define exynos4_add_device_to_domain (pd, pdev) do { } while(0) +#endif /* CONFIG_PM */ + +#endif /* PM_EXYNOS4210_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0
exynos4/include/mach/regs-clock.h
index 6e311c1..bc0fda9 100644
arch/arm/mach-exynos4/include/mach/regs-clock.h line 175
Quoted 5 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0@@ -171,6 +171,14 @@#define S5P_CLKDIV_BUS_GPLR_SHIFT (4)#define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT) +#define S5P_CLKGATE_BLOCK_CAM (1<<0)
The blank should be added around "<<" like (1 << 0)
arch/arm/mach-exynos4/include/mach/regs-clock.h line 180
Quoted 6 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +6
-0+#define S5P_CLKGATE_BLOCK_TV (1<<1) +#define S5P_CLKGATE_BLOCK_MFC (1<<2) +#define S5P_CLKGATE_BLOCK_G3D (1<<3) +#define S5P_CLKGATE_BLOCK_LCD0 (1<<4) +#define S5P_CLKGATE_BLOCK_LCD1 (1<<5) +#define S5P_CLKGATE_BLOCK_GPS (1<<7)
Same...
Quoted 4 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <
mach/regs-pmu.h>
Hmm...how about if this is required, just add the inclusion in c file?
Actually, you added above in pm-exynos4210.c...
Quoted 17 lines
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0
-0
nuri.c
index 642702b..816c6f4 100644arch/arm/mach-exynos4/mach-nuri.c +1
-0@@ -37,6 +37,7 @@#include <plat/iic.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 | \@@ -376,6 +377,21 @@ static struct platform_device *nuri_devices[] __initdata = { &nuri_backlight_device, };
arch/arm/mach-exynos4/mach-nuri.c static struct platform_device *nuri_devices[] __initdata = { · line 389
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);
Hmm, is this needed only on NURI?
Quoted 38 lines
arch/arm/mach-exynos4/mach-nuri.c +5
-0+ +/* Add device to power-domain */ +exynos4210_add_device_to_domain (&exynos4210_pd_lcd0, &nuri_lcd_device); +} +static void __init nuri_map_io (void ) {arch/arm/mach-exynos4/mach-nuri.c +2
-0s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );@@ -398,6 +414,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/pm-exynos4210.c +0
-0
exynos4/pm-exynos4210.c
new file mode 100644
index 0000000..f44dcefarch/arm/mach-exynos4/pm-exynos4210.c new file +13
-0@@ -0,0 +1,184 @@ +/* linux/arch/arm/mach-exynos4/pm-exynos4210.c +* +* Exynos4210 Power management support +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/pm.h>
arch/arm/mach-exynos4/pm-exynos4210.c line 23
Quoted 10 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +10
-0+#include <linux/module.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/slab.h> +#include <linux/pm_runtime.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> +#include <linux/io.h> + +#include <mach/regs-pmu.h>
As I said, so no need to add this inclusion in <mach/regs-clock.h>
Quoted 70 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +9
-0+#include <mach/regs-clock.h> +#include <mach/pm-exynos4210.h> + +#ifdef CONFIG_PM +static DEFINE_SPINLOCK (clkgate_block_lock); + +static int pd_power_down (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Disable the power of power-domain */ +__raw_writel (0 , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while (__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN) {arch/arm/mach-exynos4/pm-exynos4210.c new file +27
-0+if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s disable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn off */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg &= ~exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +} + +static int pd_power_up (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Enable power domain */ +__raw_writel (S5P_INT_LOCAL_PWR_EN , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while ((__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN)arch/arm/mach-exynos4/pm-exynos4210.c new file +14
-0+ != S5P_INT_LOCAL_PWR_EN) { +if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s enable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn on */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg;
arch/arm/mach-exynos4/pm-exynos4210.c line 99
Quoted 10 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +10
-0+ +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg |= exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +}
Would be better if you could add some common function for pd_power_up and _down...
I wonder why we need to add this for handling power domain not update current pd. As you know, they are having same/similar purpose and functions...
Quoted 88 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +7
-0+ +static bool pd_active_wakeup (struct device *dev) +{ +return true; +} + +void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd)arch/arm/mach-exynos4/pm-exynos4210.c new file +20
-0+{ +struct generic_pm_domain *genpd; + +if (!exynos4210_pd) +return ; + + genpd = &exynos4210_pd->genpd; + +pm_genpd_init (genpd,NULL , false); + genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up; + +if (exynos4210_pd->boot_on) +pd_power_up (&exynos4210_pd->genpd); +} + +void exynos4210_add_device_to_domain(struct exynos4210_pm_domain
*exynos4210_pd,arch/arm/mach-exynos4/pm-exynos4210.c new file +58
-1+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +if (exynos4210_pd && pdev) +pm_genpd_add_device (&exynos4210_pd->genpd, dev); +} + +struct exynos4210_pm_domain exynos4210_pd_mfc = { + .name ="PD_MFC" , + .base =S5P_PMU_MFC_CONF , + .mask =S5P_CLKGATE_BLOCK_MFC , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_g3d = { + .name ="PD_G3D" , + .base =S5P_PMU_G3D_CONF , + .mask =S5P_CLKGATE_BLOCK_G3D , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd0 = { + .name ="PD_LCD0" , + .base =S5P_PMU_LCD0_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD0 , + .boot_on =1 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd1 = { + .name ="PD_LCD1" , + .base =S5P_PMU_LCD1_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD1 , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_tv = { + .name ="PD_TV" , + .base =S5P_PMU_TV_CONF , + .mask =S5P_CLKGATE_BLOCK_TV , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_cam = { + .name ="PD_CAM" , + .base =S5P_PMU_CAM_CONF , + .mask =S5P_CLKGATE_BLOCK_CAM , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_gps = { + .name ="PD_GPS" , + .base =S5P_PMU_GPS_CONF , + .mask =S5P_CLKGATE_BLOCK_GPS , + .boot_on =0 , +}; + +#endif /* CONFIG_PM */ --
Quoted 1 line
1.7.0.4
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 9 lines · Chanwoo Choi
Use the generic power domains support to implement support for power domain on EXYNOS4210.
I refer to the following patch to implement what configure the clock-gating control register for block to turn off/on:
http://git.infradead.org/users/kmpark/linux-2.6-
samsung/commit/39a81876d034dcbdc2a4c4c4b847b3b49e38870c
I think, this should be moved under "---"
Quoted 4 lines
This patch is based on following "pm-domains" branch.
http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-
2.6.git;a=shortlog;h=refs/heads/pm-domains
Same as above.
Quoted 3 lines
Signed-off-by Chanwoo Choi <[email protected]>Signed-off-by Myungjoo Ham <[email protected]>Signed-off-by Kyungmin.park <[email protected]>
Kyungmin Park?
Quoted 17 lines
--- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/include/mach/pm-exynos4210.h | 53 ++++++ arch/arm/mach-exynos4/include/mach/regs-clock.h | 8 + arch/arm/mach-exynos4/mach-nuri.c | 18 ++ arch/arm/mach-exynos4/pm-exynos4210.c | 184 ++++++++++++++++++++ 6 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/pm-exynos4210.h create mode 100644 arch/arm/mach-exynos4/pm-exynos4210.carch/arm/mach-exynos4/Kconfig +0
-0
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 4 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PM
Do you _really_ think this should be under MACH_NURI?
Quoted 23 lines
arch/arm/mach-exynos4/Kconfig +0
-0help Machine support for Samsung Mobile NURI Board.arch/arm/mach-exynos4/Makefile +0
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.oarch/arm/mach-exynos4/Makefile +1
-0+obj-$(CONFIG_CPU_EXYNOS4210) += pm-exynos4210.o obj-$(CONFIG_SMP) += platsmp.o headsmp.oarch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +0
-0
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 1 line
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h
According to your file name, should be linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h ?
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 3
Quoted 2 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +2
-0+* +* Exynos4 Power management support
Is this for EXYNOS4 or only EXYNOS4210?
Quoted 58 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +42
-0+* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef PM_EXYNOS4210_H +#define PM_EXYNOS4210_H + +#include <linux/pm_domain.h> +#include <plat/pd.h> + +struct platform_device ; + +struct exynos4210_pm_domain { +struct generic_pm_domain genpd; + +const char *name; +void __iomem *base; +u32 mask; +int boot_on; +}; + +static inline struct exynos4210_pm_domain *to_exynos4210_pd ( +struct generic_pm_domain *pd) +{ + return container_of(pd, struct exynos4210_pm_domain, genpd); +} + +#ifdef CONFIG_PM +extern struct exynos4210_pm_domain exynos4210_pd_mfc; +extern struct exynos4210_pm_domain exynos4210_pd_g3d; +extern struct exynos4210_pm_domain exynos4210_pd_lcd0; +extern struct exynos4210_pm_domain exynos4210_pd_lcd1; +extern struct exynos4210_pm_domain exynos4210_pd_tv; +extern struct exynos4210_pm_domain exynos4210_pd_cam; +extern struct exynos4210_pm_domain exynos4210_pd_gps; + +extern void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd);
+extern void exynos4210_add_device_to_domain(structexynos4210_pm_domain*exynos4210_pd,arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +7
-0+ struct platform_device *pdev); +#else +#define exynos4210_init_pm_domain (pd) do { } while(0) +#define exynos4_add_device_to_domain (pd, pdev) do { } while(0) +#endif /* CONFIG_PM */ + +#endif /* PM_EXYNOS4210_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0
exynos4/include/mach/regs-clock.h
index 6e311c1..bc0fda9 100644
arch/arm/mach-exynos4/include/mach/regs-clock.h line 175
Quoted 5 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0@@ -171,6 +171,14 @@#define S5P_CLKDIV_BUS_GPLR_SHIFT (4)#define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT) +#define S5P_CLKGATE_BLOCK_CAM (1<<0)
The blank should be added around "<<" like (1 << 0)
arch/arm/mach-exynos4/include/mach/regs-clock.h line 180
Quoted 6 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +6
-0+#define S5P_CLKGATE_BLOCK_TV (1<<1) +#define S5P_CLKGATE_BLOCK_MFC (1<<2) +#define S5P_CLKGATE_BLOCK_G3D (1<<3) +#define S5P_CLKGATE_BLOCK_LCD0 (1<<4) +#define S5P_CLKGATE_BLOCK_LCD1 (1<<5) +#define S5P_CLKGATE_BLOCK_GPS (1<<7)
Same...
Quoted 4 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <
mach/regs-pmu.h>
Hmm...how about if this is required, just add the inclusion in c file?
Actually, you added above in pm-exynos4210.c...
Quoted 17 lines
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0
-0
nuri.c
index 642702b..816c6f4 100644arch/arm/mach-exynos4/mach-nuri.c +1
-0@@ -37,6 +37,7 @@#include <plat/iic.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 | \@@ -376,6 +377,21 @@ static struct platform_device *nuri_devices[] __initdata = { &nuri_backlight_device, };
arch/arm/mach-exynos4/mach-nuri.c static struct platform_device *nuri_devices[] __initdata = { · line 389
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);
Hmm, is this needed only on NURI?
Quoted 38 lines
arch/arm/mach-exynos4/mach-nuri.c +5
-0+ +/* Add device to power-domain */ +exynos4210_add_device_to_domain (&exynos4210_pd_lcd0, &nuri_lcd_device); +} +static void __init nuri_map_io (void ) {arch/arm/mach-exynos4/mach-nuri.c +2
-0s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );@@ -398,6 +414,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/pm-exynos4210.c +0
-0
exynos4/pm-exynos4210.c
new file mode 100644
index 0000000..f44dcefarch/arm/mach-exynos4/pm-exynos4210.c new file +13
-0@@ -0,0 +1,184 @@ +/* linux/arch/arm/mach-exynos4/pm-exynos4210.c +* +* Exynos4210 Power management support +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/pm.h>
arch/arm/mach-exynos4/pm-exynos4210.c line 23
Quoted 10 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +10
-0+#include <linux/module.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/slab.h> +#include <linux/pm_runtime.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> +#include <linux/io.h> + +#include <mach/regs-pmu.h>
As I said, so no need to add this inclusion in <mach/regs-clock.h>
Quoted 70 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +9
-0+#include <mach/regs-clock.h> +#include <mach/pm-exynos4210.h> + +#ifdef CONFIG_PM +static DEFINE_SPINLOCK (clkgate_block_lock); + +static int pd_power_down (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Disable the power of power-domain */ +__raw_writel (0 , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while (__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN) {arch/arm/mach-exynos4/pm-exynos4210.c new file +27
-0+if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s disable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn off */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg &= ~exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +} + +static int pd_power_up (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Enable power domain */ +__raw_writel (S5P_INT_LOCAL_PWR_EN , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while ((__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN)arch/arm/mach-exynos4/pm-exynos4210.c new file +14
-0+ != S5P_INT_LOCAL_PWR_EN) { +if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s enable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn on */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg;
arch/arm/mach-exynos4/pm-exynos4210.c line 99
Quoted 10 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +10
-0+ +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg |= exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +}
Would be better if you could add some common function for pd_power_up and _down...
I wonder why we need to add this for handling power domain not update current pd. As you know, they are having same/similar purpose and functions...
Quoted 88 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +7
-0+ +static bool pd_active_wakeup (struct device *dev) +{ +return true; +} + +void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd)arch/arm/mach-exynos4/pm-exynos4210.c new file +20
-0+{ +struct generic_pm_domain *genpd; + +if (!exynos4210_pd) +return ; + + genpd = &exynos4210_pd->genpd; + +pm_genpd_init (genpd,NULL , false); + genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up; + +if (exynos4210_pd->boot_on) +pd_power_up (&exynos4210_pd->genpd); +} + +void exynos4210_add_device_to_domain(struct exynos4210_pm_domain
*exynos4210_pd,arch/arm/mach-exynos4/pm-exynos4210.c new file +58
-1+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +if (exynos4210_pd && pdev) +pm_genpd_add_device (&exynos4210_pd->genpd, dev); +} + +struct exynos4210_pm_domain exynos4210_pd_mfc = { + .name ="PD_MFC" , + .base =S5P_PMU_MFC_CONF , + .mask =S5P_CLKGATE_BLOCK_MFC , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_g3d = { + .name ="PD_G3D" , + .base =S5P_PMU_G3D_CONF , + .mask =S5P_CLKGATE_BLOCK_G3D , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd0 = { + .name ="PD_LCD0" , + .base =S5P_PMU_LCD0_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD0 , + .boot_on =1 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd1 = { + .name ="PD_LCD1" , + .base =S5P_PMU_LCD1_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD1 , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_tv = { + .name ="PD_TV" , + .base =S5P_PMU_TV_CONF , + .mask =S5P_CLKGATE_BLOCK_TV , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_cam = { + .name ="PD_CAM" , + .base =S5P_PMU_CAM_CONF , + .mask =S5P_CLKGATE_BLOCK_CAM , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_gps = { + .name ="PD_GPS" , + .base =S5P_PMU_GPS_CONF , + .mask =S5P_CLKGATE_BLOCK_GPS , + .boot_on =0 , +}; + +#endif /* CONFIG_PM */ --
Quoted 1 line
1.7.0.4
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 10 lines · Kukjin Kim
Quoted 8 lines · Chanwoo Choi
Use the generic power domains support to implement support for power domain on EXYNOS4210.
I refer to the following patch to implement what configure the clock-gating control register for block to turn off/on:
http://git.infradead.org/users/kmpark/linux-2.6-
samsung/commit/39a81876d034dcbdc2a4c4c4b847b3b49e38870cI think, this should be moved under "---"
OK, I will move it.
Quoted 6 lines
Quoted 5 lines
This patch is based on following "pm-domains" branch.
http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-
2.6.git;a=shortlog;h=refs/heads/pm-domainsSame as above.
OK.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Chanwoo Choi <[email protected]>Signed-off-by Myungjoo Ham <[email protected]>Signed-off-by Kyungmin.park <[email protected]>Kyungmin Park?
My mistake. I will modify it.
Quoted 13 lines
Quoted 13 lines
--- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/include/mach/pm-exynos4210.h | 53 ++++++ arch/arm/mach-exynos4/include/mach/regs-clock.h | 8 + arch/arm/mach-exynos4/mach-nuri.c | 18 ++ arch/arm/mach-exynos4/pm-exynos4210.c | 184 ++++++++++++++++++++ 6 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/pm-exynos4210.h create mode 100644 arch/arm/mach-exynos4/pm-exynos4210.c
Quoted 12 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 9 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?
This patch apply the generic power-domain to NURI board.
If other board(EXYNOS4 series) use the generic power-domain,
I think that PM_GENERIC_DOMAINS config should be moved under CPU_EXYNOS4210 config.
If you prefer to move it under CPU_EXYNOS4210, I will modify it.
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-exynos4/Kconfig +0
-0help Machine support for Samsung Mobile NURI Board.arch/arm/mach-exynos4/Makefile +0
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
+obj-$(CONFIG_CPU_EXYNOS4210) += pm-exynos4210.oobj-$(CONFIG_SMP) += platsmp.o headsmp.o
Quoted 10 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be
linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h?
This patch support only power-domain of EXYNOS4210, so I named "pm-exynos4210.h" If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series. But, I don't know next EXYNOS4 series and then named "pm-exynos4210.h".
Do you want to change from "pm-exynos4210.h" to "pm-exynos4.h"?
Quoted 6 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 3
Quoted 3 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +2
-0+* +* Exynos4 Power management support Is this for EXYNOS4 or only EXYNOS4210?
Only EXYNOS4210. I will fix it.
Quoted 62 lines
Quoted 62 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +42
-0+* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef PM_EXYNOS4210_H +#define PM_EXYNOS4210_H + +#include <linux/pm_domain.h> +#include <plat/pd.h> + +struct platform_device ; + +struct exynos4210_pm_domain { +struct generic_pm_domain genpd; + +const char *name; +void __iomem *base; +u32 mask; +int boot_on; +}; + +static inline struct exynos4210_pm_domain *to_exynos4210_pd ( +struct generic_pm_domain *pd) +{ + return container_of(pd, struct exynos4210_pm_domain, genpd); +} + +#ifdef CONFIG_PM +extern struct exynos4210_pm_domain exynos4210_pd_mfc; +extern struct exynos4210_pm_domain exynos4210_pd_g3d; +extern struct exynos4210_pm_domain exynos4210_pd_lcd0; +extern struct exynos4210_pm_domain exynos4210_pd_lcd1; +extern struct exynos4210_pm_domain exynos4210_pd_tv; +extern struct exynos4210_pm_domain exynos4210_pd_cam; +extern struct exynos4210_pm_domain exynos4210_pd_gps; + +extern void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd);
+extern void exynos4210_add_device_to_domain(structexynos4210_pm_domain*exynos4210_pd,arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +7
-0+ struct platform_device *pdev); +#else +#define exynos4210_init_pm_domain (pd) do { } while(0) +#define exynos4_add_device_to_domain (pd, pdev) do { } while(0) +#endif /* CONFIG_PM */ + +#endif /* PM_EXYNOS4210_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0
exynos4/include/mach/regs-clock.h
index 6e311c1..bc0fda9 100644arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0@@ -171,6 +171,14 @@#define S5P_CLKDIV_BUS_GPLR_SHIFT (4)#define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT)
Quoted 3 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h line 174
Quoted 1 line
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+#define S5P_CLKGATE_BLOCK_CAM (1<<0)The blank should be added around "<<" like (1 << 0)
Ok, I will modify it.
Quoted 9 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h line 180
Quoted 7 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +6
-0+#define S5P_CLKGATE_BLOCK_TV (1<<1) +#define S5P_CLKGATE_BLOCK_MFC (1<<2) +#define S5P_CLKGATE_BLOCK_G3D (1<<3) +#define S5P_CLKGATE_BLOCK_LCD0 (1<<4) +#define S5P_CLKGATE_BLOCK_LCD1 (1<<5) +#define S5P_CLKGATE_BLOCK_GPS (1<<7)Same...
Ok.
Quoted 9 lines
Quoted 5 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <
mach/regs-pmu.h>Hmm...how about if this is required, just add the inclusion in c file?
Actually, you added above in
pm-exynos4210.c...
It was added before this patch, so I didn't consider it.
If you want to remove it, I apply this patch about removal of inclusion(mach/regs-pmu.h).
Quoted 18 lines
Quoted 18 lines
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0
-0
nuri.c
index 642702b..816c6f4 100644arch/arm/mach-exynos4/mach-nuri.c +1
-0@@ -37,6 +37,7 @@#include <plat/iic.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 | \@@ -376,6 +377,21 @@ static struct platform_device *nuri_devices[] __initdata = { &nuri_backlight_device, };
Quoted 12 lines
arch/arm/mach-exynos4/mach-nuri.c static struct platform_device *nuri_devices[] __initdata = { · line 389
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);Hmm, is this needed only on NURI?
As mentioned above, this patch support only NURI board.
If the generic power-domain to support EXYNOS4210 is used on other board, I think that it should apply the board file of other board using EXYNOS4210.
Quoted 43 lines
Quoted 43 lines
arch/arm/mach-exynos4/mach-nuri.c +5
-0+ +/* Add device to power-domain */ +exynos4210_add_device_to_domain (&exynos4210_pd_lcd0, &nuri_lcd_device); +} +static void __init nuri_map_io (void ) {arch/arm/mach-exynos4/mach-nuri.c +2
-0s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );@@ -398,6 +414,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/pm-exynos4210.c +0
-0
exynos4/pm-exynos4210.c
new file mode 100644
index 0000000..f44dcefarch/arm/mach-exynos4/pm-exynos4210.c new file +17
-0@@ -0,0 +1,184 @@ +/* linux/arch/arm/mach-exynos4/pm-exynos4210.c +* +* Exynos4210 Power management support +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/pm.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/slab.h>
Quoted 8 lines
arch/arm/mach-exynos4/pm-exynos4210.c line 23
Quoted 6 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +6
-0+#include <linux/pm_runtime.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> +#include <linux/io.h> + +#include <mach/regs-pmu.h> As I said, so no need to add this inclusion in <
mach/regs-clock.h>
Ok.
Quoted 75 lines
Quoted 75 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +9
-0+#include <mach/regs-clock.h> +#include <mach/pm-exynos4210.h> + +#ifdef CONFIG_PM +static DEFINE_SPINLOCK (clkgate_block_lock); + +static int pd_power_down (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Disable the power of power-domain */ +__raw_writel (0 , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while (__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN) {arch/arm/mach-exynos4/pm-exynos4210.c new file +27
-0+if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s disable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn off */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg &= ~exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +} + +static int pd_power_up (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Enable power domain */ +__raw_writel (S5P_INT_LOCAL_PWR_EN , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while ((__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN)arch/arm/mach-exynos4/pm-exynos4210.c new file +18
-0+ != S5P_INT_LOCAL_PWR_EN) { +if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s enable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn on */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg |= exynos4210_pd->mask;
Quoted 8 lines
arch/arm/mach-exynos4/pm-exynos4210.c line 63
Quoted 6 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +6
-0+__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +}Would be better if you could add some common function for
pd_power_upand_down...
What do you mean about common function?
The generic Power-domain framework provides callback function to control power-domain, so I implement the control function to support power-domain of EXYNOS4210.
We need the additional common function for EXYNOS4210 ???
You can see the below codes:
+ genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up;
Quoted 2 lines
I wonder why we need to add this for handling power domain not update current pd.
As you said, the generic power-domain framework isn't updated to Mainline, But, this patch prepares to support the subsequent power-domain framework, To review this patch, I posted it.
Quoted 2 lines
As you know, they are having same/similar purpose and functions...
I don't understand your comment exactly.
Don't your agree to use the generic Power-domain framework for SAMSUNG SoC? or Again, please decribe your comment in detail.
Quoted 93 lines
Quoted 88 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +7
-0+ +static bool pd_active_wakeup (struct device *dev) +{ +return true; +} + +void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd)arch/arm/mach-exynos4/pm-exynos4210.c new file +20
-0+{ +struct generic_pm_domain *genpd; + +if (!exynos4210_pd) +return ; + + genpd = &exynos4210_pd->genpd; + +pm_genpd_init (genpd,NULL , false); + genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up; + +if (exynos4210_pd->boot_on) +pd_power_up (&exynos4210_pd->genpd); +} + +void exynos4210_add_device_to_domain(struct exynos4210_pm_domain
*exynos4210_pd,arch/arm/mach-exynos4/pm-exynos4210.c new file +58
-1+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +if (exynos4210_pd && pdev) +pm_genpd_add_device (&exynos4210_pd->genpd, dev); +} + +struct exynos4210_pm_domain exynos4210_pd_mfc = { + .name ="PD_MFC" , + .base =S5P_PMU_MFC_CONF , + .mask =S5P_CLKGATE_BLOCK_MFC , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_g3d = { + .name ="PD_G3D" , + .base =S5P_PMU_G3D_CONF , + .mask =S5P_CLKGATE_BLOCK_G3D , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd0 = { + .name ="PD_LCD0" , + .base =S5P_PMU_LCD0_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD0 , + .boot_on =1 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd1 = { + .name ="PD_LCD1" , + .base =S5P_PMU_LCD1_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD1 , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_tv = { + .name ="PD_TV" , + .base =S5P_PMU_TV_CONF , + .mask =S5P_CLKGATE_BLOCK_TV , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_cam = { + .name ="PD_CAM" , + .base =S5P_PMU_CAM_CONF , + .mask =S5P_CLKGATE_BLOCK_CAM , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_gps = { + .name ="PD_GPS" , + .base =S5P_PMU_GPS_CONF , + .mask =S5P_CLKGATE_BLOCK_GPS , + .boot_on =0 , +}; + +#endif /* CONFIG_PM */ --Quoted 1 line
1.7.0.4
Thanks.
Quoted 7 lines
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Thanks,
Best regards,
Chanwoo Choi
Quoted 2 lines · Chanwoo Choi
Kukjin Kim wrote:
(snip)
Quoted 9 lines
Quoted 8 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 5 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?This patch apply the generic power-domain to NURI board.
I mean, the PM_GENERIC_DOMAINS feature depends on CPU not board even though this is for only NURI board.
(snip)
Quoted 10 lines
Quoted 10 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be linux/arch/arm/mach-
Quoted 2 lines
exynos4/include/mach/pm-exynos4210.h?
I said just typo...
+/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h
Quoted 4 lines
This patch support only power-domain of EXYNOS4210, so I named "pm-
exynos4210.h"
If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series.
No need it, it's different.
(snip)
Quoted 5 lines
Quoted 1 line
Would be better if you could add some common function for
pd_power_upand
_down...What do you mean about common function?
I thought, pd_power_up and _down can be implemented in one function.
(snip)
Quoted 3 lines
Quoted 1 line
I wonder why we need to add this for handling power domain not update current
pd.
See arch/arm/mach-exynos4/dev-pd.c
I mean, we _really_ need to keep duplication files for handling power domain?...
(snip)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 2 lines · Chanwoo Choi
Kukjin Kim wrote:
(snip)
Quoted 9 lines
Quoted 8 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 5 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?This patch apply the generic power-domain to NURI board.
I mean, the PM_GENERIC_DOMAINS feature depends on CPU not board even though this is for only NURI board.
(snip)
Quoted 10 lines
Quoted 10 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be linux/arch/arm/mach-
Quoted 2 lines
exynos4/include/mach/pm-exynos4210.h?
I said just typo...
+/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h
Quoted 4 lines
This patch support only power-domain of EXYNOS4210, so I named "pm-
exynos4210.h"
If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series.
No need it, it's different.
(snip)
Quoted 5 lines
Quoted 1 line
Would be better if you could add some common function for
pd_power_upand
_down...What do you mean about common function?
I thought, pd_power_up and _down can be implemented in one function.
(snip)
Quoted 3 lines
Quoted 1 line
I wonder why we need to add this for handling power domain not update current
pd.
See arch/arm/mach-exynos4/dev-pd.c
I mean, we _really_ need to keep duplication files for handling power domain?...
(snip)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 12 lines · Kukjin Kim
Quoted 1 line · Chanwoo Choi
Kukjin Kim wrote:
(snip)
Quoted 7 lines
Quoted 7 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 5 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?
Quoted 4 lines
Quoted 1 line
This patch apply the generic power-domain to NURI board.
I mean, the
PM_GENERIC_DOMAINSfeature depends on CPU not board even though this is for only NURI board.
OK, I will move it from CONFIG_MACH_NURI to CONFIG_CPU_EXYNOS4210 in arch/arm/mach-exynos4/Kconfig.
Quoted 15 lines
(snip)
Quoted 11 lines
Quoted 9 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be linux/arch/arm/mach-
exynos4/include/mach/pm-exynos4210.h?I said just typo...
Quoted 8 lines
+/*
linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.hQuoted 4 lines
This patch support only power-domain of EXYNOS4210, so I named "pm-
exynos4210.h"
If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series.No need it, it's different.
My mistake. I will fix it.
Quoted 10 lines
(snip)
Quoted 5 lines
Quoted 1 line
Would be better if you could add some common function for
pd_power_upand
_down...What do you mean about common function?
I thought,
pd_power_upand_downcan be implemented in one function.
OK, If you want to combine two function(pd_power_up and pd_power_down), I will modify it.
Quoted 8 lines
(snip)
Quoted 3 lines
Quoted 1 line
I wonder why we need to add this for handling power domain not update current
pd.
See
arch/arm/mach-exynos4/dev-pd.cI mean, we _really_ need to keep duplication files for handling power domain?...
Now, you're right.
But, If Generic Power-domain Framework will be applied to the mainline, I think it necessary that we should apply Generic Power-domain Framework to all of the board using EXYNOS4210(arch/arm/mach-exynos4) and delete old power-domain (arch/arm/mach-exynos4/dev-pd.c) to remove duplication file.
Thanks & Regards,
Chanwoo Choi
Quoted 12 lines · Kukjin Kim
Quoted 1 line · Chanwoo Choi
Kukjin Kim wrote:
(snip)
Quoted 7 lines
Quoted 7 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 5 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?
Quoted 4 lines
Quoted 1 line
This patch apply the generic power-domain to NURI board.
I mean, the
PM_GENERIC_DOMAINSfeature depends on CPU not board even though this is for only NURI board.
OK, I will move it from CONFIG_MACH_NURI to CONFIG_CPU_EXYNOS4210 in arch/arm/mach-exynos4/Kconfig.
Quoted 15 lines
(snip)
Quoted 11 lines
Quoted 9 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be linux/arch/arm/mach-
exynos4/include/mach/pm-exynos4210.h?I said just typo...
Quoted 8 lines
+/*
linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.hQuoted 4 lines
This patch support only power-domain of EXYNOS4210, so I named "pm-
exynos4210.h"
If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series.No need it, it's different.
My mistake. I will fix it.
Quoted 10 lines
(snip)
Quoted 5 lines
Quoted 1 line
Would be better if you could add some common function for
pd_power_upand
_down...What do you mean about common function?
I thought,
pd_power_upand_downcan be implemented in one function.
OK, If you want to combine two function(pd_power_up and pd_power_down), I will modify it.
Quoted 8 lines
(snip)
Quoted 3 lines
Quoted 1 line
I wonder why we need to add this for handling power domain not update current
pd.
See
arch/arm/mach-exynos4/dev-pd.cI mean, we _really_ need to keep duplication files for handling power domain?...
Now, you're right.
But, If Generic Power-domain Framework will be applied to the mainline, I think it necessary that we should apply Generic Power-domain Framework to all of the board using EXYNOS4210(arch/arm/mach-exynos4) and delete old power-domain (arch/arm/mach-exynos4/dev-pd.c) to remove duplication file.
Thanks & Regards,
Chanwoo Choi
Quoted 10 lines · Kukjin Kim
Quoted 8 lines · Chanwoo Choi
Use the generic power domains support to implement support for power domain on EXYNOS4210.
I refer to the following patch to implement what configure the clock-gating control register for block to turn off/on:
http://git.infradead.org/users/kmpark/linux-2.6-
samsung/commit/39a81876d034dcbdc2a4c4c4b847b3b49e38870cI think, this should be moved under "---"
OK, I will move it.
Quoted 6 lines
Quoted 5 lines
This patch is based on following "pm-domains" branch.
http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-
2.6.git;a=shortlog;h=refs/heads/pm-domainsSame as above.
OK.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Chanwoo Choi <[email protected]>Signed-off-by Myungjoo Ham <[email protected]>Signed-off-by Kyungmin.park <[email protected]>Kyungmin Park?
My mistake. I will modify it.
Quoted 13 lines
Quoted 13 lines
--- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/include/mach/pm-exynos4210.h | 53 ++++++ arch/arm/mach-exynos4/include/mach/regs-clock.h | 8 + arch/arm/mach-exynos4/mach-nuri.c | 18 ++ arch/arm/mach-exynos4/pm-exynos4210.c | 184 ++++++++++++++++++++ 6 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/pm-exynos4210.h create mode 100644 arch/arm/mach-exynos4/pm-exynos4210.c
Quoted 12 lines
arch/arm/mach-exynos4/Kconfig config MACH_NURI · line 186
Quoted 9 lines
arch/arm/mach-exynos4/Kconfig +1
-0@@ -183,6 +183,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select PM_GENERIC_DOMAINS if PMDo you _really_ think this should be under
MACH_NURI?
This patch apply the generic power-domain to NURI board.
If other board(EXYNOS4 series) use the generic power-domain,
I think that PM_GENERIC_DOMAINS config should be moved under CPU_EXYNOS4210 config.
If you prefer to move it under CPU_EXYNOS4210, I will modify it.
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-exynos4/Kconfig +0
-0help Machine support for Samsung Mobile NURI Board.arch/arm/mach-exynos4/Makefile +0
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
+obj-$(CONFIG_CPU_EXYNOS4210) += pm-exynos4210.oobj-$(CONFIG_SMP) += platsmp.o headsmp.o
Quoted 10 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 1
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +1
-0@@ -0,0 +1,53 @@ +/* linux/arch/arm/mach-exynos4/include/mach/pm-exynos4.h According to your file name, should be
linux/arch/arm/mach-exynos4/include/mach/pm-exynos4210.h?
This patch support only power-domain of EXYNOS4210, so I named "pm-exynos4210.h" If EXYNOS4 series board will be released, I will modify include file name from "pm-exynos4210.h" to "pm-exynos4.h" to support all EXYNOS4 series. But, I don't know next EXYNOS4 series and then named "pm-exynos4210.h".
Do you want to change from "pm-exynos4210.h" to "pm-exynos4.h"?
Quoted 6 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h line 3
Quoted 3 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +2
-0+* +* Exynos4 Power management support Is this for EXYNOS4 or only EXYNOS4210?
Only EXYNOS4210. I will fix it.
Quoted 62 lines
Quoted 62 lines
arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +42
-0+* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef PM_EXYNOS4210_H +#define PM_EXYNOS4210_H + +#include <linux/pm_domain.h> +#include <plat/pd.h> + +struct platform_device ; + +struct exynos4210_pm_domain { +struct generic_pm_domain genpd; + +const char *name; +void __iomem *base; +u32 mask; +int boot_on; +}; + +static inline struct exynos4210_pm_domain *to_exynos4210_pd ( +struct generic_pm_domain *pd) +{ + return container_of(pd, struct exynos4210_pm_domain, genpd); +} + +#ifdef CONFIG_PM +extern struct exynos4210_pm_domain exynos4210_pd_mfc; +extern struct exynos4210_pm_domain exynos4210_pd_g3d; +extern struct exynos4210_pm_domain exynos4210_pd_lcd0; +extern struct exynos4210_pm_domain exynos4210_pd_lcd1; +extern struct exynos4210_pm_domain exynos4210_pd_tv; +extern struct exynos4210_pm_domain exynos4210_pd_cam; +extern struct exynos4210_pm_domain exynos4210_pd_gps; + +extern void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd);
+extern void exynos4210_add_device_to_domain(structexynos4210_pm_domain*exynos4210_pd,arch/arm/mach-exynos4/include/mach/pm-exynos4210.h new file +7
-0+ struct platform_device *pdev); +#else +#define exynos4210_init_pm_domain (pd) do { } while(0) +#define exynos4_add_device_to_domain (pd, pdev) do { } while(0) +#endif /* CONFIG_PM */ + +#endif /* PM_EXYNOS4210_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0
exynos4/include/mach/regs-clock.h
index 6e311c1..bc0fda9 100644arch/arm/mach-exynos4/include/mach/regs-clock.h +0
-0@@ -171,6 +171,14 @@#define S5P_CLKDIV_BUS_GPLR_SHIFT (4)#define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT)
Quoted 3 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h line 174
Quoted 1 line
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+#define S5P_CLKGATE_BLOCK_CAM (1<<0)The blank should be added around "<<" like (1 << 0)
Ok, I will modify it.
Quoted 9 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h line 180
Quoted 7 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +6
-0+#define S5P_CLKGATE_BLOCK_TV (1<<1) +#define S5P_CLKGATE_BLOCK_MFC (1<<2) +#define S5P_CLKGATE_BLOCK_G3D (1<<3) +#define S5P_CLKGATE_BLOCK_LCD0 (1<<4) +#define S5P_CLKGATE_BLOCK_LCD1 (1<<5) +#define S5P_CLKGATE_BLOCK_GPS (1<<7)Same...
Ok.
Quoted 9 lines
Quoted 5 lines
arch/arm/mach-exynos4/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <
mach/regs-pmu.h>Hmm...how about if this is required, just add the inclusion in c file?
Actually, you added above in
pm-exynos4210.c...
It was added before this patch, so I didn't consider it.
If you want to remove it, I apply this patch about removal of inclusion(mach/regs-pmu.h).
Quoted 18 lines
Quoted 18 lines
arch/arm/mach-exynos4/mach- renamed from arch/arm/mach-exynos4/mach-nuri.c +0
-0
nuri.c
index 642702b..816c6f4 100644arch/arm/mach-exynos4/mach-nuri.c +1
-0@@ -37,6 +37,7 @@#include <plat/iic.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 | \@@ -376,6 +377,21 @@ static struct platform_device *nuri_devices[] __initdata = { &nuri_backlight_device, };
Quoted 12 lines
arch/arm/mach-exynos4/mach-nuri.c static struct platform_device *nuri_devices[] __initdata = { · line 389
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);Hmm, is this needed only on NURI?
As mentioned above, this patch support only NURI board.
If the generic power-domain to support EXYNOS4210 is used on other board, I think that it should apply the board file of other board using EXYNOS4210.
Quoted 43 lines
Quoted 43 lines
arch/arm/mach-exynos4/mach-nuri.c +5
-0+ +/* Add device to power-domain */ +exynos4210_add_device_to_domain (&exynos4210_pd_lcd0, &nuri_lcd_device); +} +static void __init nuri_map_io (void ) {arch/arm/mach-exynos4/mach-nuri.c +2
-0s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );@@ -398,6 +414,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/pm-exynos4210.c +0
-0
exynos4/pm-exynos4210.c
new file mode 100644
index 0000000..f44dcefarch/arm/mach-exynos4/pm-exynos4210.c new file +17
-0@@ -0,0 +1,184 @@ +/* linux/arch/arm/mach-exynos4/pm-exynos4210.c +* +* Exynos4210 Power management support +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/pm.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/slab.h>
Quoted 8 lines
arch/arm/mach-exynos4/pm-exynos4210.c line 23
Quoted 6 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +6
-0+#include <linux/pm_runtime.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> +#include <linux/io.h> + +#include <mach/regs-pmu.h> As I said, so no need to add this inclusion in <
mach/regs-clock.h>
Ok.
Quoted 75 lines
Quoted 75 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +9
-0+#include <mach/regs-clock.h> +#include <mach/pm-exynos4210.h> + +#ifdef CONFIG_PM +static DEFINE_SPINLOCK (clkgate_block_lock); + +static int pd_power_down (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Disable the power of power-domain */ +__raw_writel (0 , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while (__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN) {arch/arm/mach-exynos4/pm-exynos4210.c new file +27
-0+if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s disable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn off */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg &= ~exynos4210_pd->mask; +__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +} + +static int pd_power_up (struct generic_pm_domain *genpd) +{ + struct exynos4210_pm_domain *exynos4210_pd =
to_exynos4210_pd(genpd);arch/arm/mach-exynos4/pm-exynos4210.c new file +8
-0+u32 timeout; + +/* Enable power domain */ +__raw_writel (S5P_INT_LOCAL_PWR_EN , exynos4210_pd->base); + +/* Wait max 1ms */ + timeout =10 ; + while ((__raw_readl(exynos4210_pd->base + 0x4) &
S5P_INT_LOCAL_PWR_EN)arch/arm/mach-exynos4/pm-exynos4210.c new file +18
-0+ != S5P_INT_LOCAL_PWR_EN) { +if (timeout ==0 ) { +printk (KERN_ERR "Power domain %s enable failed.\n" , + exynos4210_pd->name); +return -ETIMEDOUT ; + } + timeout--; +udelay (100 ); + } + +/* Configure the clock-gating control register for block to turn on */ +if (exynos4210_pd->mask) { +unsigned long flags; +u32 reg; + +spin_lock_irqsave (&clkgate_block_lock, flags); + reg =__raw_readl (S5P_CLKGATE_BLOCK ); + reg |= exynos4210_pd->mask;
Quoted 8 lines
arch/arm/mach-exynos4/pm-exynos4210.c line 63
Quoted 6 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +6
-0+__raw_writel (reg,S5P_CLKGATE_BLOCK ); +spin_unlock_irqrestore (&clkgate_block_lock, flags); + } + +return 0 ; +}Would be better if you could add some common function for
pd_power_upand_down...
What do you mean about common function?
The generic Power-domain framework provides callback function to control power-domain, so I implement the control function to support power-domain of EXYNOS4210.
We need the additional common function for EXYNOS4210 ???
You can see the below codes:
+ genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up;
Quoted 2 lines
I wonder why we need to add this for handling power domain not update current pd.
As you said, the generic power-domain framework isn't updated to Mainline, But, this patch prepares to support the subsequent power-domain framework, To review this patch, I posted it.
Quoted 2 lines
As you know, they are having same/similar purpose and functions...
I don't understand your comment exactly.
Don't your agree to use the generic Power-domain framework for SAMSUNG SoC? or Again, please decribe your comment in detail.
Quoted 93 lines
Quoted 88 lines
arch/arm/mach-exynos4/pm-exynos4210.c new file +7
-0+ +static bool pd_active_wakeup (struct device *dev) +{ +return true; +} + +void exynos4210_init_pm_domain(struct exynos4210_pm_domain
*exynos4210_pd)arch/arm/mach-exynos4/pm-exynos4210.c new file +20
-0+{ +struct generic_pm_domain *genpd; + +if (!exynos4210_pd) +return ; + + genpd = &exynos4210_pd->genpd; + +pm_genpd_init (genpd,NULL , false); + genpd->stop_device = pm_clk_suspend; + genpd->start_device = pm_clk_resume; + genpd->active_wakeup = pd_active_wakeup; + genpd->power_off = pd_power_down; + genpd->power_on = pd_power_up; + +if (exynos4210_pd->boot_on) +pd_power_up (&exynos4210_pd->genpd); +} + +void exynos4210_add_device_to_domain(struct exynos4210_pm_domain
*exynos4210_pd,arch/arm/mach-exynos4/pm-exynos4210.c new file +58
-1+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +if (exynos4210_pd && pdev) +pm_genpd_add_device (&exynos4210_pd->genpd, dev); +} + +struct exynos4210_pm_domain exynos4210_pd_mfc = { + .name ="PD_MFC" , + .base =S5P_PMU_MFC_CONF , + .mask =S5P_CLKGATE_BLOCK_MFC , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_g3d = { + .name ="PD_G3D" , + .base =S5P_PMU_G3D_CONF , + .mask =S5P_CLKGATE_BLOCK_G3D , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd0 = { + .name ="PD_LCD0" , + .base =S5P_PMU_LCD0_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD0 , + .boot_on =1 , +}; + +struct exynos4210_pm_domain exynos4210_pd_lcd1 = { + .name ="PD_LCD1" , + .base =S5P_PMU_LCD1_CONF , + .mask =S5P_CLKGATE_BLOCK_LCD1 , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_tv = { + .name ="PD_TV" , + .base =S5P_PMU_TV_CONF , + .mask =S5P_CLKGATE_BLOCK_TV , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_cam = { + .name ="PD_CAM" , + .base =S5P_PMU_CAM_CONF , + .mask =S5P_CLKGATE_BLOCK_CAM , + .boot_on =0 , +}; + +struct exynos4210_pm_domain exynos4210_pd_gps = { + .name ="PD_GPS" , + .base =S5P_PMU_GPS_CONF , + .mask =S5P_CLKGATE_BLOCK_GPS , + .boot_on =0 , +}; + +#endif /* CONFIG_PM */ --Quoted 1 line
1.7.0.4
Thanks.
Quoted 7 lines
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Thanks,
Best regards,
Chanwoo Choi