Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

56 files changed, 360 insertions, 133 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f31e46..377b7c364033 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -51,10 +51,9 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb
 
 dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
 dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
         bcm21664-garnet.dtb
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
-dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
 dtb-$(CONFIG_ARCH_BERLIN) += \
         berlin2-sony-nsz-gs7.dtb        \
         berlin2cd-google-chromecast.dtb
@@ -246,6 +245,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
         omap3-sbc-t3730.dtb \
         omap3-devkit8000.dtb \
         omap3-beagle-xm.dtb \
+        omap3-beagle-xm-ab.dtb \
         omap3-evm.dtb \
         omap3-evm-37xx.dtb \
         omap3-ldp.dtb \
@@ -294,13 +294,6 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
         qcom-msm8960-cdp.dtb \
         qcom-apq8074-dragonboard.dtb
-dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
-        ste-hrefprev60-stuib.dtb \
-        ste-hrefprev60-tvk.dtb \
-        ste-hrefv60plus-stuib.dtb \
-        ste-hrefv60plus-tvk.dtb \
-        ste-ccu8540.dtb \
-        ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
         s3c6410-smdk6410.dtb
@@ -369,9 +362,16 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra30-cardhu-a04.dtb \
         tegra114-dalmore.dtb \
         tegra124-venice2.dtb
+dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
+dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
+        ste-hrefprev60-stuib.dtb \
+        ste-hrefprev60-tvk.dtb \
+        ste-hrefv60plus-stuib.dtb \
+        ste-hrefv60plus-tvk.dtb \
+        ste-ccu8540.dtb \
+        ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
         versatile-pb.dtb
-dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
         vexpress-v2p-ca9.dtb \
         vexpress-v2p-ca15-tc1.dtb \
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index e3f27ec31718..2e7d932887b5 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -183,7 +183,7 @@
 &usb {
         status = "okay";
 
-        control@44e10000 {
+        control@44e10620 {
                 status = "okay";
         };
 
@@ -204,7 +204,7 @@
                 dr_mode = "host";
         };
 
-        dma-controller@07402000  {
+        dma-controller@47402000  {
                 status = "okay";
         };
 };
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 28ae040e7c3d..6028217ace0f 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -301,8 +301,8 @@
 
         am335x_evm_audio_pins: am335x_evm_audio_pins {
                 pinctrl-single,pins = <
-                        0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rx_dv.mcasp1_aclkx */
-                        0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_txd3.mcasp1_fsx */
+                        0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
+                        0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
                         0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
                         0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
                 >;
@@ -331,7 +331,7 @@
 &usb {
         status = "okay";
 
-        control@44e10000 {
+        control@44e10620 {
                 status = "okay";
         };
 
@@ -352,7 +352,7 @@
                 dr_mode = "host";
         };
 
-        dma-controller@07402000  {
+        dma-controller@47402000  {
                 status = "okay";
         };
 };
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index ec08f6f677c3..ab238850a7b2 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -364,7 +364,7 @@
 &usb {
         status = "okay";
 
-        control@44e10000 {
+        control@44e10620 {
                 status = "okay";
         };
 
@@ -385,7 +385,7 @@
                 dr_mode = "host";
         };
 
-        dma-controller@07402000  {
+        dma-controller@47402000  {
                 status = "okay";
         };
 };
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 7063311a58d9..9f22c189f636 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -118,7 +118,6 @@
                 reg = <0 0 0>; /* CS0, offset 0 */
                 nand-bus-width = <8>;
                 ti,nand-ecc-opt = "bch8";
-                gpmc,device-nand = "true";
                 gpmc,device-width = <1>;
                 gpmc,sync-clk-ps = <0>;
                 gpmc,cs-on-ns = <0>;
@@ -202,7 +201,7 @@
 &usb {
         status = "okay";
 
-        control@44e10000 {
+        control@44e10620 {
                 status = "okay";
         };
 
@@ -223,7 +222,7 @@
                 dr_mode = "host";
         };
 
-        dma-controller@07402000  {
+        dma-controller@47402000  {
                 status = "okay";
         };
 };
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index d1e2b363f927..baf56cc92040 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -72,7 +72,7 @@
         };
 
         /*
-         * The soc node represents the soc top level view. It is uses for IPs
+         * The soc node represents the soc top level view. It is used for IPs
          * that are not memory mapped in the MPU view or for the MPU itself.
          */
         soc {
@@ -94,8 +94,8 @@
 
         /*
          * XXX: Use a flat representation of the AM33XX interconnect.
-         * The real AM33XX interconnect network is quite complex.Since
-         * that will not bring real advantage to represent that in DT
+         * The real AM33XX interconnect network is quite complex. Since
+         * it will not bring real advantage to represent that in DT
          * for the moment, just use a fake OCP bus entry to represent
          * the whole bus hierarchy.
          */
@@ -804,7 +804,7 @@
                               <0x46000000 0x400000>;
                         reg-names = "mpu", "dat";
                         interrupts = <80>, <81>;
-                        interrupts-names = "tx", "rx";
+                        interrupt-names = "tx", "rx";
                         status = "disabled";
                         dmas = <&edma 8>,
                                 <&edma 9>;
@@ -818,7 +818,7 @@
                               <0x46400000 0x400000>;
                         reg-names = "mpu", "dat";
                         interrupts = <82>, <83>;
-                        interrupts-names = "tx", "rx";
+                        interrupt-names = "tx", "rx";
                         status = "disabled";
                         dmas = <&edma 10>,
                                 <&edma 11>;
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index c2779f653020..03a225505126 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -693,7 +693,7 @@
                               <0x46000000 0x400000>;
                         reg-names = "mpu", "dat";
                         interrupts = <80>, <81>;
-                        interrupts-names = "tx", "rx";
+                        interrupt-names = "tx", "rx";
                         status = "disabled";
                         dmas = <&edma 8>,
                                <&edma 9>;
@@ -707,7 +707,7 @@
                               <0x46400000 0x400000>;
                         reg-names = "mpu", "dat";
                         interrupts = <82>, <83>;
-                        interrupts-names = "tx", "rx";
+                        interrupt-names = "tx", "rx";
                         status = "disabled";
                         dmas = <&edma 10>,
                                <&edma 11>;
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index bbb40f62037d..bb77970c0b12 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -230,6 +230,7 @@
                                 #size-cells = <0>;
                                 compatible = "marvell,orion-mdio";
                                 reg = <0x72004 0x4>;
+                                clocks = <&gateclk 4>;
                         };
 
                         eth1: ethernet@74000 {
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a064f59da02d..ca8813bb99ba 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -336,6 +336,7 @@
                                 #size-cells = <0>;
                                 compatible = "marvell,orion-mdio";
                                 reg = <0x72004 0x4>;
+                                clocks = <&gateclk 4>;
                         };
 
                         coredivclk: clock@e4250 {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1c0f8e1893ae..149b55099935 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -80,7 +80,7 @@
         };
 
         /*
-         * The soc node represents the soc top level view. It is uses for IPs
+         * The soc node represents the soc top level view. It is used for IPs
          * that are not memory mapped in the MPU view or for the MPU itself.
          */
         soc {
@@ -94,7 +94,7 @@
         /*
          * XXX: Use a flat representation of the SOC interconnect.
          * The real OMAP interconnect network is quite complex.
-         * Since that will not bring real advantage to represent that in DT for
+         * Since it will not bring real advantage to represent that in DT for
          * the moment, just use a fake OCP bus entry to represent the whole bus
          * hierarchy.
          */
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index e96da9a898ad..cfb8fc753f50 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -1640,7 +1640,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,mux-clock";
                 clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
-                ti,bit-shift = <28>;
+                ti,bit-shift = <24>;
                 reg = <0x1860>;
         };
 
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 32f760e24898..ea323f09dc78 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -56,6 +56,7 @@
 
                 osc {
                         compatible = "fsl,imx-osc", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 09f57b39e3ef..73aae4f5e539 100644
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -29,6 +29,7 @@
 
                 osc26m {
                         compatible = "fsl,imx-osc26m", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 6279e0b4f768..137e010eab35 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -48,6 +48,7 @@
 
                 osc26m {
                         compatible = "fsl,imx-osc26m", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <26000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 0c75fe3deb35..9c89d1ca97c2 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -53,21 +53,25 @@
 
                 ckil {
                         compatible = "fsl,imx-ckil", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 ckih1 {
                         compatible = "fsl,imx-ckih1", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <22579200>;
                 };
 
                 ckih2 {
                         compatible = "fsl,imx-ckih2", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
 
                 osc {
                         compatible = "fsl,imx-osc", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 5f8216d08f6b..150bb4e2f744 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -50,21 +50,25 @@
 
                 ckil {
                         compatible = "fsl,imx-ckil", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 ckih1 {
                         compatible = "fsl,imx-ckih1", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
 
                 ckih2 {
                         compatible = "fsl,imx-ckih2", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
 
                 osc {
                         compatible = "fsl,imx-osc", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index f6d3ac3e5587..d5d146a8b149 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -17,7 +17,8 @@
         compatible = "denx,imx53-m53evk", "fsl,imx53";
 
         memory {
-                reg = <0x70000000 0x20000000>;
+                reg = <0x70000000 0x20000000>,
+                      <0xb0000000 0x20000000>;
         };
 
         soc {
@@ -193,17 +194,17 @@
                 irq-trigger = <0x1>;
 
                 stmpe_touchscreen {
-                        compatible = "stmpe,ts";
+                        compatible = "st,stmpe-ts";
                         reg = <0>;
-                        ts,sample-time = <4>;
-                        ts,mod-12b = <1>;
-                        ts,ref-sel = <0>;
-                        ts,adc-freq = <1>;
-                        ts,ave-ctrl = <3>;
-                        ts,touch-det-delay = <3>;
-                        ts,settling = <4>;
-                        ts,fraction-z = <7>;
-                        ts,i-drive = <1>;
+                        st,sample-time = <4>;
+                        st,mod-12b = <1>;
+                        st,ref-sel = <0>;
+                        st,adc-freq = <1>;
+                        st,ave-ctrl = <3>;
+                        st,touch-det-delay = <3>;
+                        st,settling = <4>;
+                        st,fraction-z = <7>;
+                        st,i-drive = <1>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 3f825a6813da..ede04fa4161f 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -14,7 +14,8 @@
 
 / {
         memory {
-                reg = <0x70000000 0x40000000>;
+                reg = <0x70000000 0x20000000>,
+                      <0xb0000000 0x20000000>;
         };
 
         display0: display@di0 {
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 0217dde3b36b..3b73e81dc3f0 100644
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -25,12 +25,17 @@
         soc {
                 display: display@di0 {
                         compatible = "fsl,imx-parallel-display";
-                        crtcs = <&ipu 0>;
                         interface-pix-fmt = "rgb24";
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_rgb24_vga1>;
                         status = "okay";
 
+                        port {
+                                display0_in: endpoint {
+                                        remote-endpoint = <&ipu_di0_disp0>;
+                                };
+                        };
+
                         display-timings {
                                 VGA {
                                         clock-frequency = <25200000>;
@@ -293,6 +298,10 @@
         };
 };
 
+&ipu_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
 &kpp {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_kpp>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index b57ab57740f6..9c2bff2252d0 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -70,21 +70,25 @@
 
                 ckil {
                         compatible = "fsl,imx-ckil", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 ckih1 {
                         compatible = "fsl,imx-ckih1", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <22579200>;
                 };
 
                 ckih2 {
                         compatible = "fsl,imx-ckih2", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
 
                 osc {
                         compatible = "fsl,imx-osc", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
@@ -430,7 +434,7 @@
 
                                         port {
                                                 lvds1_in: endpoint {
-                                                        remote-endpoint = <&ipu_di0_lvds0>;
+                                                        remote-endpoint = <&ipu_di1_lvds1>;
                                                 };
                                         };
                                 };
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index a63bbb3d46bb..e4ae38fd0269 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -19,7 +19,10 @@
         compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q";
 
         aliases {
-                gpio7 = &stmpe_gpio;
+                gpio7 = &stmpe_gpio1;
+                gpio8 = &stmpe_gpio2;
+                stmpe-i2c0 = &stmpe1;
+                stmpe-i2c1 = &stmpe2;
         };
 
         memory {
@@ -40,13 +43,15 @@
                         regulator-always-on;
                 };
 
-                reg_usb_otg_vbus: regulator@1 {
+                reg_usb_otg_switch: regulator@1 {
                         compatible = "regulator-fixed";
                         reg = <1>;
-                        regulator-name = "usb_otg_vbus";
+                        regulator-name = "usb_otg_switch";
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         gpio = <&gpio7 12 0>;
+                        regulator-boot-on;
+                        regulator-always-on;
                 };
 
                 reg_usb_host1: regulator@2 {
@@ -65,23 +70,23 @@
 
                 led-blue {
                         label = "blue";
-                        gpios = <&stmpe_gpio 8 GPIO_ACTIVE_HIGH>;
+                        gpios = <&stmpe_gpio1 8 GPIO_ACTIVE_HIGH>;
                         linux,default-trigger = "heartbeat";
                 };
 
                 led-green {
                         label = "green";
-                        gpios = <&stmpe_gpio 9 GPIO_ACTIVE_HIGH>;
+                        gpios = <&stmpe_gpio1 9 GPIO_ACTIVE_HIGH>;
                 };
 
                 led-pink {
                         label = "pink";
-                        gpios = <&stmpe_gpio 10 GPIO_ACTIVE_HIGH>;
+                        gpios = <&stmpe_gpio1 10 GPIO_ACTIVE_HIGH>;
                 };
 
                 led-red {
                         label = "red";
-                        gpios = <&stmpe_gpio 11 GPIO_ACTIVE_HIGH>;
+                        gpios = <&stmpe_gpio1 11 GPIO_ACTIVE_HIGH>;
                 };
         };
 };
@@ -99,7 +104,8 @@
         clock-frequency = <100000>;
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_i2c2
-                     &pinctrl_stmpe>;
+                     &pinctrl_stmpe1
+                     &pinctrl_stmpe2>;
         status = "okay";
 
         pmic: pfuze100@08 {
@@ -205,13 +211,25 @@
                 };
         };
 
-        stmpe: stmpe1601@40 {
+        stmpe1: stmpe1601@40 {
                 compatible = "st,stmpe1601";
                 reg = <0x40>;
                 interrupts = <30 0>;
                 interrupt-parent = <&gpio3>;
 
-                stmpe_gpio: stmpe_gpio {
+                stmpe_gpio1: stmpe_gpio {
+                        #gpio-cells = <2>;
+                        compatible = "st,stmpe-gpio";
+                };
+        };
+
+        stmpe2: stmpe1601@44 {
+                compatible = "st,stmpe1601";
+                reg = <0x44>;
+                interrupts = <2 0>;
+                interrupt-parent = <&gpio5>;
+
+                stmpe_gpio2: stmpe_gpio {
                         #gpio-cells = <2>;
                         compatible = "st,stmpe-gpio";
                 };
@@ -273,10 +291,14 @@
                         >;
                 };
 
-                pinctrl_stmpe: stmpegrp {
+                pinctrl_stmpe1: stmpe1grp {
                         fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
                 };
 
+                pinctrl_stmpe2: stmpe2grp {
+                        fsl,pins = <MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000>;
+                };
+
                 pinctrl_uart1: uart1grp {
                         fsl,pins = <
                                 MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b0b1
@@ -293,7 +315,7 @@
 
                 pinctrl_usbotg: usbotggrp {
                         fsl,pins = <
-                                MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+                                MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
                         >;
                 };
 
@@ -344,11 +366,11 @@
 &usbh1 {
         vbus-supply = <&reg_usb_host1>;
         disable-over-current;
+        dr_mode = "host";
         status = "okay";
 };
 
 &usbotg {
-        vbus-supply = <&reg_usb_otg_vbus>;
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usbotg>;
         disable-over-current;
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 902f98310481..e51bb3f0fd56 100644
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -487,9 +487,6 @@
 
 &ldb {
         status = "okay";
-        lvds-channel@0 {
-                crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-        };
 };
 
 &pcie {
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 8e99c9a9bc76..035d3a85c318 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -436,9 +436,6 @@
 
 &ldb {
         status = "okay";
-        lvds-channel@0 {
-                crtcs = <&ipu1 0>, <&ipu1 1>;
-        };
 };
 
 &pcie {
diff --git a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi b/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
index a3cb2fff8f61..d16066608e21 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
@@ -26,25 +26,25 @@
                                 /* GPIO16 -> AR8035 25MHz */
                                 MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0xc0000000
                                 MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x80000000
-                                MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b0b0
-                                MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b0b0
-                                MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b0b0
-                                MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b0b0
-                                MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b0b0
+                                MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                                MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                                MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                                MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                                MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
                                 /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */
                                 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x0a0b1
                                 /* AR8035 pin strapping: IO voltage: pull up */
-                                MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
+                                MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
                                 /* AR8035 pin strapping: PHYADDR#0: pull down */
-                                MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x130b0
+                                MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x13030
                                 /* AR8035 pin strapping: PHYADDR#1: pull down */
-                                MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x130b0
+                                MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x13030
                                 /* AR8035 pin strapping: MODE#1: pull up */
-                                MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
+                                MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
                                 /* AR8035 pin strapping: MODE#3: pull up */
-                                MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
+                                MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
                                 /* AR8035 pin strapping: MODE#0: pull down */
-                                MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x130b0
+                                MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x13030
 
                                 /*
                                  * As the RMII pins are also connected to RGMII
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 55cb926fa3f7..eca0971d4db1 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -10,6 +10,8 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
 #include "skeleton.dtsi"
 
 / {
@@ -46,8 +48,6 @@
         intc: interrupt-controller@00a01000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
-                #address-cells = <1>;
-                #size-cells = <1>;
                 interrupt-controller;
                 reg = <0x00a01000 0x1000>,
                       <0x00a00100 0x100>;
@@ -59,16 +59,19 @@
 
                 ckil {
                         compatible = "fsl,imx-ckil", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 ckih1 {
                         compatible = "fsl,imx-ckih1", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <0>;
                 };
 
                 osc {
                         compatible = "fsl,imx-osc", "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
@@ -138,6 +141,12 @@
                                   0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
                         num-lanes = <1>;
                         interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0x7>;
+                        interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>;
                         clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi";
                         status = "disabled";
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 864d8dfb51ca..a8d9a93fab85 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -282,6 +282,7 @@
                                 MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO      0x100b1
                                 MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI      0x100b1
                                 MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK      0x100b1
+                                MX6SL_PAD_ECSPI1_SS0__GPIO4_IO11        0x80000000
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 3cb4941afeef..d26b099260a3 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -68,8 +68,6 @@
         intc: interrupt-controller@00a01000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
-                #address-cells = <1>;
-                #size-cells = <1>;
                 interrupt-controller;
                 reg = <0x00a01000 0x1000>,
                       <0x00a00100 0x100>;
@@ -81,11 +79,13 @@
 
                 ckil {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 osc {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 40791053106b..6becedebaa4e 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -75,7 +75,7 @@
                         m25p16@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "m25p16";
+                                compatible = "st,m25p16";
                                 reg = <0>;
                                 spi-max-frequency = <40000000>;
                                 mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 0e06fd3cee4d..3b62aeeaa3a2 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -46,7 +46,7 @@
                         flash@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "mx25l4005a";
+                                compatible = "mxicy,mx25l4005a";
                                 reg = <0>;
                                 spi-max-frequency = <20000000>;
                                 mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index ef3463e0ae19..28b3ee369778 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -43,7 +43,7 @@
                         m25p40@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "mx25l1606e";
+                                compatible = "mxicy,mx25l1606e";
                                 reg = <0>;
                                 spi-max-frequency = <50000000>;
                                 mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index c9e82eff9bf2..6761ffa2c4ab 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -48,7 +48,7 @@
                         status = "okay";
 
                         eeprom@50 {
-                                compatible = "at,24c04";
+                                compatible = "atmel,24c04";
                                 pagesize = <16>;
                                 reg = <0x50>;
                         };
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 2cb0dc529165..32c6fb4a1162 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -56,7 +56,7 @@
                         flash@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "mx25l12805d";
+                                compatible = "mxicy,mx25l12805d";
                                 reg = <0>;
                                 spi-max-frequency = <50000000>;
                                 mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 743152f31a81..e6e5ec4fe6b9 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -32,7 +32,7 @@
                         flash@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "mx25l4005a";
+                                compatible = "mxicy,mx25l4005a";
                                 reg = <0>;
                                 spi-max-frequency = <20000000>;
                                 mode = <0>;
@@ -50,7 +50,7 @@
                         status = "okay";
 
                         eeprom@50 {
-                                compatible = "at,24c04";
+                                compatible = "atmel,24c04";
                                 pagesize = <16>;
                                 reg = <0x50>;
                         };
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 03fa24cf3344..0a07af9d8e58 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -104,7 +104,7 @@
                         status = "okay";
 
                         adt7476: adt7476a@2e {
-                                compatible = "adt7476";
+                                compatible = "adi,adt7476";
                                 reg = <0x2e>;
                         };
                 };
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index a5e779452867..27ca6a79c48a 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -94,7 +94,7 @@
                         status = "okay";
 
                         lm85: lm85@2e {
-                                compatible = "lm85";
+                                compatible = "national,lm85";
                                 reg = <0x2e>;
                         };
                 };
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index b88da9392c32..0650beafc1de 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -40,7 +40,7 @@
                         pinctrl-names = "default";
 
                         s35390a: s35390a@30 {
-                                compatible = "s35390a";
+                                compatible = "sii,s35390a";
                                 reg = <0x30>;
                         };
                 };
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index b2f7cae06839..38520a287514 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -52,7 +52,7 @@
                         pinctrl-names = "default";
 
                         s24c02: s24c02@50 {
-                                compatible = "24c02";
+                                compatible = "atmel,24c02";
                                 reg = <0x50>;
                         };
                 };
diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
new file mode 100644
index 000000000000..7ac3bcf59d59
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "omap3-beagle-xm.dts"
+
+/ {
+        /* HS USB Port 2 Power enable was inverted with the xM C */
+        hsusb2_power: hsusb2_power_reg {
+                enable-active-high;
+        };
+};
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index bf5a515a3247..da402f0fdab4 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -112,7 +112,6 @@
                 reg = <0 0 0>; /* CS0, offset 0 */
                 nand-bus-width = <16>;
 
-                gpmc,device-nand;
                 gpmc,sync-clk-ps = <0>;
                 gpmc,cs-on-ns = <0>;
                 gpmc,cs-rd-off-ns = <44>;
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index 6369d9f43ca2..cc1dce6978f5 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -368,7 +368,6 @@
                 /* no elm on omap3 */
 
                 gpmc,mux-add-data = <0>;
-                gpmc,device-nand;
                 gpmc,device-width = <2>;
                 gpmc,wait-pin = <0>;
                 gpmc,wait-monitoring-ns = <0>;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 5e5790f631eb..acb9019dc437 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -74,7 +74,7 @@
         /*
          * XXX: Use a flat representation of the OMAP3 interconnect.
          * The real OMAP interconnect network is quite complex.
-         * Since that will not bring real advantage to represent that in DT for
+         * Since it will not bring real advantage to represent that in DT for
          * the moment, just use a fake OCP bus entry to represent the whole bus
          * hierarchy.
          */
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 27fcac874742..649b5cd38b40 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -72,7 +72,7 @@
         };
 
         /*
-         * The soc node represents the soc top level view. It is uses for IPs
+         * The soc node represents the soc top level view. It is used for IPs
          * that are not memory mapped in the MPU view or for the MPU itself.
          */
         soc {
@@ -96,7 +96,7 @@
         /*
          * XXX: Use a flat representation of the OMAP4 interconnect.
          * The real OMAP interconnect network is quite complex.
-         * Since that will not bring real advantage to represent that in DT for
+         * Since it will not bring real advantage to represent that in DT for
          * the moment, just use a fake OCP bus entry to represent the whole bus
          * hierarchy.
          */
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 6f3de22fb266..f8c9855ce587 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -93,7 +93,7 @@
         };
 
         /*
-         * The soc node represents the soc top level view. It is uses for IPs
+         * The soc node represents the soc top level view. It is used for IPs
          * that are not memory mapped in the MPU view or for the MPU itself.
          */
         soc {
@@ -107,7 +107,7 @@
         /*
          * XXX: Use a flat representation of the OMAP3 interconnect.
          * The real OMAP interconnect network is quite complex.
-         * Since that will not bring real advantage to represent that in DT for
+         * Since it will not bring real advantage to represent that in DT for
          * the moment, just use a fake OCP bus entry to represent the whole bus
          * hierarchy.
          */
@@ -813,6 +813,12 @@
                                       <0x4a084c00 0x40>;
                                 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
                                 ctrl-module = <&omap_control_usb3phy>;
+                                clocks = <&usb_phy_cm_clk32k>,
+                                         <&sys_clkin>,
+                                         <&usb_otg_ss_refclk960m>;
+                                clock-names =   "wkupclk",
+                                                "sysclk",
+                                                "refclk";
                                 #phy-cells = <0>;
                         };
                 };
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 8280884bfa59..2551e9438d35 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -28,7 +28,6 @@
         gic: interrupt-controller@c2800000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
-                #address-cells = <1>;
                 interrupt-controller;
                 reg = <0xc2800000 0x1000>,
                       <0xc2000000 0x1000>;
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6e99eb2df076..d01048ab3e77 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -141,12 +141,12 @@
         };
 
         sdhi0_pins: sd0 {
-                renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+                renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
                 renesas,function = "sdhi0";
         };
 
         sdhi2_pins: sd2 {
-                renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+                renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
                 renesas,function = "sdhi2";
         };
 
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index bdd73e6657b2..de1b6977c69a 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -230,17 +230,17 @@
         };
 
         sdhi0_pins: sd0 {
-                renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+                renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
                 renesas,function = "sdhi0";
         };
 
         sdhi1_pins: sd1 {
-                renesas,gpios = "sdhi1_data4", "sdhi1_ctrl";
+                renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
                 renesas,function = "sdhi1";
         };
 
         sdhi2_pins: sd2 {
-                renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+                renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
                 renesas,function = "sdhi2";
         };
 
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index bb36596ea205..ed9a70af3e3f 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -149,7 +149,7 @@
 
                         uart0 {
                                 uart0_xfer: uart0-xfer {
-                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
@@ -164,7 +164,7 @@
 
                         uart1 {
                                 uart1_xfer: uart1-xfer {
-                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
@@ -179,7 +179,7 @@
 
                         uart2 {
                                 uart2_xfer: uart2-xfer {
-                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
                                 };
                                 /* no rts / cts for uart2 */
@@ -187,7 +187,7 @@
 
                         uart3 {
                                 uart3_xfer: uart3-xfer {
-                                        rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index b7bd3b9a6753..5ecf552e1c00 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -34,7 +34,6 @@
         gic: interrupt-controller@f0001000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
-                #address-cells = <1>;
                 interrupt-controller;
                 reg = <0xf0001000 0x1000>,
                       <0xf0000100 0x100>;
diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi
index f09fb10a3791..81df870e5ee6 100644
--- a/arch/arm/boot/dts/stih415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi
@@ -49,7 +49,7 @@
                         reg             = <0xfe61f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfe610000 0x5000>;
 
                         PIO0: gpio@fe610000 {
@@ -187,7 +187,7 @@
                         reg             = <0xfee0f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfee00000 0x8000>;
 
                         PIO5: gpio@fee00000 {
@@ -282,7 +282,7 @@
                         reg             = <0xfe82f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfe820000 0x8000>;
 
                         PIO13: gpio@fe820000 {
@@ -423,7 +423,7 @@
                         reg             = <0xfd6bf080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfd6b0000 0x3000>;
 
                         PIO100: gpio@fd6b0000 {
@@ -460,7 +460,7 @@
                         reg             = <0xfd33f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfd330000 0x5000>;
 
                         PIO103: gpio@fd330000 {
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index aeea304086eb..250d5ecc951e 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -53,7 +53,7 @@
                         reg             = <0xfe61f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfe610000 0x6000>;
 
                         PIO0: gpio@fe610000 {
@@ -201,7 +201,7 @@
                         reg             = <0xfee0f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfee00000 0x10000>;
 
                         PIO5: gpio@fee00000 {
@@ -333,7 +333,7 @@
                         reg             = <0xfe82f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfe820000 0x6000>;
 
                         PIO13: gpio@fe820000 {
@@ -461,7 +461,7 @@
                         reg             = <0xfd6bf080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges          = <0 0xfd6b0000 0x3000>;
 
                         PIO100: gpio@fd6b0000 {
@@ -498,7 +498,7 @@
                         reg             = <0xfd33f080 0x4>;
                         reg-names       = "irqmux";
                         interrupts      = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupts-names = "irqmux";
+                        interrupt-names = "irqmux";
                         ranges                  = <0 0xfd330000 0x5000>;
 
                         PIO103: gpio@fd330000 {
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index cf45a1a39483..6d540a025148 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -233,19 +233,6 @@
                 status = "disabled";
         };
 
-        serial@0,70006400 {
-                compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
-                reg = <0x0 0x70006400 0x0 0x40>;
-                reg-shift = <2>;
-                interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&tegra_car TEGRA124_CLK_UARTE>;
-                resets = <&tegra_car 66>;
-                reset-names = "serial";
-                dmas = <&apbdma 20>, <&apbdma 20>;
-                dma-names = "rx", "tx";
-                status = "disabled";
-        };
-
         pwm@0,7000a000 {
                 compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm";
                 reg = <0x0 0x7000a000 0x0 0x100>;
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index 7dd1d6ede525..ded361075aab 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -25,11 +25,13 @@
         clocks {
                 audio_ext {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24576000>;
                 };
 
                 enet_ext {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <50000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 804873367669..b8ce0aa7b157 100644
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -45,11 +45,13 @@
 
                 sxosc {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <32768>;
                 };
 
                 fxosc {
                         compatible = "fixed-clock";
+                        #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
         };
@@ -72,8 +74,6 @@
                         intc: interrupt-controller@40002000 {
                                 compatible = "arm,cortex-a9-gic";
                                 #interrupt-cells = <3>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
                                 interrupt-controller;
                                 reg = <0x40003000 0x1000>,
                                       <0x40002100 0x100>;
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 511180769af5..c1176abc34d9 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -24,6 +24,7 @@
                         device_type = "cpu";
                         reg = <0>;
                         clocks = <&clkc 3>;
+                        clock-latency = <1000>;
                         operating-points = <
                                 /* kHz    uV */
                                 666667  1000000
@@ -54,6 +55,28 @@
                 interrupt-parent = <&intc>;
                 ranges;
 
+                i2c0: zynq-i2c@e0004000 {
+                        compatible = "cdns,i2c-r1p10";
+                        status = "disabled";
+                        clocks = <&clkc 38>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 25 4>;
+                        reg = <0xe0004000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                i2c1: zynq-i2c@e0005000 {
+                        compatible = "cdns,i2c-r1p10";
+                        status = "disabled";
+                        clocks = <&clkc 39>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 48 4>;
+                        reg = <0xe0005000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
                 intc: interrupt-controller@f8f01000 {
                         compatible = "arm,cortex-a9-gic";
                         #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index c913f77a21eb..5e09cee33d42 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -34,6 +34,82 @@
         phy-mode = "rgmii";
 };
 
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        i2cswitch@74 {
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        si570: clock-generator@5d {
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                temperature-stability = <50>;
+                                reg = <0x5d>;
+                                factory-fout = <156250000>;
+                                clock-frequency = <148500000>;
+                        };
+                };
+
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        eeprom@54 {
+                                compatible = "at,24c08";
+                                reg = <0x54>;
+                        };
+                };
+
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        gpio@21 {
+                                compatible = "ti,tca6416";
+                                reg = <0x21>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                        };
+                };
+
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        rtc@51 {
+                                compatible = "nxp,pcf8563";
+                                reg = <0x51>;
+                        };
+                };
+
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        hwmon@52 {
+                                compatible = "ti,ucd9248";
+                                reg = <52>;
+                        };
+                        hwmon@53 {
+                                compatible = "ti,ucd9248";
+                                reg = <53>;
+                        };
+                        hwmon@54 {
+                                compatible = "ti,ucd9248";
+                                reg = <54>;
+                        };
+                };
+        };
+};
+
 &sdhci0 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 88f62c50382e..4cc9913078cd 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -35,6 +35,74 @@
         phy-mode = "rgmii";
 };
 
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        i2cswitch@74 {
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        si570: clock-generator@5d {
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                temperature-stability = <50>;
+                                reg = <0x5d>;
+                                factory-fout = <156250000>;
+                                clock-frequency = <148500000>;
+                        };
+                };
+
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        eeprom@54 {
+                                compatible = "at,24c08";
+                                reg = <0x54>;
+                        };
+                };
+
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        gpio@21 {
+                                compatible = "ti,tca6416";
+                                reg = <0x21>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                        };
+                };
+
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        rtc@51 {
+                                compatible = "nxp,pcf8563";
+                                reg = <0x51>;
+                        };
+                };
+
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        ucd90120@65 {
+                                compatible = "ti,ucd90120";
+                                reg = <0x65>;
+                        };
+                };
+        };
+};
+
 &sdhci0 {
         status = "okay";
 };