---

yaml
---
r: 313180
b: refs/heads/master
c: 6619af6
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dc19510430b20b3b2d6d1b9b796fd42fa2af64a
+refs/heads/master: 6619af6b496994e4a862f682ff1a1640b334a558

trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt → trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt

@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and
 
 Example:
 
-	memory-controller@7000f400 {
+	emc@7000f400 {
 		#address-cells = < 1 >;
 		#size-cells = < 0 >;
 		compatible = "nvidia,tegra20-emc";

trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	memory-controller@0x7000f000 {
+	mc {
 		compatible = "nvidia,tegra20-mc";
 		reg = <0x7000f000 0x024
 		       0x7000f03c 0x3c4>;

trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt

@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	memory-controller {
+	mc {
 		compatible = "nvidia,tegra30-mc";
 		reg = <0x7000f000 0x010
 		       0x7000f03c 0x1b4

trunk/arch/arm/Kconfig

@@ -913,7 +913,7 @@ config ARCH_NOMADIK
 	select ARM_AMBA
 	select ARM_VIC
 	select CPU_ARM926T
-	select COMMON_CLK
+	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select MIGHT_HAVE_CACHE_L2X0
@@ -1021,6 +1021,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-lpc32xx/Kconfig"
+
 source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"

trunk/arch/arm/boot/dts/lpc32xx.dtsi

@@ -35,14 +35,13 @@
 		slc: flash@20020000 {
 			compatible = "nxp,lpc3220-slc";
 			reg = <0x20020000 0x1000>;
-			status = "disabled";
+			status = "disable";
 		};
 
-		mlc: flash@200a8000 {
+		mlc: flash@200B0000 {
 			compatible = "nxp,lpc3220-mlc";
-			reg = <0x200a8000 0x11000>;
-			interrupts = <11 0>;
-			status = "disabled";
+			reg = <0x200B0000 0x1000>;
+			status = "disable";
 		};
 
 		dma@31000000 {
@@ -58,21 +57,21 @@
 			compatible = "nxp,ohci-nxp", "usb-ohci";
 			reg = <0x31020000 0x300>;
 			interrupts = <0x3b 0>;
-			status = "disabled";
+			status = "disable";
 		};
 
 		usbd@31020000 {
 			compatible = "nxp,lpc3220-udc";
 			reg = <0x31020000 0x300>;
 			interrupts = <0x3d 0>, <0x3e 0>, <0x3c 0>, <0x3a 0>;
-			status = "disabled";
+			status = "disable";
 		};
 
 		clcd@31040000 {
 			compatible = "arm,pl110", "arm,primecell";
 			reg = <0x31040000 0x1000>;
 			interrupts = <0x0e 0>;
-			status = "disabled";
+			status = "disable";
 		};
 
 		mac: ethernet@31060000 {
@@ -115,53 +114,34 @@
 			};
 
 			sd@20098000 {
-				compatible = "arm,pl18x", "arm,primecell";
+				compatible = "arm,pl180", "arm,primecell";
 				reg = <0x20098000 0x1000>;
 				interrupts = <0x0f 0>, <0x0d 0>;
-				status = "disabled";
 			};
 
 			i2s1: i2s@2009C000 {
 				compatible = "nxp,lpc3220-i2s";
 				reg = <0x2009C000 0x1000>;
 			};
 
-			/* UART5 first since it is the default console, ttyS0 */
-			uart5: serial@40090000 {
-				/* actually, ns16550a w/ 64 byte fifos! */
-				compatible = "nxp,lpc3220-uart";
-				reg = <0x40090000 0x1000>;
-				interrupts = <9 0>;
-				clock-frequency = <13000000>;
-				reg-shift = <2>;
-				status = "disabled";
-			};
-
 			uart3: serial@40080000 {
-				compatible = "nxp,lpc3220-uart";
+				compatible = "nxp,serial";
 				reg = <0x40080000 0x1000>;
-				interrupts = <7 0>;
-				clock-frequency = <13000000>;
-				reg-shift = <2>;
-				status = "disabled";
 			};
 
 			uart4: serial@40088000 {
-				compatible = "nxp,lpc3220-uart";
+				compatible = "nxp,serial";
 				reg = <0x40088000 0x1000>;
-				interrupts = <8 0>;
-				clock-frequency = <13000000>;
-				reg-shift = <2>;
-				status = "disabled";
+			};
+
+			uart5: serial@40090000 {
+				compatible = "nxp,serial";
+				reg = <0x40090000 0x1000>;
 			};
 
 			uart6: serial@40098000 {
-				compatible = "nxp,lpc3220-uart";
+				compatible = "nxp,serial";
 				reg = <0x40098000 0x1000>;
-				interrupts = <10 0>;
-				clock-frequency = <13000000>;
-				reg-shift = <2>;
-				status = "disabled";
 			};
 
 			i2c1: i2c@400A0000 {
@@ -212,24 +192,18 @@
 			};
 
 			uart1: serial@40014000 {
-				compatible = "nxp,lpc3220-hsuart";
+				compatible = "nxp,serial";
 				reg = <0x40014000 0x1000>;
-				interrupts = <26 0>;
-				status = "disabled";
 			};
 
 			uart2: serial@40018000 {
-				compatible = "nxp,lpc3220-hsuart";
+				compatible = "nxp,serial";
 				reg = <0x40018000 0x1000>;
-				interrupts = <25 0>;
-				status = "disabled";
 			};
 
-			uart7: serial@4001c000 {
-				compatible = "nxp,lpc3220-hsuart";
-				reg = <0x4001c000 0x1000>;
-				interrupts = <24 0>;
-				status = "disabled";
+			uart7: serial@4001C000 {
+				compatible = "nxp,serial";
+				reg = <0x4001C000 0x1000>;
 			};
 
 			rtc@40024000 {
@@ -261,21 +235,19 @@
 				compatible = "nxp,lpc3220-adc";
 				reg = <0x40048000 0x1000>;
 				interrupts = <0x27 0>;
-				status = "disabled";
+				status = "disable";
 			};
 
 			tsc@40048000 {
 				compatible = "nxp,lpc3220-tsc";
 				reg = <0x40048000 0x1000>;
 				interrupts = <0x27 0>;
-				status = "disabled";
+				status = "disable";
 			};
 
 			key@40050000 {
 				compatible = "nxp,lpc3220-key";
 				reg = <0x40050000 0x1000>;
-				interrupts = <54 0>;
-				status = "disabled";
 			};
 
 		};