From patchwork Mon Feb 8 15:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 378564 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4777095jah; Mon, 8 Feb 2021 07:26:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyf2w/RjKBSbT877+awQ8inxU3fX/Yrj3JSo/c1MG2En/bMMpMWfNzfSqLaB9LC2fnlZHS6 X-Received: by 2002:a17:906:f0d0:: with SMTP id dk16mr17404568ejb.533.1612798003248; Mon, 08 Feb 2021 07:26:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612798003; cv=none; d=google.com; s=arc-20160816; b=JsmkuC1yrjBbUbbgop8nqKtIW6iGZMfzAUYk43adazAxx50JlcVOSvGuNmRCpMXL2N kO4XVbTXRNwiAY4HiA8fDwDx+zPEQAc6cwSm+O4pLyDWZOQ4ckN+OEx8SWfeQyFGMHA7 9pPUQlXYW9SR9WEBVLHtjGrIO1fZPzvcCN0F7MawRNvhZ1vE8Z/3Z7eKH0LDPLvOQ4kW puNffT5ZvCmA6XBfN728P+vQq+NRWLCCz1yxd6HXvmTvXwKvPqtWRFfE613zu++zk3V9 NWNC3RH2cCzvTFL6XCajnd43REgLQ6mhdcwc0G/7/1MvnnlUFeh5eld88iXQ+YaPpnU6 vh6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7EvYqbd0BHy1yY2UCH+zA+iO8AuBAOsqXDJlin68ne8=; b=U4iYrgYeQau2zOs74lyIDKVUfwqqV1WXkWXYRnZTiUHDvjO9NMquvpBR08bDLFWONU 4FH8t9CmQOg2LmNs2+qJGSplYMip+qm7AI9cdb7/juQmYza30iBcezM/9hooiWkqJYG7 4ZyHDctnhKb/t7R1e7TO6tOyNWflJpdwMMzzxS3B/l2RW4HBp3nI8diu3tIGubgL+f95 /i/jigCBw2gThfVnRwkeGKzoviRfuu/4D+K1TrGVpe3P+imJ25dRLCcHEHRoPNZSoslt FP0RFzsLjaQLw/0HZltDyMqLIPH8KaLPbGSZn9e7Rh9BTGLPImpk2q1twRy1j4TLo0Jy 7FOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XSkUdWEk; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bo4si11908975edb.420.2021.02.08.07.26.42; Mon, 08 Feb 2021 07:26:43 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XSkUdWEk; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbhBHPZT (ORCPT + 13 others); Mon, 8 Feb 2021 10:25:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:33712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233627AbhBHPTq (ORCPT ); Mon, 8 Feb 2021 10:19:46 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1921B64EE0; Mon, 8 Feb 2021 15:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612797161; bh=OiuszCH8HSrbx2yYbeYbMTnhUR8hI/fj/dtKUvly0bc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSkUdWEki6bkUALuJHqBLloRDr+sOOt5TwrlVGwIRXle2wIAHWa04SX8hXr8ljv0r nRMul9WsqdF+J4Q+zkF4Nl1De0O+lb7lLFRLTKFGM+i5ETRZVmDe6PvWHgY9S4EQiS 4uHTzpE81la+HilV2HrAxSMcXGHIDTcp9MPQRq3I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Aaro Koskinen , Tony Lindgren , Sasha Levin Subject: [PATCH 5.10 014/120] ARM: OMAP1: OSK: fix ohci-omap breakage Date: Mon, 8 Feb 2021 16:00:01 +0100 Message-Id: <20210208145818.960942875@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208145818.395353822@linuxfoundation.org> References: <20210208145818.395353822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 6efac0173cd15460b48c91e1b0a000379f341f00 ] Commit 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion") tried to fix all issues related to ohci-omap descriptor conversion, but a wrong patch was applied, and one needed change to the OSK board file is still missing. Fix that. Fixes: 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion") Signed-off-by: Linus Walleij [aaro.koskinen@iki.fi: rebased and updated the changelog] Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap1/board-osk.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.27.0 diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index a720259099edf..0a4c9b0b13b0c 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -203,6 +203,8 @@ static int osk_tps_setup(struct i2c_client *client, void *context) */ gpio_request(OSK_TPS_GPIO_USB_PWR_EN, "n_vbus_en"); gpio_direction_output(OSK_TPS_GPIO_USB_PWR_EN, 1); + /* Free the GPIO again as the driver will request it */ + gpio_free(OSK_TPS_GPIO_USB_PWR_EN); /* Set GPIO 2 high so LED D3 is off by default */ tps65010_set_gpio_out_value(GPIO2, HIGH);