---

yaml
---
r: 361396
b: refs/heads/master
c: 42b8432
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e
+refs/heads/master: 42b84328428bfe305fcb60eb382fba60cee9071f

trunk/arch/arm/Kconfig

@@ -556,6 +556,7 @@ config ARCH_IXP4XX
 config ARCH_DOVE
 	bool "Marvell Dove"
 	select ARCH_REQUIRE_GPIOLIB
+	select COMMON_CLK_DOVE
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select MIGHT_HAVE_PCI
@@ -1005,12 +1006,12 @@ config ARCH_MULTI_V4_V5
 	bool
 
 config ARCH_MULTI_V6
-	bool "ARMv6 based platforms (ARM11)"
+	bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
 	select ARCH_MULTI_V6_V7
 	select CPU_V6
 
 config ARCH_MULTI_V7
-	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
+	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
 	select ARCH_VEXPRESS
@@ -1656,16 +1657,13 @@ config LOCAL_TIMERS
 	  accounting to be spread across the timer interval, preventing a
 	  "thundering herd" at every timer tick.
 
-# The GPIO number here must be sorted by descending number. In case of
-# a multiplatform kernel, we just want the highest value required by the
-# selected platforms.
 config ARCH_NR_GPIO
 	int
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-	default 512 if SOC_OMAP5
 	default 355 if ARCH_U8500
-	default 288 if ARCH_VT8500 || ARCH_SUNXI
 	default 264 if MACH_H4700
+	default 512 if SOC_OMAP5
+	default 288 if ARCH_VT8500 || ARCH_SUNXI
 	default 0
 	help
 	  Maximum number of GPIOs in the system.

trunk/arch/arm/Kconfig.debug

@@ -492,7 +492,7 @@ config DEBUG_IMX_UART_PORT
 						DEBUG_IMX31_UART || \
 						DEBUG_IMX35_UART || \
 						DEBUG_IMX51_UART || \
-						DEBUG_IMX53_UART || \
+						DEBUG_IMX50_IMX53_UART || \
 						DEBUG_IMX6Q_UART
 	default 1
 	help

trunk/arch/arm/boot/Makefile

@@ -115,4 +115,4 @@ i:
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/Image System.map "$(INSTALL_PATH)"
 
-subdir-	    := bootp compressed dts
+subdir-	    := bootp compressed

trunk/arch/arm/boot/dts/armada-370-rd.dts

@@ -64,13 +64,5 @@
 			status = "okay";
 			/* No CD or WP GPIOs */
 		};
-
-		usb@d0050000 {
-			status = "okay";
-		};
-
-		usb@d0051000 {
-			status = "okay";
-		};
 	};
 };

trunk/arch/arm/boot/dts/armada-370-xp.dtsi

@@ -31,6 +31,7 @@
 	mpic: interrupt-controller@d0020000 {
 	      compatible = "marvell,mpic";
 	      #interrupt-cells = <1>;
+	      #address-cells = <1>;
 	      #size-cells = <1>;
 	      interrupt-controller;
 	};
@@ -53,15 +54,15 @@
 				reg = <0xd0012000 0x100>;
 				reg-shift = <2>;
 				interrupts = <41>;
-				reg-io-width = <1>;
+				reg-io-width = <4>;
 				status = "disabled";
 		};
 		serial@d0012100 {
 				compatible = "snps,dw-apb-uart";
 				reg = <0xd0012100 0x100>;
 				reg-shift = <2>;
 				interrupts = <42>;
-				reg-io-width = <1>;
+				reg-io-width = <4>;
 				status = "disabled";
 		};
 

trunk/arch/arm/boot/dts/armada-xp.dtsi

@@ -46,15 +46,15 @@
 				reg = <0xd0012200 0x100>;
 				reg-shift = <2>;
 				interrupts = <43>;
-				reg-io-width = <1>;
+				reg-io-width = <4>;
 				status = "disabled";
 		};
 		serial@d0012300 {
 				compatible = "snps,dw-apb-uart";
 				reg = <0xd0012300 0x100>;
 				reg-shift = <2>;
 				interrupts = <44>;
-				reg-io-width = <1>;
+				reg-io-width = <4>;
 				status = "disabled";
 		};
 

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

@@ -238,32 +238,8 @@
 				nand {
 					pinctrl_nand: nand-0 {
 						atmel,pins =
-							<3 0 0x1 0x0	/* PD0 periph A Read Enable */
-							 3 1 0x1 0x0	/* PD1 periph A Write Enable */
-							 3 2 0x1 0x0	/* PD2 periph A Address Latch Enable */
-							 3 3 0x1 0x0	/* PD3 periph A Command Latch Enable */
-							 3 4 0x0 0x1	/* PD4 gpio Chip Enable pin pull_up */
-							 3 5 0x0 0x1	/* PD5 gpio RDY/BUSY pin pull_up */
-							 3 6 0x1 0x0	/* PD6 periph A Data bit 0 */
-							 3 7 0x1 0x0	/* PD7 periph A Data bit 1 */
-							 3 8 0x1 0x0	/* PD8 periph A Data bit 2 */
-							 3 9 0x1 0x0	/* PD9 periph A Data bit 3 */
-							 3 10 0x1 0x0	/* PD10 periph A Data bit 4 */
-							 3 11 0x1 0x0	/* PD11 periph A Data bit 5 */
-							 3 12 0x1 0x0	/* PD12 periph A Data bit 6 */
-							 3 13 0x1 0x0>;	/* PD13 periph A Data bit 7 */
-					};
-
-					pinctrl_nand_16bits: nand_16bits-0 {
-						atmel,pins =
-							<3 14 0x1 0x0	/* PD14 periph A Data bit 8 */
-							 3 15 0x1 0x0	/* PD15 periph A Data bit 9 */
-							 3 16 0x1 0x0	/* PD16 periph A Data bit 10 */
-							 3 17 0x1 0x0	/* PD17 periph A Data bit 11 */
-							 3 18 0x1 0x0	/* PD18 periph A Data bit 12 */
-							 3 19 0x1 0x0	/* PD19 periph A Data bit 13 */
-							 3 20 0x1 0x0	/* PD20 periph A Data bit 14 */
-							 3 21 0x1 0x0>;	/* PD21 periph A Data bit 15 */
+							<3 4 0x0 0x1	/* PD5 gpio RDY pin pull_up */
+							 3 5 0x0 0x1>;	/* PD4 gpio enable pin pull_up */
 					};
 				};
 

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

@@ -105,7 +105,7 @@
 			compatible = "fixed-clock";
 			reg = <1>;
 			#clock-cells = <0>;
-			clock-frequency = <250000000>;
+			clock-frequency = <150000000>;
 		};
 	};
 };

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

@@ -197,11 +197,6 @@
 			status = "disabled";
 		};
 
-		rtc@d8500 {
-			compatible = "marvell,orion-rtc";
-			reg = <0xd8500 0x20>;
-		};
-
 		crypto: crypto@30000 {
 			compatible = "marvell,orion-crypto";
 			reg = <0x30000 0x10000>,

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

@@ -275,27 +275,18 @@
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12680000 0x1000>;
 			interrupts = <0 35 0>;
-			#dma-cells = <1>;
-			#dma-channels = <8>;
-			#dma-requests = <32>;
 		};
 
 		pdma1: pdma@12690000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12690000 0x1000>;
 			interrupts = <0 36 0>;
-			#dma-cells = <1>;
-			#dma-channels = <8>;
-			#dma-requests = <32>;
 		};
 
 		mdma1: mdma@12850000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12850000 0x1000>;
 			interrupts = <0 34 0>;
-			#dma-cells = <1>;
-			#dma-channels = <8>;
-			#dma-requests = <1>;
 		};
 	};
 };

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

@@ -142,18 +142,12 @@
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x120000 0x1000>;
 			interrupts = <0 34 0>;
-			#dma-cells = <1>;
-			#dma-channels = <8>;
-			#dma-requests = <32>;
 		};
 
 		pdma1: pdma@121B0000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x121000 0x1000>;
 			interrupts = <0 35 0>;
-			#dma-cells = <1>;
-			#dma-channels = <8>;
-			#dma-requests = <32>;
 		};
 	};
 

trunk/arch/arm/boot/dts/imx53-mba53.dts

@@ -42,9 +42,10 @@
 			fsl,pins = <689 0x10000		/* DISP1_DRDY	*/
 				    482 0x10000		/* DISP1_HSYNC	*/
 				    489 0x10000		/* DISP1_VSYNC	*/
+				    684 0x10000		/* DISP1_DAT_0	*/
 				    515 0x10000		/* DISP1_DAT_22	*/
 				    523 0x10000		/* DISP1_DAT_23	*/
-				    545 0x10000		/* DISP1_DAT_21	*/
+				    543 0x10000		/* DISP1_DAT_21	*/
 				    553 0x10000		/* DISP1_DAT_20	*/
 				    558 0x10000		/* DISP1_DAT_19	*/
 				    564 0x10000		/* DISP1_DAT_18	*/

trunk/arch/arm/boot/dts/kirkwood-dns320.dts

@@ -42,10 +42,12 @@
 
 	ocp@f1000000 {
 		serial@12000 {
+			clock-frequency = <166666667>;
 			status = "okay";
 		};
 
 		serial@12100 {
+			clock-frequency = <166666667>;
 			status = "okay";
 		};
 	};

trunk/arch/arm/boot/dts/kirkwood-dns325.dts

@@ -50,6 +50,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "okay";
 		};
 	};

trunk/arch/arm/boot/dts/kirkwood-dockstar.dts

@@ -37,6 +37,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts

@@ -38,6 +38,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts

@@ -73,6 +73,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts

@@ -51,6 +51,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "okay";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-iconnect.dts

@@ -78,6 +78,7 @@
 			};
 		};
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts

@@ -115,6 +115,7 @@
 		};
 
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts

@@ -34,6 +34,7 @@
 		};
 
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts

@@ -13,6 +13,7 @@
 
 	ocp@f1000000 {
 		serial@12000 {
+			clock-frequency = <166666667>;
 			status = "okay";
 		};
 	};

trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts

@@ -13,6 +13,7 @@
 
 	ocp@f1000000 {
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "okay";
 		};
 	};

trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts

@@ -90,6 +90,7 @@
                 };
 
                 serial@12000 {
+                        clock-frequency = <200000000>;
                         status = "ok";
                 };
 

trunk/arch/arm/boot/dts/kirkwood-ns2-common.dtsi

@@ -23,6 +23,7 @@
 		};
 
 		serial@12000 {
+			clock-frequency = <166666667>;
 			status = "okay";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-nsa310.dts

@@ -117,6 +117,7 @@
 		};
 
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts

@@ -18,10 +18,12 @@
 
 	ocp@f1000000 {
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 
 		serial@12100 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};
 

trunk/arch/arm/boot/dts/kirkwood-topkick.dts

@@ -108,6 +108,7 @@
 		};
 
 		serial@12000 {
+			clock-frequency = <200000000>;
 			status = "ok";
 		};