Merge branch 'fixes' into misc

17 files changed, 81 insertions, 49 deletions

diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 6c667fb35449..4e28d87e9356 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@ -470,9 +470,12 @@
 };
 
 &cpsw_emac0 {
-        phy_id = <&davinci_mdio>, <0>;
         phy-mode = "rmii";
         dual_emac_res_vlan = <1>;
+        fixed-link {
+                speed = <100>;
+                full-duplex;
+        };
 };
 
 &cpsw_emac1 {
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 6e4f5af3d8f8..344b861a55a5 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -207,7 +207,7 @@
                         ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
                                    <&edma_tptc2 0>;
 
-                        ti,edma-memcpy-channels = <32 33>;
+                        ti,edma-memcpy-channels = <58 59>;
                 };
 
                 edma_tptc0: tptc@49800000 {
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 83dfafaaba1b..d5dd72047a7e 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -794,3 +794,8 @@
         tx-num-evt = <32>;
         rx-num-evt = <32>;
 };
+
+&synctimer_32kclk {
+        assigned-clocks = <&mux_synctimer32k_ck>;
+        assigned-clock-parents = <&clkdiv32k_ick>;
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 3710755c6d76..85d2c377c332 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -117,7 +117,7 @@
                         };
 
                         /* USB part of the eSATA/USB 2.0 port */
-                        usb@50000 {
+                        usb@58000 {
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index a2ddcb8c545a..45619f6162c5 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -91,8 +91,8 @@
                 clock-frequency = <141666666>;
         };
 
-        pinctrl: pinctrl@c1109880 {
-                compatible = "amlogic,meson8-pinctrl";
+        pinctrl_cbus: pinctrl@c1109880 {
+                compatible = "amlogic,meson8-cbus-pinctrl";
                 reg = <0xc1109880 0x10>;
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -108,29 +108,6 @@
                         #gpio-cells = <2>;
                 };
 
-                gpio_ao: ao-bank@c1108030 {
-                        reg = <0xc8100014 0x4>,
-                              <0xc810002c 0x4>,
-                              <0xc8100024 0x8>;
-                        reg-names = "mux", "pull", "gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                uart_ao_a_pins: uart_ao_a {
-                        mux {
-                                groups = "uart_tx_ao_a", "uart_rx_ao_a";
-                                function = "uart_ao";
-                        };
-                };
-
-                i2c_ao_pins: i2c_mst_ao {
-                        mux {
-                                groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao";
-                                function = "i2c_mst_ao";
-                        };
-                };
-
                 spi_nor_pins: nor {
                         mux {
                                 groups = "nor_d", "nor_q", "nor_c", "nor_cs";
@@ -157,4 +134,34 @@
                 };
         };
 
+        pinctrl_aobus: pinctrl@c8100084 {
+                compatible = "amlogic,meson8-aobus-pinctrl";
+                reg = <0xc8100084 0xc>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                gpio_ao: ao-bank@c1108030 {
+                        reg = <0xc8100014 0x4>,
+                              <0xc810002c 0x4>,
+                              <0xc8100024 0x8>;
+                        reg-names = "mux", "pull", "gpio";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+
+                uart_ao_a_pins: uart_ao_a {
+                        mux {
+                                groups = "uart_tx_ao_a", "uart_rx_ao_a";
+                                function = "uart_ao";
+                        };
+                };
+
+                i2c_ao_pins: i2c_mst_ao {
+                        mux {
+                                groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao";
+                                function = "i2c_mst_ao";
+                        };
+                };
+        };
 }; /* end of / */
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 8bad5571af46..2bfe401a4da9 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -155,8 +155,8 @@
                         reg = <0xc1108000 0x4>, <0xc1104000 0x460>;
                 };
 
-                pinctrl: pinctrl@c1109880 {
-                        compatible = "amlogic,meson8b-pinctrl";
+                pinctrl_cbus: pinctrl@c1109880 {
+                        compatible = "amlogic,meson8b-cbus-pinctrl";
                         reg = <0xc1109880 0x10>;
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -171,6 +171,14 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                         };
+                };
+
+                pinctrl_aobus: pinctrl@c8100084 {
+                        compatible = "amlogic,meson8b-aobus-pinctrl";
+                        reg = <0xc8100084 0xc>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
 
                         gpio_ao: ao-bank@c1108030 {
                                 reg = <0xc8100014 0x4>,
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2bd9c83300b2..421fe9f8a9eb 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -70,7 +70,7 @@
                 compatible = "arm,cortex-a9-twd-timer";
                 clocks = <&mpu_periphclk>;
                 reg = <0x48240600 0x20>;
-                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_HIGH)>;
+                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_EDGE_RISING)>;
                 interrupt-parent = <&gic>;
         };
 
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 07055eacbb0f..a691d590fbd1 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -63,6 +63,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_BU21013=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AB8500_PONKEY=y
+CONFIG_RMI4_CORE=y
+CONFIG_RMI4_I2C=y
+CONFIG_RMI4_F11=y
 # CONFIG_SERIO is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index b5384311dec4..dded1b763c16 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1112,10 +1112,17 @@ static void __init hyp_cpu_pm_init(void)
 {
         cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);
 }
+static void __init hyp_cpu_pm_exit(void)
+{
+        cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
+}
 #else
 static inline void hyp_cpu_pm_init(void)
 {
 }
+static inline void hyp_cpu_pm_exit(void)
+{
+}
 #endif
 
 static void teardown_common_resources(void)
@@ -1141,9 +1148,7 @@ static int init_subsystems(void)
         /*
          * Register CPU Hotplug notifier
          */
-        cpu_notifier_register_begin();
-        err = __register_cpu_notifier(&hyp_init_cpu_nb);
-        cpu_notifier_register_done();
+        err = register_cpu_notifier(&hyp_init_cpu_nb);
         if (err) {
                 kvm_err("Cannot register KVM init CPU notifier (%d)\n", err);
                 return err;
@@ -1193,6 +1198,8 @@ static void teardown_hyp_mode(void)
         free_hyp_pgds();
         for_each_possible_cpu(cpu)
                 free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
+        unregister_cpu_notifier(&hyp_init_cpu_nb);
+        hyp_cpu_pm_exit();
 }
 
 static int init_vhe_mode(void)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index d85c24918c17..2abd53ae3e7a 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -669,9 +669,9 @@ void __init dra7xxx_check_revision(void)
                 case 0:
                         omap_revision = DRA722_REV_ES1_0;
                         break;
+                case 1:
                 default:
-                        /* If we have no new revisions */
-                        omap_revision = DRA722_REV_ES1_0;
+                        omap_revision = DRA722_REV_ES2_0;
                         break;
                 }
                 break;
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 3c87e40650cf..9821be6dfd5e 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -368,6 +368,7 @@ void __init omap5_map_io(void)
 void __init dra7xx_map_io(void)
 {
         iotable_init(dra7xx_io_desc, ARRAY_SIZE(dra7xx_io_desc));
+        omap_barriers_init();
 }
 #endif
 /*
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index b6d62e4cdfdd..2af6ff63e3b4 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1416,9 +1416,7 @@ static void _enable_sysc(struct omap_hwmod *oh)
             (sf & SYSC_HAS_CLOCKACTIVITY))
                 _set_clockactivity(oh, oh->class->sysc->clockact, &v);
 
-        /* If the cached value is the same as the new value, skip the write */
-        if (oh->_sysc_cache != v)
-                _write_sysconfig(v, oh);
+        _write_sysconfig(v, oh);
 
         /*
          * Set the autoidle bit only after setting the smartidle bit
@@ -1481,7 +1479,9 @@ static void _idle_sysc(struct omap_hwmod *oh)
                 _set_master_standbymode(oh, idlemode, &v);
         }
 
-        _write_sysconfig(v, oh);
+        /* If the cached value is the same as the new value, skip the write */
+        if (oh->_sysc_cache != v)
+                _write_sysconfig(v, oh);
 }
 
 /**
diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 39736ad2a754..df8327713d06 100644
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -582,9 +582,11 @@ static struct omap_hwmod_ocp_if dm81xx_alwon_l3_slow__gpmc = {
         .user           = OCP_USER_MPU,
 };
 
+/* USB needs udelay 1 after reset at least on hp t410, use 2 for margin */
 static struct omap_hwmod_class_sysconfig dm81xx_usbhsotg_sysc = {
         .rev_offs       = 0x0,
         .sysc_offs      = 0x10,
+        .srst_udelay    = 2,
         .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
                                 SYSC_HAS_SOFTRESET,
         .idlemodes      = SIDLE_SMART | MSTANDBY_FORCE | MSTANDBY_SMART,
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 70df8f6cddcc..364418c78bf3 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -489,6 +489,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define DRA752_REV_ES2_0        (DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8))
 #define DRA722_REV_ES1_0        (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))
 #define DRA722_REV_ES1_0        (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))
+#define DRA722_REV_ES2_0        (DRA7XX_CLASS | (0x22 << 16) | (0x20 << 8))
 
 void omap2xxx_check_revision(void);
 void omap3xxx_check_revision(void);
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 913a319c7b00..fffb697bbf0e 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -1235,5 +1235,6 @@ static struct platform_device pxa2xx_pxa_dma = {
 void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)
 {
         pxa_dma_pdata.dma_channels = nb_channels;
+        pxa_dma_pdata.nb_requestors = nb_requestors;
         pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);
 }
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index c6f6ed1cbed0..36e3c79f4973 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -61,10 +61,7 @@ config SA1100_H3100
         select MFD_IPAQ_MICRO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
-          H3100 handheld computer.  Information about this machine and the
-          Linux port to this machine can be found at:
-
-          <http://www.handhelds.org/Compaq/index.html#iPAQ_H3100>
+          H3100 handheld computer.
 
 config SA1100_H3600
         bool "Compaq iPAQ H3600/H3700"
@@ -73,10 +70,7 @@ config SA1100_H3600
         select MFD_IPAQ_MICRO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
-          H3600 handheld computer.  Information about this machine and the
-          Linux port to this machine can be found at:
-
-          <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600>
+          H3600 and H3700 handheld computers.
 
 config SA1100_BADGE4
         bool "HP Labs BadgePAD 4"
diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
index 69141357afe8..db04142f88bc 100644
--- a/arch/arm/mach-uniphier/platsmp.c
+++ b/arch/arm/mach-uniphier/platsmp.c
@@ -120,7 +120,7 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus)
         if (ret)
                 return ret;
 
-        uniphier_smp_rom_boot_rsv2 = ioremap(rom_rsv2_phys, sizeof(SZ_4));
+        uniphier_smp_rom_boot_rsv2 = ioremap(rom_rsv2_phys, SZ_4);
         if (!uniphier_smp_rom_boot_rsv2) {
                 pr_err("failed to map ROM_BOOT_RSV2 register\n");
                 return -ENOMEM;