diff options
-rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts | 15 | ||||
-rw-r--r-- | arch/arm64/configs/msmcortex-perf_defconfig | 1 | ||||
-rw-r--r-- | drivers/tty/serial/msm_serial_hs.c | 9 |
3 files changed, 10 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts index 30a45a5899b0..08407f574231 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts @@ -98,18 +98,3 @@ label = "ion_system_mem"; }; }; - -#include "vplatform-lfv-msm8996-usb.dtsi" - -&usb3 { - status = "okay"; - qcom,no-wakeup-src-in-hostmode; -}; - -&qusb_phy0 { - status = "okay"; -}; - -&ssphy { - status = "okay"; -}; diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig index 45841cdafc3e..031869a26722 100644 --- a/arch/arm64/configs/msmcortex-perf_defconfig +++ b/arch/arm64/configs/msmcortex-perf_defconfig @@ -16,6 +16,7 @@ CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 +CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index 4d02ff24cffe..064494366f01 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -66,6 +66,7 @@ #include <linux/msm-sps.h> #include <linux/platform_data/msm_serial_hs.h> #include <linux/msm-bus.h> +#include <soc/qcom/boot_stats.h> #include "msm_serial_hs_hwreg.h" #define UART_SPS_CONS_PERIPHERAL 0 @@ -3417,6 +3418,7 @@ static int msm_hs_probe(struct platform_device *pdev) struct msm_serial_hs_platform_data *pdata = pdev->dev.platform_data; unsigned long data; char name[30]; + char boot_marker[40]; if (pdev->dev.of_node) { dev_dbg(&pdev->dev, "device tree enabled\n"); @@ -3442,6 +3444,10 @@ static int msm_hs_probe(struct platform_device *pdev) pdev->dev.platform_data = pdata; } + snprintf(boot_marker, sizeof(boot_marker), + "M - DRIVER MSM HS-UART_%d Init", pdev->id); + place_marker(boot_marker); + if (pdev->id < 0 || pdev->id >= UARTDM_NR) { dev_err(&pdev->dev, "Invalid plaform device ID = %d\n", pdev->id); @@ -3675,6 +3681,9 @@ static int msm_hs_probe(struct platform_device *pdev) if (!ret) { msm_hs_clk_bus_unvote(msm_uport); msm_serial_hs_rt_init(uport); + snprintf(boot_marker, sizeof(boot_marker), + "M - DRIVER MSM HS-UART_%d Ready", pdev->id); + place_marker(boot_marker); return ret; } |