Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 707b3d97 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "serial: msm_serial_hs: add boot marker"

parents ef6cdc46 e55e517e

drivers/tty/serial/msm_serial_hs.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

	}