From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Nov 2012 03:13:57 +0000 (+1100)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Tag: next-20121112~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bce9e2b5bc5c18e63b11173ee0b00ba1f929fd0b;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/boot/dts/spear1340.dtsi
---

bce9e2b5bc5c18e63b11173ee0b00ba1f929fd0b
diff --cc arch/arm/boot/dts/spear1340.dtsi
index 8ea3f668df34,6c09eb0a1b2b..d487556b71ce
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -24,12 +24,31 @@@
  			status = "disabled";
  		};
  
 +		dma@ea800000 {
 +			slave_info {
 +				uart1_tx {
 +					bus_id = "uart1_tx";
 +					cfg_hi = <0x6000>;	/* 0xC << 11 */
 +					cfg_lo = <0>;
 +					src_master = <0>;
 +					dst_master = <1>;
 +				};
 +				uart1_tx {
 +					bus_id = "uart1_tx";
 +					cfg_hi = <0x680>;	/* 0xD << 7 */
 +					cfg_lo = <0>;
 +					src_master = <1>;
 +					dst_master = <0>;
 +				};
 +			};
 +		};
 +
+ 		pinmux: pinmux@e0700000 {
+ 			compatible = "st,spear1340-pinmux";
+ 			reg = <0xe0700000 0x1000>;
+ 			#gpio-range-cells = <2>;
+ 		};
+ 
  		spi1: spi@5d400000 {
  			compatible = "arm,pl022", "arm,primecell";
  			reg = <0x5d400000 0x1000>;
diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index 3f97ef40ce6b,22ef8a1abe08..ab7104fded39
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -33,10 -33,11 +34,8 @@@
  #include <asm/mach/flash.h>
  #include <asm/mach/time.h>
  
- #include <plat/gpio-nomadik.h>
  #include <plat/mtu.h>
- #include <plat/pincfg.h>
  
 -#include <linux/platform_data/mtd-nomadik-nand.h>
 -#include <mach/fsmc.h>
 -
  #include "cpu-8815.h"
  
  /* Initial value for SRC control register: all timers use MXTAL/8 source */