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

Commit ba6190e6 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: qusb: Remove the PHY_HOST_MODE check from set_suspend"

parents a2139fde 1dc3c3b8

drivers/usb/phy/phy-msm-qusb-v2.c

+3 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -580,8 +580,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 


	if (suspend) {

		/* Bus suspend case */

		if (qphy->cable_connected ||

			(qphy->phy.flags & PHY_HOST_MODE)) {

		if (qphy->cable_connected) {

			/* Disable all interrupts */

			writel_relaxed(0x00,

				qphy->base + qphy->phy_reg[INTR_CTRL]);
@@ -632,8 +631,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 
		qphy->suspended = true;

	} else {

		/* Bus resume case */

		if (qphy->cable_connected ||

			(qphy->phy.flags & PHY_HOST_MODE)) {

		if (qphy->cable_connected) {

			qusb_phy_enable_clocks(qphy, true);

			/* Clear all interrupts on resume */

			writel_relaxed(0x00,

drivers/usb/phy/phy-msm-qusb.c

+3 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -634,8 +634,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 


	if (suspend) {

		/* Bus suspend case */

		if (qphy->cable_connected ||

			(qphy->phy.flags & PHY_HOST_MODE)) {

		if (qphy->cable_connected) {

			/* Clear all interrupts */

			writel_relaxed(0x00,

				qphy->base + QUSB2PHY_PORT_INTR_CTRL);
@@ -715,8 +714,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 
		qphy->suspended = true;

	} else {

		/* Bus suspend case */

		if (qphy->cable_connected ||

			(qphy->phy.flags & PHY_HOST_MODE)) {

		if (qphy->cable_connected) {

			qusb_phy_enable_clocks(qphy, true);

			/* Clear all interrupts on resume */

			writel_relaxed(0x00,