13 files changed, 139 insertions, 77 deletions

diff --git a/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt b/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
index 578a1fca366e..443bcb6134d5 100644
--- a/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
+++ b/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
@@ -56,6 +56,9 @@ Required properties:
  - fsl,data-width : should be <18> or <24>
  - port: A port node with endpoint definitions as defined in
    Documentation/devicetree/bindings/media/video-interfaces.txt.
+   On i.MX5, the internal two-input-multiplexer is used.
+   Due to hardware limitations, only one port (port@[0,1])
+   can be used for each channel (lvds-channel@[0,1], respectively)
    On i.MX6, there should be four ports (port@[0-3]) that correspond
    to the four LVDS multiplexer inputs.
 
@@ -78,6 +81,8 @@ ldb: ldb@53fa8008 {
                       "di0", "di1";
 
         lvds-channel@0 {
+                #address-cells = <1>;
+                #size-cells = <0>;
                 reg = <0>;
                 fsl,data-mapping = "spwg";
                 fsl,data-width = <24>;
@@ -86,7 +91,9 @@ ldb: ldb@53fa8008 {
                         /* ... */
                 };
 
-                port {
+                port@0 {
+                        reg = <0>;
+
                         lvds0_in: endpoint {
                                 remote-endpoint = <&ipu_di0_lvds0>;
                         };
@@ -94,6 +101,8 @@ ldb: ldb@53fa8008 {
         };
 
         lvds-channel@1 {
+                #address-cells = <1>;
+                #size-cells = <0>;
                 reg = <1>;
                 fsl,data-mapping = "spwg";
                 fsl,data-width = <24>;
@@ -102,7 +111,9 @@ ldb: ldb@53fa8008 {
                         /* ... */
                 };
 
-                port {
+                port@1 {
+                        reg = <1>;
+
                         lvds1_in: endpoint {
                                 remote-endpoint = <&ipu_di1_lvds1>;
                         };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e03fbf3c6889..b40cdadb1f87 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -447,22 +447,19 @@
                 gpmc,device-width = <2>;
                 gpmc,sync-clk-ps = <0>;
                 gpmc,cs-on-ns = <0>;
-                gpmc,cs-rd-off-ns = <40>;
-                gpmc,cs-wr-off-ns = <40>;
+                gpmc,cs-rd-off-ns = <80>;
+                gpmc,cs-wr-off-ns = <80>;
                 gpmc,adv-on-ns = <0>;
-                gpmc,adv-rd-off-ns = <30>;
-                gpmc,adv-wr-off-ns = <30>;
-                gpmc,we-on-ns = <5>;
-                gpmc,we-off-ns = <25>;
-                gpmc,oe-on-ns = <2>;
-                gpmc,oe-off-ns = <20>;
-                gpmc,access-ns = <20>;
-                gpmc,wr-access-ns = <40>;
-                gpmc,rd-cycle-ns = <40>;
-                gpmc,wr-cycle-ns = <40>;
-                gpmc,wait-pin = <0>;
-                gpmc,wait-on-read;
-                gpmc,wait-on-write;
+                gpmc,adv-rd-off-ns = <60>;
+                gpmc,adv-wr-off-ns = <60>;
+                gpmc,we-on-ns = <10>;
+                gpmc,we-off-ns = <50>;
+                gpmc,oe-on-ns = <4>;
+                gpmc,oe-off-ns = <40>;
+                gpmc,access-ns = <40>;
+                gpmc,wr-access-ns = <80>;
+                gpmc,rd-cycle-ns = <80>;
+                gpmc,wr-cycle-ns = <80>;
                 gpmc,bus-turnaround-ns = <0>;
                 gpmc,cycle2cycle-delay-ns = <0>;
                 gpmc,clk-activation-ns = <0>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index c6c58c1c00e3..6b675a02066f 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -423,10 +423,14 @@
                                 status = "disabled";
 
                                 lvds-channel@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
                                         reg = <0>;
                                         status = "disabled";
 
-                                        port {
+                                        port@0 {
+                                                reg = <0>;
+
                                                 lvds0_in: endpoint {
                                                         remote-endpoint = <&ipu_di0_lvds0>;
                                                 };
@@ -434,10 +438,14 @@
                                 };
 
                                 lvds-channel@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
                                         reg = <1>;
                                         status = "disabled";
 
-                                        port {
+                                        port@1 {
+                                                reg = <1>;
+
                                                 lvds1_in: endpoint {
                                                         remote-endpoint = <&ipu_di1_lvds1>;
                                                 };
diff --git a/arch/arm/boot/dts/k2e-clocks.dtsi b/arch/arm/boot/dts/k2e-clocks.dtsi
index 598afe91c676..4773d6af66a0 100644
--- a/arch/arm/boot/dts/k2e-clocks.dtsi
+++ b/arch/arm/boot/dts/k2e-clocks.dtsi
@@ -40,7 +40,7 @@ clocks {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,psc-clock";
                 clocks = <&chipclk16>;
-                clock-output-names = "usb";
+                clock-output-names = "usb1";
                 reg = <0x02350004 0xb00>, <0x02350000 0x400>;
                 reg-names = "control", "domain";
                 domain-id = <0>;
@@ -60,8 +60,8 @@ clocks {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,psc-clock";
                 clocks = <&chipclk12>;
-                clock-output-names = "pcie";
-                reg = <0x0235006c 0xb00>, <0x02350000 0x400>;
+                clock-output-names = "pcie1";
+                reg = <0x0235006c 0xb00>, <0x02350048 0x400>;
                 reg-names = "control", "domain";
                 domain-id = <18>;
         };
diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index b8698ca68647..429471aa7a1f 100644
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -353,13 +353,12 @@
                                 };
 
                                 ldo8_reg: ldo8 {
-                                        /* VDD_3v0: Does not go anywhere */
+                                        /* VDD_3V_GP: act led/serial console */
                                         regulator-name = "ldo8";
                                         regulator-min-microvolt = <3000000>;
                                         regulator-max-microvolt = <3000000>;
+                                        regulator-always-on;
                                         regulator-boot-on;
-                                        /* Unused */
-                                        status = "disabled";
                                 };
 
                                 ldo9_reg: ldo9 {
diff --git a/arch/arm/mach-imx/clk-gate2.c b/arch/arm/mach-imx/clk-gate2.c
index 84acdfd1d715..5a75cdc81891 100644
--- a/arch/arm/mach-imx/clk-gate2.c
+++ b/arch/arm/mach-imx/clk-gate2.c
@@ -97,7 +97,7 @@ static int clk_gate2_is_enabled(struct clk_hw *hw)
         struct clk_gate2 *gate = to_clk_gate2(hw);
 
         if (gate->share_count)
-                return !!(*gate->share_count);
+                return !!__clk_get_enable_count(hw->clk);
         else
                 return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx);
 }
@@ -127,10 +127,6 @@ struct clk *clk_register_gate2(struct device *dev, const char *name,
         gate->bit_idx = bit_idx;
         gate->flags = clk_gate2_flags;
         gate->lock = lock;
-
-        /* Initialize share_count per hardware state */
-        if (share_count)
-                *share_count = clk_gate2_reg_is_enabled(reg, bit_idx) ? 1 : 0;
         gate->share_count = share_count;
 
         init.name = name;
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e7189dcc9309..08d4167cc7c5 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,9 +1,6 @@
 menu "TI OMAP/AM/DM/DRA Family"
         depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
 
-config ARCH_OMAP
-        bool
-
 config ARCH_OMAP2
         bool "TI OMAP2"
         depends on ARCH_MULTI_V6
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 8fd87a3055bf..9e91a4e7519a 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2065,7 +2065,7 @@ static void _reconfigure_io_chain(void)
 
         spin_lock_irqsave(&io_chain_lock, flags);
 
-        if (cpu_is_omap34xx() && omap3_has_io_chain_ctrl())
+        if (cpu_is_omap34xx())
                 omap3xxx_prm_reconfigure_io_chain();
         else if (cpu_is_omap44xx())
                 omap44xx_prm_reconfigure_io_chain();
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 2458be6fc67b..372de3edf4a5 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -45,7 +45,7 @@ static struct omap_prcm_irq_setup omap3_prcm_irq_setup = {
         .ocp_barrier            = &omap3xxx_prm_ocp_barrier,
         .save_and_clear_irqen   = &omap3xxx_prm_save_and_clear_irqen,
         .restore_irqen          = &omap3xxx_prm_restore_irqen,
-        .reconfigure_io_chain   = &omap3xxx_prm_reconfigure_io_chain,
+        .reconfigure_io_chain   = NULL,
 };
 
 /*
@@ -369,15 +369,30 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
 }
 
 /**
- * omap3xxx_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain
+ * omap3430_pre_es3_1_reconfigure_io_chain - restart wake-up daisy chain
+ *
+ * The ST_IO_CHAIN bit does not exist in 3430 before es3.1. The only
+ * thing we can do is toggle EN_IO bit for earlier omaps.
+ */
+void omap3430_pre_es3_1_reconfigure_io_chain(void)
+{
+        omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
+                                     PM_WKEN);
+        omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
+                                   PM_WKEN);
+        omap2_prm_read_mod_reg(WKUP_MOD, PM_WKEN);
+}
+
+/**
+ * omap3_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain
  *
  * Clear any previously-latched I/O wakeup events and ensure that the
  * I/O wakeup gates are aligned with the current mux settings.  Works
  * by asserting WUCLKIN, waiting for WUCLKOUT to be asserted, and then
  * deasserting WUCLKIN and clearing the ST_IO_CHAIN WKST bit.  No
- * return value.
+ * return value. These registers are only available in 3430 es3.1 and later.
  */
-void omap3xxx_prm_reconfigure_io_chain(void)
+void omap3_prm_reconfigure_io_chain(void)
 {
         int i = 0;
 
@@ -400,6 +415,15 @@ void omap3xxx_prm_reconfigure_io_chain(void)
 }
 
 /**
+ * omap3xxx_prm_reconfigure_io_chain - reconfigure I/O chain
+ */
+void omap3xxx_prm_reconfigure_io_chain(void)
+{
+        if (omap3_prcm_irq_setup.reconfigure_io_chain)
+                omap3_prcm_irq_setup.reconfigure_io_chain();
+}
+
+/**
  * omap3xxx_prm_enable_io_wakeup - enable wakeup events from I/O wakeup latches
  *
  * Activates the I/O wakeup event latches and allows events logged by
@@ -656,6 +680,13 @@ static int omap3xxx_prm_late_init(void)
         if (!(prm_features & PRM_HAS_IO_WAKEUP))
                 return 0;
 
+        if (omap3_has_io_chain_ctrl())
+                omap3_prcm_irq_setup.reconfigure_io_chain =
+                        omap3_prm_reconfigure_io_chain;
+        else
+                omap3_prcm_irq_setup.reconfigure_io_chain =
+                        omap3430_pre_es3_1_reconfigure_io_chain;
+
         omap3xxx_prm_enable_io_wakeup();
         ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);
         if (!ret)
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 630fa916bbc6..04b013fbc98f 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(get_clock_tick_rate);
 /*
  * For non device-tree builds, keep legacy timer init
  */
-void pxa_timer_init(void)
+void __init pxa_timer_init(void)
 {
         pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000),
                             get_clock_tick_rate());
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 02fc10d2d63b..d055db32ffcb 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+        bool
+
 if ARCH_OMAP
 
 menu "TI OMAP Common Features"
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index 551e01061434..95254585db86 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -188,31 +188,31 @@ static struct l3_flagmux_data omap_l3_flagmux_clk3 = {
 };
 
 static struct l3_masters_data omap_l3_masters[] = {
-        { 0x0 , "MPU"},
-        { 0x10, "CS_ADP"},
-        { 0x14, "xxx"},
-        { 0x20, "DSP"},
-        { 0x30, "IVAHD"},
-        { 0x40, "ISS"},
-        { 0x44, "DucatiM3"},
-        { 0x48, "FaceDetect"},
-        { 0x50, "SDMA_Rd"},
-        { 0x54, "SDMA_Wr"},
-        { 0x58, "xxx"},
-        { 0x5C, "xxx"},
-        { 0x60, "SGX"},
-        { 0x70, "DSS"},
-        { 0x80, "C2C"},
-        { 0x88, "xxx"},
-        { 0x8C, "xxx"},
-        { 0x90, "HSI"},
-        { 0xA0, "MMC1"},
-        { 0xA4, "MMC2"},
-        { 0xA8, "MMC6"},
-        { 0xB0, "UNIPRO1"},
-        { 0xC0, "USBHOSTHS"},
-        { 0xC4, "USBOTGHS"},
-        { 0xC8, "USBHOSTFS"}
+        { 0x00, "MPU"},
+        { 0x04, "CS_ADP"},
+        { 0x05, "xxx"},
+        { 0x08, "DSP"},
+        { 0x0C, "IVAHD"},
+        { 0x10, "ISS"},
+        { 0x11, "DucatiM3"},
+        { 0x12, "FaceDetect"},
+        { 0x14, "SDMA_Rd"},
+        { 0x15, "SDMA_Wr"},
+        { 0x16, "xxx"},
+        { 0x17, "xxx"},
+        { 0x18, "SGX"},
+        { 0x1C, "DSS"},
+        { 0x20, "C2C"},
+        { 0x22, "xxx"},
+        { 0x23, "xxx"},
+        { 0x24, "HSI"},
+        { 0x28, "MMC1"},
+        { 0x29, "MMC2"},
+        { 0x2A, "MMC6"},
+        { 0x2C, "UNIPRO1"},
+        { 0x30, "USBHOSTHS"},
+        { 0x31, "USBOTGHS"},
+        { 0x32, "USBHOSTFS"}
 };
 
 static struct l3_flagmux_data *omap_l3_flagmux[] = {
diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c
index 447458e696a9..7e1f120f2b32 100644
--- a/drivers/soc/qcom/qcom_gsbi.c
+++ b/drivers/soc/qcom/qcom_gsbi.c
@@ -22,44 +22,63 @@
 #define GSBI_CTRL_REG           0x0000
 #define GSBI_PROTOCOL_SHIFT     4
 
+struct gsbi_info {
+        struct clk *hclk;
+        u32 mode;
+        u32 crci;
+};
+
 static int gsbi_probe(struct platform_device *pdev)
 {
         struct device_node *node = pdev->dev.of_node;
         struct resource *res;
         void __iomem *base;
-        struct clk *hclk;
-        u32 mode, crci = 0;
+        struct gsbi_info *gsbi;
+
+        gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL);
+
+        if (!gsbi)
+                return -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         base = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(base))
                 return PTR_ERR(base);
 
-        if (of_property_read_u32(node, "qcom,mode", &mode)) {
+        if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) {
                 dev_err(&pdev->dev, "missing mode configuration\n");
                 return -EINVAL;
         }
 
         /* not required, so default to 0 if not present */
-        of_property_read_u32(node, "qcom,crci", &crci);
+        of_property_read_u32(node, "qcom,crci", &gsbi->crci);
 
-        dev_info(&pdev->dev, "GSBI port protocol: %d crci: %d\n", mode, crci);
+        dev_info(&pdev->dev, "GSBI port protocol: %d crci: %d\n",
+                 gsbi->mode, gsbi->crci);
+        gsbi->hclk = devm_clk_get(&pdev->dev, "iface");
+        if (IS_ERR(gsbi->hclk))
+                return PTR_ERR(gsbi->hclk);
 
-        hclk = devm_clk_get(&pdev->dev, "iface");
-        if (IS_ERR(hclk))
-                return PTR_ERR(hclk);
+        clk_prepare_enable(gsbi->hclk);
 
-        clk_prepare_enable(hclk);
-
-        writel_relaxed((mode << GSBI_PROTOCOL_SHIFT) | crci,
+        writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci,
                                 base + GSBI_CTRL_REG);
 
         /* make sure the gsbi control write is not reordered */
         wmb();
 
-        clk_disable_unprepare(hclk);
+        platform_set_drvdata(pdev, gsbi);
+
+        return of_platform_populate(node, NULL, NULL, &pdev->dev);
+}
+
+static int gsbi_remove(struct platform_device *pdev)
+{
+        struct gsbi_info *gsbi = platform_get_drvdata(pdev);
+
+        clk_disable_unprepare(gsbi->hclk);
 
-        return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+        return 0;
 }
 
 static const struct of_device_id gsbi_dt_match[] = {
@@ -76,6 +95,7 @@ static struct platform_driver gsbi_driver = {
                 .of_match_table = gsbi_dt_match,
         },
         .probe = gsbi_probe,
+        .remove = gsbi_remove,
 };
 
 module_platform_driver(gsbi_driver);