13 files changed, 226 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 402481775bbe..349610fba345 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -106,7 +106,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
         kirkwood-ts219-6282.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
-        qcom-msm8960-cdp.dtb
+        qcom-msm8960-cdp.dtb \
+        qcom-apq8074-dragonboard.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
         armada-370-mirabox.dtb \
         armada-370-netgear-rn102.dtb \
diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
new file mode 100644
index 000000000000..13ac3e222495
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -0,0 +1,6 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+        model = "Qualcomm APQ8074 Dragonboard";
+        compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
new file mode 100644
index 000000000000..6ac94967d2d3
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -0,0 +1,97 @@
+/dts-v1/;
+
+#include "skeleton.dtsi"
+
+/ {
+        model = "Qualcomm MSM8974";
+        compatible = "qcom,msm8974";
+        interrupt-parent = <&intc>;
+
+        soc: soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                compatible = "simple-bus";
+
+                intc: interrupt-controller@f9000000 {
+                        compatible = "qcom,msm-qgic2";
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        reg = <0xf9000000 0x1000>,
+                              <0xf9002000 0x1000>;
+                };
+
+                timer {
+                        compatible = "arm,armv7-timer";
+                        interrupts = <1 2 0xf08>,
+                                     <1 3 0xf08>,
+                                     <1 4 0xf08>,
+                                     <1 1 0xf08>;
+                        clock-frequency = <19200000>;
+                };
+
+                timer@f9020000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+                        compatible = "arm,armv7-timer-mem";
+                        reg = <0xf9020000 0x1000>;
+                        clock-frequency = <19200000>;
+
+                        frame@f9021000 {
+                                frame-number = <0>;
+                                interrupts = <0 8 0x4>,
+                                             <0 7 0x4>;
+                                reg = <0xf9021000 0x1000>,
+                                      <0xf9022000 0x1000>;
+                        };
+
+                        frame@f9023000 {
+                                frame-number = <1>;
+                                interrupts = <0 9 0x4>;
+                                reg = <0xf9023000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        frame@f9024000 {
+                                frame-number = <2>;
+                                interrupts = <0 10 0x4>;
+                                reg = <0xf9024000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        frame@f9025000 {
+                                frame-number = <3>;
+                                interrupts = <0 11 0x4>;
+                                reg = <0xf9025000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        frame@f9026000 {
+                                frame-number = <4>;
+                                interrupts = <0 12 0x4>;
+                                reg = <0xf9026000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        frame@f9027000 {
+                                frame-number = <5>;
+                                interrupts = <0 13 0x4>;
+                                reg = <0xf9027000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        frame@f9028000 {
+                                frame-number = <6>;
+                                interrupts = <0 14 0x4>;
+                                reg = <0xf9028000 0x1000>;
+                                status = "disabled";
+                        };
+                };
+
+                restart@fc4ab000 {
+                        compatible = "qcom,pshold";
+                        reg = <0xfc4ab000 0x4>;
+                };
+        };
+};
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 690b5f9c7462..c5698b7ce444 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MSM=y
 CONFIG_ARCH_MSM8X60=y
 CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -88,6 +89,8 @@ CONFIG_SSBI=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_MSM=y
 CONFIG_THERMAL=y
 CONFIG_REGULATOR=y
 CONFIG_MEDIA_SUPPORT=y
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c2865874..702553b96137 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -44,6 +44,7 @@ endchoice
 
 config ARCH_MSM8X60
         bool "MSM8X60"
+        select ARCH_MSM_DT
         select ARM_GIC
         select CPU_V7
         select GPIO_MSM_V2
@@ -52,15 +53,25 @@ config ARCH_MSM8X60
 
 config ARCH_MSM8960
         bool "MSM8960"
+        select ARCH_MSM_DT
         select ARM_GIC
         select CPU_V7
         select HAVE_SMP
         select GPIO_MSM_V2
         select MSM_SCM if SMP
 
+config ARCH_MSM8974
+        bool "MSM8974"
+        select ARCH_MSM_DT
+        select ARM_GIC
+        select CPU_V7
+        select HAVE_ARM_ARCH_TIMER
+        select HAVE_SMP
+        select MSM_SCM if SMP
+        select USE_OF
+
 config ARCH_MSM_DT
-        def_bool y
-        depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+        bool
         select SPARSE_IRQ
         select USE_OF
 
diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c
index 16e6183ac9f1..1f11d93e700e 100644
--- a/arch/arm/mach-msm/board-dt.c
+++ b/arch/arm/mach-msm/board-dt.c
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {
         NULL
 };
 
+static const char * const apq8074_dt_match[] __initconst = {
+        "qcom,apq8074-dragonboard",
+        NULL
+};
+
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
         .smp = smp_ops(msm_smp_ops),
         .dt_compat = msm_dt_match,
 MACHINE_END
+
+DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)")
+        .dt_compat = apq8074_dt_match,
+MACHINE_END
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index f9af5a46e8b6..46de789ad3ae 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -30,6 +30,7 @@
 #include <asm/memory.h>
 #include <asm/setup.h>
 
+#include <mach/clk.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
 
@@ -60,10 +61,44 @@ static int hsusb_phy_init_seq[] = {
         -1
 };
 
+static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
+{
+        int ret;
+
+        if (assert) {
+                ret = clk_reset(link_clk, CLK_RESET_ASSERT);
+                if (ret)
+                        pr_err("usb hs_clk assert failed\n");
+        } else {
+                ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
+                if (ret)
+                        pr_err("usb hs_clk deassert failed\n");
+        }
+        return ret;
+}
+
+static int hsusb_phy_clk_reset(struct clk *phy_clk)
+{
+        int ret;
+
+        ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
+        if (ret) {
+                pr_err("usb phy clk assert failed\n");
+                return ret;
+        }
+        usleep_range(10000, 12000);
+        ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
+        if (ret)
+                pr_err("usb phy clk deassert failed\n");
+        return ret;
+}
+
 static struct msm_otg_platform_data msm_otg_pdata = {
         .phy_init_seq           = hsusb_phy_init_seq,
         .mode                   = USB_PERIPHERAL,
         .otg_control            = OTG_PHY_CONTROL,
+        .link_clk_reset         = hsusb_link_clk_reset,
+        .phy_clk_reset          = hsusb_phy_clk_reset,
 };
 
 struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 5f933bc50783..9169ec324a43 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -31,6 +31,7 @@
 #include <mach/irqs.h>
 #include <mach/sirc.h>
 #include <mach/vreg.h>
+#include <mach/clk.h>
 #include <linux/platform_data/mmc-msm_sdcc.h>
 
 #include "devices.h"
@@ -81,10 +82,44 @@ static int hsusb_phy_init_seq[] = {
         -1
 };
 
+static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
+{
+        int ret;
+
+        if (assert) {
+                ret = clk_reset(link_clk, CLK_RESET_ASSERT);
+                if (ret)
+                        pr_err("usb hs_clk assert failed\n");
+        } else {
+                ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
+                if (ret)
+                        pr_err("usb hs_clk deassert failed\n");
+        }
+        return ret;
+}
+
+static int hsusb_phy_clk_reset(struct clk *phy_clk)
+{
+        int ret;
+
+        ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
+        if (ret) {
+                pr_err("usb phy clk assert failed\n");
+                return ret;
+        }
+        usleep_range(10000, 12000);
+        ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
+        if (ret)
+                pr_err("usb phy clk deassert failed\n");
+        return ret;
+}
+
 static struct msm_otg_platform_data msm_otg_pdata = {
         .phy_init_seq           = hsusb_phy_init_seq,
         .mode                   = USB_PERIPHERAL,
         .otg_control            = OTG_PHY_CONTROL,
+        .link_clk_reset         = hsusb_link_clk_reset,
+        .phy_clk_reset          = hsusb_phy_clk_reset,
 };
 
 static struct platform_device *devices[] __initdata = {
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index ccf6621bc664..015d544aa017 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  *
  */
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -68,12 +69,11 @@ static void __init trout_init(void)
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
 
-#ifdef CONFIG_MMC
-        rc = trout_init_mmc(system_rev);
-        if (rc)
-                printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);
-#endif
-
+        if (IS_ENABLED(CONFIG_MMC)) {
+                rc = trout_init_mmc(system_rev);
+                if (rc)
+                        pr_crit("MMC init failure (%d)\n", rc);
+        }
 }
 
 static struct map_desc trout_io_desc[] __initdata = {
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 7fc5099e44b2..4e8ca9d5570f 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -324,7 +324,7 @@ config MMC_ATMELMCI
 
 config MMC_MSM
         tristate "Qualcomm SDCC Controller Support"
-        depends on MMC && ARCH_MSM
+        depends on MMC && (ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50)
         help
           This provides support for the SD/MMC cell found in the
           MSM and QSD SOCs from Qualcomm. The controller also has
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a3817ab8602f..a53159cd62f9 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1035,7 +1035,7 @@ config SERIAL_MSM_CONSOLE
 
 config SERIAL_MSM_HS
         tristate "MSM UART High Speed: Serial Driver"
-        depends on ARCH_MSM
+        depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
         select SERIAL_CORE
         help
           If you have a machine based on MSM family of SoCs, you
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index e9d4cd960ecd..9a47d4403e86 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -40,8 +40,6 @@
 #include <linux/usb/msm_hsusb_hw.h>
 #include <linux/regulator/consumer.h>
 
-#include <mach/clk.h>
-
 #define MSM_USB_BASE    (motg->regs)
 #define DRIVER_NAME     "msm_otg"
 
@@ -308,33 +306,30 @@ static void ulpi_init(struct msm_otg *motg)
 
 static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
 {
-        int ret;
+        int ret = 0;
+
+        if (!motg->pdata->link_clk_reset)
+                return ret;
+
+        ret = motg->pdata->link_clk_reset(motg->clk, assert);
+        if (ret)
+                dev_err(motg->phy.dev, "usb link clk reset %s failed\n",
+                        assert ? "assert" : "deassert");
 
-        if (assert) {
-                ret = clk_reset(motg->clk, CLK_RESET_ASSERT);
-                if (ret)
-                        dev_err(motg->phy.dev, "usb hs_clk assert failed\n");
-        } else {
-                ret = clk_reset(motg->clk, CLK_RESET_DEASSERT);
-                if (ret)
-                        dev_err(motg->phy.dev, "usb hs_clk deassert failed\n");
-        }
         return ret;
 }
 
 static int msm_otg_phy_clk_reset(struct msm_otg *motg)
 {
-        int ret;
+        int ret = 0;
 
-        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_ASSERT);
-        if (ret) {
-                dev_err(motg->phy.dev, "usb phy clk assert failed\n");
+        if (!motg->pdata->phy_clk_reset)
                 return ret;
-        }
-        usleep_range(10000, 12000);
-        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_DEASSERT);
+
+        ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
         if (ret)
-                dev_err(motg->phy.dev, "usb phy clk deassert failed\n");
+                dev_err(motg->phy.dev, "usb phy clk reset failed\n");
+
         return ret;
 }
 
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index 22a396c13f3a..32754835a39b 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -20,6 +20,7 @@
 
 #include <linux/types.h>
 #include <linux/usb/otg.h>
+#include <linux/clk.h>
 
 /**
  * Supported USB modes
@@ -135,6 +136,8 @@ struct msm_otg_platform_data {
         enum msm_usb_phy_type phy_type;
         void (*setup_gpio)(enum usb_otg_state state);
         char *pclk_src_name;
+        int (*link_clk_reset)(struct clk *link_clk, bool assert);
+        int (*phy_clk_reset)(struct clk *phy_clk);
 };
 
 /**