[PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[Bartlomiej Zolnierkiewicz]

From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

Nowadays we use generic power domain support instead of Samsung
specific power domain control driver.

Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

 arch/arm/mach-exynos/mach-nuri.c           |    1 
 arch/arm/mach-exynos/mach-origen.c         |    1 
 arch/arm/mach-exynos/mach-smdkv310.c       |    1 
 arch/arm/mach-exynos/mach-universal_c210.c |    1 
 arch/arm/plat-samsung/Kconfig              |    8 --
 arch/arm/plat-samsung/Makefile             |    4 -
 arch/arm/plat-samsung/include/plat/devs.h  |    1 
 arch/arm/plat-samsung/include/plat/pd.h    |   30 ---------
 arch/arm/plat-samsung/pd.c                 |   95 -----------------------------
 9 files changed, 142 deletions(-)

Index: linux-sprc/arch/arm/mach-exynos/mach-nuri.c
===================================================================
--- linux-sprc.orig/arch/arm/mach-exynos/mach-nuri.c	2012-03-06 15:59:13.432481942 +0100
+++ linux-sprc/arch/arm/mach-exynos/mach-nuri.c	2012-03-06 15:59:22.528481940 +0100
@@ -48,7 +48,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
 #include <plat/mfc.h>
-#include <plat/pd.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 #include <plat/mipi_csis.h>
Index: linux-sprc/arch/arm/mach-exynos/mach-origen.c
===================================================================
--- linux-sprc.orig/arch/arm/mach-exynos/mach-origen.c	2012-03-06 15:59:13.432481942 +0100
+++ linux-sprc/arch/arm/mach-exynos/mach-origen.c	2012-03-06 15:59:22.528481940 +0100
@@ -38,7 +38,6 @@
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
-#include <plat/pd.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
Index: linux-sprc/arch/arm/mach-exynos/mach-smdkv310.c
===================================================================
--- linux-sprc.orig/arch/arm/mach-exynos/mach-smdkv310.c	2012-03-06 15:59:13.432481942 +0100
+++ linux-sprc/arch/arm/mach-exynos/mach-smdkv310.c	2012-03-06 15:59:22.532481931 +0100
@@ -34,7 +34,6 @@
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/iic.h>
-#include <plat/pd.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
Index: linux-sprc/arch/arm/mach-exynos/mach-universal_c210.c
===================================================================
--- linux-sprc.orig/arch/arm/mach-exynos/mach-universal_c210.c	2012-03-06 15:59:13.432481942 +0100
+++ linux-sprc/arch/arm/mach-exynos/mach-universal_c210.c	2012-03-06 15:59:22.532481931 +0100
@@ -35,7 +35,6 @@
 #include <plat/fb.h>
 #include <plat/mfc.h>
 #include <plat/sdhci.h>
-#include <plat/pd.h>
 #include <plat/regs-fb-v4.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
Index: linux-sprc/arch/arm/plat-samsung/Kconfig
===================================================================
--- linux-sprc.orig/arch/arm/plat-samsung/Kconfig	2012-03-06 15:57:57.092481952 +0100
+++ linux-sprc/arch/arm/plat-samsung/Kconfig	2012-03-06 15:59:22.532481931 +0100
@@ -350,14 +350,6 @@
 	  and above. This code allows a set of interrupt to wakeup-mask
 	  mappings. See <plat/wakeup-mask.h>
 
-comment "Power Domain"
-
-config SAMSUNG_PD
-	bool "Samsung Power Domain"
-	depends on PM_RUNTIME
-	help
-	  Say Y here if you want to control Power Domain by Runtime PM.
-
 config DEBUG_S3C_UART
 	depends on PLAT_SAMSUNG
 	int
Index: linux-sprc/arch/arm/plat-samsung/Makefile
===================================================================
--- linux-sprc.orig/arch/arm/plat-samsung/Makefile	2012-03-06 15:57:57.092481952 +0100
+++ linux-sprc/arch/arm/plat-samsung/Makefile	2012-03-06 15:59:22.532481931 +0100
@@ -47,10 +47,6 @@
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
 
-# PD support
-
-obj-$(CONFIG_SAMSUNG_PD)	+= pd.o
-
 # PWM support
 
 obj-$(CONFIG_HAVE_PWM)		+= pwm.o
Index: linux-sprc/arch/arm/plat-samsung/include/plat/devs.h
===================================================================
--- linux-sprc.orig/arch/arm/plat-samsung/include/plat/devs.h	2012-03-06 15:59:13.444481941 +0100
+++ linux-sprc/arch/arm/plat-samsung/include/plat/devs.h	2012-03-06 15:59:22.532481931 +0100
@@ -128,7 +128,6 @@
 extern struct platform_device exynos4_device_pcm0;
 extern struct platform_device exynos4_device_pcm1;
 extern struct platform_device exynos4_device_pcm2;
-extern struct platform_device exynos4_device_pd[];
 extern struct platform_device exynos4_device_spdif;
 extern struct platform_device exynos4_device_sysmmu;
 
Index: linux-sprc/arch/arm/plat-samsung/include/plat/pd.h
===================================================================
--- linux-sprc.orig/arch/arm/plat-samsung/include/plat/pd.h	2012-03-06 15:59:13.444481941 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/pd.h
- *
- * Copyright (c) 2010-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 __ASM_PLAT_SAMSUNG_PD_H
-#define __ASM_PLAT_SAMSUNG_PD_H __FILE__
-
-struct samsung_pd_info {
-	int (*enable)(struct device *dev);
-	int (*disable)(struct device *dev);
-	void __iomem *base;
-};
-
-enum exynos4_pd_block {
-	PD_MFC,
-	PD_G3D,
-	PD_LCD0,
-	PD_LCD1,
-	PD_TV,
-	PD_CAM,
-	PD_GPS
-};
-
-#endif /* __ASM_PLAT_SAMSUNG_PD_H */
Index: linux-sprc/arch/arm/plat-samsung/pd.c
===================================================================
--- linux-sprc.orig/arch/arm/plat-samsung/pd.c	2012-03-06 15:57:57.000000000 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/* linux/arch/arm/plat-samsung/pd.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Samsung Power domain support
- *
- * 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/init.h>
-#include <linux/export.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/pm_runtime.h>
-
-#include <plat/pd.h>
-
-static int samsung_pd_probe(struct platform_device *pdev)
-{
-	struct samsung_pd_info *pdata = pdev->dev.platform_data;
-	struct device *dev = &pdev->dev;
-
-	if (!pdata) {
-		dev_err(dev, "no device data specified\n");
-		return -ENOENT;
-	}
-
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	dev_info(dev, "power domain registered\n");
-	return 0;
-}
-
-static int __devexit samsung_pd_remove(struct platform_device *pdev)
-{
-	struct device *dev = &pdev->dev;
-
-	pm_runtime_disable(dev);
-	return 0;
-}
-
-static int samsung_pd_runtime_suspend(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->disable)
-		ret = pdata->disable(dev);
-
-	dev_dbg(dev, "suspended\n");
-	return ret;
-}
-
-static int samsung_pd_runtime_resume(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->enable)
-		ret = pdata->enable(dev);
-
-	dev_dbg(dev, "resumed\n");
-	return ret;
-}
-
-static const struct dev_pm_ops samsung_pd_pm_ops = {
-	.runtime_suspend	= samsung_pd_runtime_suspend,
-	.runtime_resume		= samsung_pd_runtime_resume,
-};
-
-static struct platform_driver samsung_pd_driver = {
-	.driver		= {
-		.name		= "samsung-pd",
-		.owner		= THIS_MODULE,
-		.pm		= &samsung_pd_pm_ops,
-	},
-	.probe		= samsung_pd_probe,
-	.remove		= __devexit_p(samsung_pd_remove),
-};
-
-static int __init samsung_pd_init(void)
-{
-	int ret;
-
-	ret = platform_driver_register(&samsung_pd_driver);
-	if (ret)
-		printk(KERN_ERR "%s: failed to add PD driver\n", __func__);
-
-	return ret;
-}
-arch_initcall(samsung_pd_init);

RE: [PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[Kukjin Kim]

Bartlomiej Zolnierkiewicz wrote:
> 
> From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific
> power domain control
> 
> Nowadays we use generic power domain support instead of Samsung
> specific power domain control driver.
> 
> Cc: Thomas Abraham <thomas.abraham@linaro.org>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rafael J. Wysocki <rjw@sisk.pl>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> 
>  arch/arm/mach-exynos/mach-nuri.c           |    1
>  arch/arm/mach-exynos/mach-origen.c         |    1
>  arch/arm/mach-exynos/mach-smdkv310.c       |    1
>  arch/arm/mach-exynos/mach-universal_c210.c |    1
>  arch/arm/plat-samsung/Kconfig              |    8 --
>  arch/arm/plat-samsung/Makefile             |    4 -
>  arch/arm/plat-samsung/include/plat/devs.h  |    1
>  arch/arm/plat-samsung/include/plat/pd.h    |   30 ---------
>  arch/arm/plat-samsung/pd.c                 |   95
----------------------------
> -
>  9 files changed, 142 deletions(-)
> 
> Index: linux-sprc/arch/arm/mach-exynos/mach-nuri.c
> ===================================================================
> --- linux-sprc.orig/arch/arm/mach-exynos/mach-nuri.c	2012-03-06
> 15:59:13.432481942 +0100
> +++ linux-sprc/arch/arm/mach-exynos/mach-nuri.c	2012-03-06
> 15:59:22.528481940 +0100
> @@ -48,7 +48,6 @@
>  #include <plat/gpio-cfg.h>
>  #include <plat/iic.h>
>  #include <plat/mfc.h>
> -#include <plat/pd.h>
>  #include <plat/fimc-core.h>
>  #include <plat/camport.h>
>  #include <plat/mipi_csis.h>
> Index: linux-sprc/arch/arm/mach-exynos/mach-origen.c
> ===================================================================
> --- linux-sprc.orig/arch/arm/mach-exynos/mach-origen.c	2012-03-06
> 15:59:13.432481942 +0100
> +++ linux-sprc/arch/arm/mach-exynos/mach-origen.c	2012-03-06
> 15:59:22.528481940 +0100
> @@ -38,7 +38,6 @@
>  #include <plat/clock.h>
>  #include <plat/gpio-cfg.h>
>  #include <plat/backlight.h>
> -#include <plat/pd.h>
>  #include <plat/fb.h>
>  #include <plat/mfc.h>
> 
> Index: linux-sprc/arch/arm/mach-exynos/mach-smdkv310.c
> ===================================================================
> --- linux-sprc.orig/arch/arm/mach-exynos/mach-smdkv310.c	2012-03-06
> 15:59:13.432481942 +0100
> +++ linux-sprc/arch/arm/mach-exynos/mach-smdkv310.c	2012-03-06
> 15:59:22.532481931 +0100
> @@ -34,7 +34,6 @@
>  #include <plat/keypad.h>
>  #include <plat/sdhci.h>
>  #include <plat/iic.h>
> -#include <plat/pd.h>
>  #include <plat/gpio-cfg.h>
>  #include <plat/backlight.h>
>  #include <plat/mfc.h>
> Index: linux-sprc/arch/arm/mach-exynos/mach-universal_c210.c
> ===================================================================
> --- linux-sprc.orig/arch/arm/mach-exynos/mach-universal_c210.c
2012-
> 03-06 15:59:13.432481942 +0100
> +++ linux-sprc/arch/arm/mach-exynos/mach-universal_c210.c	2012-03-06
> 15:59:22.532481931 +0100
> @@ -35,7 +35,6 @@
>  #include <plat/fb.h>
>  #include <plat/mfc.h>
>  #include <plat/sdhci.h>
> -#include <plat/pd.h>
>  #include <plat/regs-fb-v4.h>
>  #include <plat/fimc-core.h>
>  #include <plat/camport.h>
> Index: linux-sprc/arch/arm/plat-samsung/Kconfig
> ===================================================================
> --- linux-sprc.orig/arch/arm/plat-samsung/Kconfig	2012-03-06
> 15:57:57.092481952 +0100
> +++ linux-sprc/arch/arm/plat-samsung/Kconfig	2012-03-06
> 15:59:22.532481931 +0100
> @@ -350,14 +350,6 @@
>  	  and above. This code allows a set of interrupt to wakeup-mask
>  	  mappings. See <plat/wakeup-mask.h>
> 
> -comment "Power Domain"
> -
> -config SAMSUNG_PD
> -	bool "Samsung Power Domain"
> -	depends on PM_RUNTIME
> -	help
> -	  Say Y here if you want to control Power Domain by Runtime PM.
> -
>  config DEBUG_S3C_UART
>  	depends on PLAT_SAMSUNG
>  	int
> Index: linux-sprc/arch/arm/plat-samsung/Makefile
> ===================================================================
> --- linux-sprc.orig/arch/arm/plat-samsung/Makefile	2012-03-06
> 15:57:57.092481952 +0100
> +++ linux-sprc/arch/arm/plat-samsung/Makefile	2012-03-06
> 15:59:22.532481931 +0100
> @@ -47,10 +47,6 @@
> 
>  obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
> 
> -# PD support
> -
> -obj-$(CONFIG_SAMSUNG_PD)	+= pd.o
> -
>  # PWM support
> 
>  obj-$(CONFIG_HAVE_PWM)		+= pwm.o
> Index: linux-sprc/arch/arm/plat-samsung/include/plat/devs.h
> ===================================================================
> --- linux-sprc.orig/arch/arm/plat-samsung/include/plat/devs.h	2012-
> 03-06 15:59:13.444481941 +0100
> +++ linux-sprc/arch/arm/plat-samsung/include/plat/devs.h	2012-03-06
> 15:59:22.532481931 +0100
> @@ -128,7 +128,6 @@
>  extern struct platform_device exynos4_device_pcm0;
>  extern struct platform_device exynos4_device_pcm1;
>  extern struct platform_device exynos4_device_pcm2;
> -extern struct platform_device exynos4_device_pd[];
>  extern struct platform_device exynos4_device_spdif;
>  extern struct platform_device exynos4_device_sysmmu;
> 
> Index: linux-sprc/arch/arm/plat-samsung/include/plat/pd.h
> ===================================================================
> --- linux-sprc.orig/arch/arm/plat-samsung/include/plat/pd.h	2012-03-06
> 15:59:13.444481941 +0100
> +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
> @@ -1,30 +0,0 @@
> -/* linux/arch/arm/plat-samsung/include/plat/pd.h
> - *
> - * Copyright (c) 2010-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 __ASM_PLAT_SAMSUNG_PD_H
> -#define __ASM_PLAT_SAMSUNG_PD_H __FILE__
> -
> -struct samsung_pd_info {
> -	int (*enable)(struct device *dev);
> -	int (*disable)(struct device *dev);
> -	void __iomem *base;
> -};
> -
> -enum exynos4_pd_block {
> -	PD_MFC,
> -	PD_G3D,
> -	PD_LCD0,
> -	PD_LCD1,
> -	PD_TV,
> -	PD_CAM,
> -	PD_GPS
> -};
> -
> -#endif /* __ASM_PLAT_SAMSUNG_PD_H */
> Index: linux-sprc/arch/arm/plat-samsung/pd.c
> ===================================================================
> --- linux-sprc.orig/arch/arm/plat-samsung/pd.c	2012-03-06
> 15:57:57.000000000 +0100
> +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
> @@ -1,95 +0,0 @@
> -/* linux/arch/arm/plat-samsung/pd.c
> - *
> - * Copyright (c) 2010 Samsung Electronics Co., Ltd.
> - *		http://www.samsung.com
> - *
> - * Samsung Power domain support
> - *
> - * 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/init.h>
> -#include <linux/export.h>
> -#include <linux/platform_device.h>
> -#include <linux/err.h>
> -#include <linux/pm_runtime.h>
> -
> -#include <plat/pd.h>
> -
> -static int samsung_pd_probe(struct platform_device *pdev)
> -{
> -	struct samsung_pd_info *pdata = pdev->dev.platform_data;
> -	struct device *dev = &pdev->dev;
> -
> -	if (!pdata) {
> -		dev_err(dev, "no device data specified\n");
> -		return -ENOENT;
> -	}
> -
> -	pm_runtime_set_active(dev);
> -	pm_runtime_enable(dev);
> -
> -	dev_info(dev, "power domain registered\n");
> -	return 0;
> -}
> -
> -static int __devexit samsung_pd_remove(struct platform_device *pdev)
> -{
> -	struct device *dev = &pdev->dev;
> -
> -	pm_runtime_disable(dev);
> -	return 0;
> -}
> -
> -static int samsung_pd_runtime_suspend(struct device *dev)
> -{
> -	struct samsung_pd_info *pdata = dev->platform_data;
> -	int ret = 0;
> -
> -	if (pdata->disable)
> -		ret = pdata->disable(dev);
> -
> -	dev_dbg(dev, "suspended\n");
> -	return ret;
> -}
> -
> -static int samsung_pd_runtime_resume(struct device *dev)
> -{
> -	struct samsung_pd_info *pdata = dev->platform_data;
> -	int ret = 0;
> -
> -	if (pdata->enable)
> -		ret = pdata->enable(dev);
> -
> -	dev_dbg(dev, "resumed\n");
> -	return ret;
> -}
> -
> -static const struct dev_pm_ops samsung_pd_pm_ops = {
> -	.runtime_suspend	= samsung_pd_runtime_suspend,
> -	.runtime_resume		= samsung_pd_runtime_resume,
> -};
> -
> -static struct platform_driver samsung_pd_driver = {
> -	.driver		= {
> -		.name		= "samsung-pd",
> -		.owner		= THIS_MODULE,
> -		.pm		= &samsung_pd_pm_ops,
> -	},
> -	.probe		= samsung_pd_probe,
> -	.remove		= __devexit_p(samsung_pd_remove),
> -};
> -
> -static int __init samsung_pd_init(void)
> -{
> -	int ret;
> -
> -	ret = platform_driver_register(&samsung_pd_driver);
> -	if (ret)
> -		printk(KERN_ERR "%s: failed to add PD driver\n", __func__);
> -
> -	return ret;
> -}
> -arch_initcall(samsung_pd_init);

Looks OK, but you need to re-submit this with right format :(

Applying: ARM: EXYNOS: Remove leftovers of the Samsung specific power domain
control
fatal: patch fragment without header at line 20: @@ -48,7 +48,6 @@

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: [PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[Bartlomiej Zolnierkiewicz]

On Thursday 21 June 2012 02:19:46 Kukjin Kim wrote:
> Bartlomiej Zolnierkiewicz wrote:
> > 
> > From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific
> > power domain control
> > 
> > Nowadays we use generic power domain support instead of Samsung
> > specific power domain control driver.
> > 
> > Cc: Thomas Abraham <thomas.abraham@linaro.org>
> > Cc: Rob Herring <rob.herring@calxeda.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Rafael J. Wysocki <rjw@sisk.pl>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---

[...]

> Looks OK, but you need to re-submit this with right format :(
> 
> Applying: ARM: EXYNOS: Remove leftovers of the Samsung specific power domain
> control
> fatal: patch fragment without header at line 20: @@ -48,7 +48,6 @@

Sorry for this.  Here is a refreshed version against your for-next tree.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung Poland R&D Center


From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

Nowadays we use generic power domain support instead of Samsung
specific power domain control driver.

Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

 arch/arm/mach-exynos/mach-nuri.c           |    1 
 arch/arm/mach-exynos/mach-origen.c         |    1 
 arch/arm/mach-exynos/mach-smdkv310.c       |    1 
 arch/arm/mach-exynos/mach-universal_c210.c |    1 
 arch/arm/plat-samsung/Kconfig              |    8 --
 arch/arm/plat-samsung/Makefile             |    4 -
 arch/arm/plat-samsung/include/plat/devs.h  |    1 
 arch/arm/plat-samsung/include/plat/pd.h    |   30 ---------
 arch/arm/plat-samsung/pd.c                 |   95 -----------------------------
 9 files changed, 142 deletions(-)

Index: b/arch/arm/mach-exynos/mach-nuri.c
===================================================================
--- a/arch/arm/mach-exynos/mach-nuri.c	2012-06-21 11:25:00.955011269 +0200
+++ b/arch/arm/mach-exynos/mach-nuri.c	2012-06-21 11:26:06.163010030 +0200
@@ -50,7 +50,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
 #include <plat/mfc.h>
-#include <plat/pd.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 #include <plat/mipi_csis.h>
Index: b/arch/arm/mach-exynos/mach-origen.c
===================================================================
--- a/arch/arm/mach-exynos/mach-origen.c	2012-06-21 11:25:00.955011269 +0200
+++ b/arch/arm/mach-exynos/mach-origen.c	2012-06-21 11:26:06.163010030 +0200
@@ -39,7 +39,6 @@
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
-#include <plat/pd.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
Index: b/arch/arm/mach-exynos/mach-smdkv310.c
===================================================================
--- a/arch/arm/mach-exynos/mach-smdkv310.c	2012-06-21 11:25:00.955011269 +0200
+++ b/arch/arm/mach-exynos/mach-smdkv310.c	2012-06-21 11:26:06.163010030 +0200
@@ -35,7 +35,6 @@
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/iic.h>
-#include <plat/pd.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
Index: b/arch/arm/mach-exynos/mach-universal_c210.c
===================================================================
--- a/arch/arm/mach-exynos/mach-universal_c210.c	2012-06-21 11:25:00.955011269 +0200
+++ b/arch/arm/mach-exynos/mach-universal_c210.c	2012-06-21 11:26:06.163010030 +0200
@@ -39,7 +39,6 @@
 #include <plat/fb.h>
 #include <plat/mfc.h>
 #include <plat/sdhci.h>
-#include <plat/pd.h>
 #include <plat/regs-fb-v4.h>
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
Index: b/arch/arm/plat-samsung/Kconfig
===================================================================
--- a/arch/arm/plat-samsung/Kconfig	2012-06-21 11:25:01.187011265 +0200
+++ b/arch/arm/plat-samsung/Kconfig	2012-06-21 11:26:06.163010030 +0200
@@ -491,14 +491,6 @@ config S5P_SLEEP
 	  Internal config node to apply common S5P sleep management code.
 	  Can be selected by S5P and newer SoCs with similar sleep procedure.
 
-comment "Power Domain"
-
-config SAMSUNG_PD
-	bool "Samsung Power Domain"
-	depends on PM_RUNTIME
-	help
-	  Say Y here if you want to control Power Domain by Runtime PM.
-
 config DEBUG_S3C_UART
 	depends on PLAT_SAMSUNG
 	int
Index: b/arch/arm/plat-samsung/Makefile
===================================================================
--- a/arch/arm/plat-samsung/Makefile	2012-06-14 10:55:33.620775556 +0200
+++ b/arch/arm/plat-samsung/Makefile	2012-06-21 11:26:06.163010030 +0200
@@ -60,10 +60,6 @@ obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup
 obj-$(CONFIG_S5P_PM)		+= s5p-pm.o s5p-irq-pm.o
 obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o
 
-# PD support
-
-obj-$(CONFIG_SAMSUNG_PD)	+= pd.o
-
 # PWM support
 
 obj-$(CONFIG_HAVE_PWM)		+= pwm.o
Index: b/arch/arm/plat-samsung/include/plat/devs.h
===================================================================
--- a/arch/arm/plat-samsung/include/plat/devs.h	2012-06-14 10:55:33.624775556 +0200
+++ b/arch/arm/plat-samsung/include/plat/devs.h	2012-06-21 11:26:06.163010030 +0200
@@ -131,7 +131,6 @@ extern struct platform_device exynos4_de
 extern struct platform_device exynos4_device_pcm0;
 extern struct platform_device exynos4_device_pcm1;
 extern struct platform_device exynos4_device_pcm2;
-extern struct platform_device exynos4_device_pd[];
 extern struct platform_device exynos4_device_spdif;
 
 extern struct platform_device exynos_device_drm;
Index: b/arch/arm/plat-samsung/include/plat/pd.h
===================================================================
--- a/arch/arm/plat-samsung/include/plat/pd.h	2012-06-08 09:01:31.405681656 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/pd.h
- *
- * Copyright (c) 2010-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 __ASM_PLAT_SAMSUNG_PD_H
-#define __ASM_PLAT_SAMSUNG_PD_H __FILE__
-
-struct samsung_pd_info {
-	int (*enable)(struct device *dev);
-	int (*disable)(struct device *dev);
-	void __iomem *base;
-};
-
-enum exynos4_pd_block {
-	PD_MFC,
-	PD_G3D,
-	PD_LCD0,
-	PD_LCD1,
-	PD_TV,
-	PD_CAM,
-	PD_GPS
-};
-
-#endif /* __ASM_PLAT_SAMSUNG_PD_H */
Index: b/arch/arm/plat-samsung/pd.c
===================================================================
--- a/arch/arm/plat-samsung/pd.c	2012-06-08 09:01:31.429681656 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/* linux/arch/arm/plat-samsung/pd.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Samsung Power domain support
- *
- * 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/init.h>
-#include <linux/export.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/pm_runtime.h>
-
-#include <plat/pd.h>
-
-static int samsung_pd_probe(struct platform_device *pdev)
-{
-	struct samsung_pd_info *pdata = pdev->dev.platform_data;
-	struct device *dev = &pdev->dev;
-
-	if (!pdata) {
-		dev_err(dev, "no device data specified\n");
-		return -ENOENT;
-	}
-
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	dev_info(dev, "power domain registered\n");
-	return 0;
-}
-
-static int __devexit samsung_pd_remove(struct platform_device *pdev)
-{
-	struct device *dev = &pdev->dev;
-
-	pm_runtime_disable(dev);
-	return 0;
-}
-
-static int samsung_pd_runtime_suspend(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->disable)
-		ret = pdata->disable(dev);
-
-	dev_dbg(dev, "suspended\n");
-	return ret;
-}
-
-static int samsung_pd_runtime_resume(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->enable)
-		ret = pdata->enable(dev);
-
-	dev_dbg(dev, "resumed\n");
-	return ret;
-}
-
-static const struct dev_pm_ops samsung_pd_pm_ops = {
-	.runtime_suspend	= samsung_pd_runtime_suspend,
-	.runtime_resume		= samsung_pd_runtime_resume,
-};
-
-static struct platform_driver samsung_pd_driver = {
-	.driver		= {
-		.name		= "samsung-pd",
-		.owner		= THIS_MODULE,
-		.pm		= &samsung_pd_pm_ops,
-	},
-	.probe		= samsung_pd_probe,
-	.remove		= __devexit_p(samsung_pd_remove),
-};
-
-static int __init samsung_pd_init(void)
-{
-	int ret;
-
-	ret = platform_driver_register(&samsung_pd_driver);
-	if (ret)
-		printk(KERN_ERR "%s: failed to add PD driver\n", __func__);
-
-	return ret;
-}
-arch_initcall(samsung_pd_init);

RE: [PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[Kukjin Kim]

Bartlomiej Zolnierkiewicz wrote:
> 
> On Thursday 21 June 2012 02:19:46 Kukjin Kim wrote:
> > Bartlomiej Zolnierkiewicz wrote:
> > >
> > > From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > > Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific
> > > power domain control
> > >
> > > Nowadays we use generic power domain support instead of Samsung
> > > specific power domain control driver.
> > >
> > > Cc: Thomas Abraham <thomas.abraham@linaro.org>
> > > Cc: Rob Herring <rob.herring@calxeda.com>
> > > Cc: Grant Likely <grant.likely@secretlab.ca>
> > > Cc: Rafael J. Wysocki <rjw@sisk.pl>
> > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > > ---
> 
> [...]
> 
> > Looks OK, but you need to re-submit this with right format :(
> >
> > Applying: ARM: EXYNOS: Remove leftovers of the Samsung specific power
> domain
> > control
> > fatal: patch fragment without header at line 20: @@ -48,7 +48,6 @@
> 
> Sorry for this.  Here is a refreshed version against your for-next tree.
> 
No, I meant you need to create your patch with git-format-patch not wrong
against on.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: [PATCH][resend] ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control

[Bartlomiej Zolnierkiewicz]

On Friday 22 June 2012 04:08:22 Kukjin Kim wrote:
> Bartlomiej Zolnierkiewicz wrote:
> > 
> > On Thursday 21 June 2012 02:19:46 Kukjin Kim wrote:
> > > Bartlomiej Zolnierkiewicz wrote:
> > > >
> > > > From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > > > Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific
> > > > power domain control
> > > >
> > > > Nowadays we use generic power domain support instead of Samsung
> > > > specific power domain control driver.
> > > >
> > > > Cc: Thomas Abraham <thomas.abraham@linaro.org>
> > > > Cc: Rob Herring <rob.herring@calxeda.com>
> > > > Cc: Grant Likely <grant.likely@secretlab.ca>
> > > > Cc: Rafael J. Wysocki <rjw@sisk.pl>
> > > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > > > ---
> > 
> > [...]
> > 
> > > Looks OK, but you need to re-submit this with right format :(
> > >
> > > Applying: ARM: EXYNOS: Remove leftovers of the Samsung specific power
> > domain
> > > control
> > > fatal: patch fragment without header at line 20: @@ -48,7 +48,6 @@
> > 
> > Sorry for this.  Here is a refreshed version against your for-next tree.
> > 
> No, I meant you need to create your patch with git-format-patch not wrong
> against on.

Ok, here it is (though I still don't know what the problem was as the patch
applies cleanly here using both quilt and git quiltimport). 

>From a14b75c3f0b0ddea613b6ae5cace20b89c989393 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date: Fri, 22 Jun 2012 10:20:04 +0200
Subject: [PATCH] ARM: EXYNOS: Remove leftovers of the Samsung specific power
 domain control

Nowadays we use generic power domain support instead of Samsung
specific power domain control driver.

Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 arch/arm/mach-exynos/mach-nuri.c           |  1 -
 arch/arm/mach-exynos/mach-origen.c         |  1 -
 arch/arm/mach-exynos/mach-smdkv310.c       |  1 -
 arch/arm/mach-exynos/mach-universal_c210.c |  1 -
 arch/arm/plat-samsung/Kconfig              |  8 ---
 arch/arm/plat-samsung/Makefile             |  4 --
 arch/arm/plat-samsung/include/plat/devs.h  |  1 -
 arch/arm/plat-samsung/include/plat/pd.h    | 30 ----------
 arch/arm/plat-samsung/pd.c                 | 95 ------------------------------
 9 files changed, 142 deletions(-)
 delete mode 100644 arch/arm/plat-samsung/include/plat/pd.h
 delete mode 100644 arch/arm/plat-samsung/pd.c

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 656f8fc..f3b328d 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -50,7 +50,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
 #include <plat/mfc.h>
-#include <plat/pd.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 #include <plat/mipi_csis.h>
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 9ed0229..580cc77 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -39,7 +39,6 @@
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
-#include <plat/pd.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 7b1b866..95ce9f6 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -35,7 +35,6 @@
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/iic.h>
-#include <plat/pd.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index cd92fa8..68719f5 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -39,7 +39,6 @@
 #include <plat/fb.h>
 #include <plat/mfc.h>
 #include <plat/sdhci.h>
-#include <plat/pd.h>
 #include <plat/regs-fb-v4.h>
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index a2fae4e..ffc84ac 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -491,14 +491,6 @@ config S5P_SLEEP
 	  Internal config node to apply common S5P sleep management code.
 	  Can be selected by S5P and newer SoCs with similar sleep procedure.
 
-comment "Power Domain"
-
-config SAMSUNG_PD
-	bool "Samsung Power Domain"
-	depends on PM_RUNTIME
-	help
-	  Say Y here if you want to control Power Domain by Runtime PM.
-
 config DEBUG_S3C_UART
 	depends on PLAT_SAMSUNG
 	int
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 860b2db..4bb58c2 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -60,10 +60,6 @@ obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
 obj-$(CONFIG_S5P_PM)		+= s5p-pm.o s5p-irq-pm.o
 obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o
 
-# PD support
-
-obj-$(CONFIG_SAMSUNG_PD)	+= pd.o
-
 # PWM support
 
 obj-$(CONFIG_HAVE_PWM)		+= pwm.o
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 61ca2f3..5da4b4f 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -131,7 +131,6 @@ extern struct platform_device exynos4_device_ohci;
 extern struct platform_device exynos4_device_pcm0;
 extern struct platform_device exynos4_device_pcm1;
 extern struct platform_device exynos4_device_pcm2;
-extern struct platform_device exynos4_device_pd[];
 extern struct platform_device exynos4_device_spdif;
 
 extern struct platform_device exynos_device_drm;
diff --git a/arch/arm/plat-samsung/include/plat/pd.h b/arch/arm/plat-samsung/include/plat/pd.h
deleted file mode 100644
index abb4bc3..0000000
--- a/arch/arm/plat-samsung/include/plat/pd.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/pd.h
- *
- * Copyright (c) 2010-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 __ASM_PLAT_SAMSUNG_PD_H
-#define __ASM_PLAT_SAMSUNG_PD_H __FILE__
-
-struct samsung_pd_info {
-	int (*enable)(struct device *dev);
-	int (*disable)(struct device *dev);
-	void __iomem *base;
-};
-
-enum exynos4_pd_block {
-	PD_MFC,
-	PD_G3D,
-	PD_LCD0,
-	PD_LCD1,
-	PD_TV,
-	PD_CAM,
-	PD_GPS
-};
-
-#endif /* __ASM_PLAT_SAMSUNG_PD_H */
diff --git a/arch/arm/plat-samsung/pd.c b/arch/arm/plat-samsung/pd.c
deleted file mode 100644
index 312b510..0000000
--- a/arch/arm/plat-samsung/pd.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* linux/arch/arm/plat-samsung/pd.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Samsung Power domain support
- *
- * 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/init.h>
-#include <linux/export.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/pm_runtime.h>
-
-#include <plat/pd.h>
-
-static int samsung_pd_probe(struct platform_device *pdev)
-{
-	struct samsung_pd_info *pdata = pdev->dev.platform_data;
-	struct device *dev = &pdev->dev;
-
-	if (!pdata) {
-		dev_err(dev, "no device data specified\n");
-		return -ENOENT;
-	}
-
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
-
-	dev_info(dev, "power domain registered\n");
-	return 0;
-}
-
-static int __devexit samsung_pd_remove(struct platform_device *pdev)
-{
-	struct device *dev = &pdev->dev;
-
-	pm_runtime_disable(dev);
-	return 0;
-}
-
-static int samsung_pd_runtime_suspend(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->disable)
-		ret = pdata->disable(dev);
-
-	dev_dbg(dev, "suspended\n");
-	return ret;
-}
-
-static int samsung_pd_runtime_resume(struct device *dev)
-{
-	struct samsung_pd_info *pdata = dev->platform_data;
-	int ret = 0;
-
-	if (pdata->enable)
-		ret = pdata->enable(dev);
-
-	dev_dbg(dev, "resumed\n");
-	return ret;
-}
-
-static const struct dev_pm_ops samsung_pd_pm_ops = {
-	.runtime_suspend	= samsung_pd_runtime_suspend,
-	.runtime_resume		= samsung_pd_runtime_resume,
-};
-
-static struct platform_driver samsung_pd_driver = {
-	.driver		= {
-		.name		= "samsung-pd",
-		.owner		= THIS_MODULE,
-		.pm		= &samsung_pd_pm_ops,
-	},
-	.probe		= samsung_pd_probe,
-	.remove		= __devexit_p(samsung_pd_remove),
-};
-
-static int __init samsung_pd_init(void)
-{
-	int ret;
-
-	ret = platform_driver_register(&samsung_pd_driver);
-	if (ret)
-		printk(KERN_ERR "%s: failed to add PD driver\n", __func__);
-
-	return ret;
-}
-arch_initcall(samsung_pd_init);
-- 
1.7.11