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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/tegra20.dtsi
index 9f1921634eb7b8ab19c671fc2de17f0d44a50fc4,846af573f64920f753857ab5b46372d0e2f912af..405d1673904e53805a11551693446b55cfa1831c
--- 1/arch/arm/boot/dts/tegra20.dtsi
--- 2/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 da740191771f8493f1734636a88244869be5abff,f7f428e81e3a475889b5713255470a662d97eecd..3e4334d14efb4d70bdd88e46c44dc4b6af1e7cf2
--- 1/arch/arm/boot/dts/tegra30.dtsi
--- 2/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 d0de9c1192f78eae03b70a8c9d0c7b72e4bc4d0c,962f1a1b12e9b97b437551a2e090164eceafc02d..70a19a9b75fcabdb1dc20ae7ef13b3c0299544b0
--- 1/arch/arm/mach-tegra/board-dt-tegra20.c
--- 2/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 ee48214bfd898ea86f2084dba182e85df96bbc58,ffc6cae3eb2cb23c3cf6c645716cebd60193e321..53bf60f1158044bf6ce12a3d05972f02b17bdfb1
--- 1/arch/arm/mach-tegra/board-dt-tegra30.c
--- 2/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/mach-vt8500/Makefile
Simple merge

diff --cc arch/arm/plat-mxc/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
index b78717496677fae8e17ba77392785aeea90e9ffd,96854721319c72a8ef79836c56c1bf74a9b8a7aa..9e40e8d007404b9f9533c56ad9ebc626c9870116
--- 1/arch/arm/plat-samsung/Makefile
--- 2/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

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/video/backlight/Kconfig
Simple merge

diff --cc include/linux/of.h
Simple merge