linux-next: manual merge of the pwm tree with the tegra tree

[Stephen Rothwell]

Hi Thierry,

Today's linux-next merge of the pwm tree got conflicts in
arch/arm/mach-tegra/board-dt-tegra20.c and
arch/arm/mach-tegra/board-dt-tegra30.c between commit bd976e0307fb ("ARM:
tegra: add device tree AUXDATA for APBDMA") from the tegra tree and
commit 3ad1308c8dee ("pwm: tegra: Add device tree support") from the pwm
tree.

Just context changes.  I fixed them up (see below) and can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index 1b43c33,962f1a1..0000000
--- 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 4a40986,ffc6cae..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@@ -52,7 -54,7 +54,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),
  	{}
  };

Attachment: pgp00000.pgp
Description: PGP signature