From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Jul 2012 02:42:07 +0000 (+1000)
Subject: Merge remote-tracking branch 'pwm/for-next'
X-Git-Tag: next-20120725~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5dfd03f0e7ecd63f04c9e628d8d1dc6ed4ee9dd9;p=karo-tx-linux.git

Merge remote-tracking branch 'pwm/for-next'

Conflicts:
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/board-dt-tegra30.c
	arch/arm/plat-samsung/Makefile
	drivers/pwm/pwm-samsung.c
---

5dfd03f0e7ecd63f04c9e628d8d1dc6ed4ee9dd9
diff --cc arch/arm/boot/dts/tegra20.dtsi
index 9f1921634eb7,846af573f649..405d1673904e
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@@ -120,9 -120,15 +120,15 @@@
  		reg = <0x70006400 0x100>;
  		reg-shift = <2>;
  		interrupts = <0 91 0x04>;
 -		status = "disable";
 +		status = "disabled";
  	};
  
+ 	pwm {
+ 		compatible = "nvidia,tegra20-pwm";
+ 		reg = <0x7000a000 0x100>;
+ 		#pwm-cells = <2>;
+ 	};
+ 
  	i2c@7000c000 {
  		compatible = "nvidia,tegra20-i2c";
  		reg = <0x7000c000 0x100>;
diff --cc arch/arm/boot/dts/tegra30.dtsi
index da740191771f,f7f428e81e3a..3e4334d14efb
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@@ -114,9 -114,15 +114,15 @@@
  		reg = <0x70006400 0x100>;
  		reg-shift = <2>;
  		interrupts = <0 91 0x04>;
 -		status = "disable";
 +		status = "disabled";
  	};
  
+ 	pwm {
+ 		compatible = "nvidia,tegra30-pwm", "nvidia,tegra20-pwm";
+ 		reg = <0x7000a000 0x100>;
+ 		#pwm-cells = <2>;
+ 	};
+ 
  	i2c@7000c000 {
  		compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
  		reg = <0x7000c000 0x100>;
diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index d0de9c1192f7,962f1a1b12e9..70a19a9b75fc
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -64,7 -64,7 +64,8 @@@ struct of_dev_auxdata tegra20_auxdata_l
  		       &tegra_ehci2_pdata),
  	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",
  		       &tegra_ehci3_pdata),
 +	OF_DEV_AUXDATA("nvidia,tegra20-apbdma", 0x6000a000, "tegra-apbdma", NULL),
+ 	OF_DEV_AUXDATA("nvidia,tegra20-pwm", TEGRA_PWFM_BASE, "tegra-pwm", NULL),
  	{}
  };
  
diff --cc arch/arm/mach-tegra/board-dt-tegra30.c
index ee48214bfd89,ffc6cae3eb2c..53bf60f11580
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@@ -47,7 -54,7 +49,8 @@@ struct of_dev_auxdata tegra30_auxdata_l
  	OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C700, "tegra-i2c.3", NULL),
  	OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000D000, "tegra-i2c.4", NULL),
  	OF_DEV_AUXDATA("nvidia,tegra30-ahub", 0x70080000, "tegra30-ahub", NULL),
 +	OF_DEV_AUXDATA("nvidia,tegra30-apbdma", 0x6000a000, "tegra-apbdma", NULL),
+ 	OF_DEV_AUXDATA("nvidia,tegra30-pwm", TEGRA_PWFM_BASE, "tegra-pwm", NULL),
  	{}
  };
  
diff --cc arch/arm/plat-samsung/Makefile
index b78717496677,96854721319c..9e40e8d00740
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -59,7 -59,7 +59,3 @@@ obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeu
  
  obj-$(CONFIG_S5P_PM)		+= s5p-pm.o s5p-irq-pm.o
  obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o
--
- # PWM support
 -# PD support
--
- obj-$(CONFIG_HAVE_PWM)		+= pwm.o
 -obj-$(CONFIG_SAMSUNG_PD)	+= pd.o