From patchwork Mon Dec 14 21:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 343579 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp3395248ejs; Mon, 14 Dec 2020 13:04:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDK8z+UTPKCmD6El4m4QcvcjPNB/9TeotgCQYMDvSOpWOslKxeDNDWYBHsfwfPxAP96lH1 X-Received: by 2002:a17:906:ca08:: with SMTP id jt8mr10702359ejb.368.1607979839962; Mon, 14 Dec 2020 13:03:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607979839; cv=none; d=google.com; s=arc-20160816; b=0MSiuX/uk+yBnmra02/8Dx/qQksaSiNvmUd34FxDhBqhABoWOsDfS4Q/wetPPTkAtJ NOh+xQyk8pYw//TbX4xIixtAORdjXNO6GMVKjJ5M7G6RJSXsZmwkA+XzlGQiN2VvYj8e ef4RujisGdfqKWU69SqxcxtaRiy4jOa/bYrEQfz5N0XQ//rWluQZhD1Knfk06sqWqMOz kAXdPuwXCPtb7IA9g9HPCMqul+BNAesU3H/m6lQB4I66ttVMg9J7nECDeUeAMGSfRuCT hPJ/ZAeymzOMxxblJ2COVUZNCbe7uoij1Is/9eGOCFgJeYNvWJdBwaerXeHy/jKVk/He +qZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=tIDLXS2Y2qoovEZRY9UrrgreoOk6ijceVqlxaDQ99OQ=; b=QGsWBx3j9wg57PU2rvoXkYIXJev+MPR+cC2c4ntsu1oO8XBJprd71W3ZWO9lxBUrZF cWgMWWS+eqmXOWe6L5y3u7SXHr+lcznc+5xMDxCYAcbWCMsH/K0iJcMcQ1qkVztAZp1F sNjXe/zyUgep/vb9PEkLHeM08Wk5rHZKlkOJQwiXnVJTvX8zy/XcRCYo/pf9WhwebquI v6isI4Wb6cbn/dbnxxoPV+IjWuj7Y5TGCR8whqeMRhYBM+lzESnTXI4EfMYuPq7sGgnC ZmBu4qJDkhrAGnypnaKNZVbHijyMRfx5+mob1kLuizyrVgWQPY90GEuuz8yqqb5jvLHq UCEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i3si10493166ejk.273.2020.12.14.13.03.59; Mon, 14 Dec 2020 13:03:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503644AbgLNVCR (ORCPT + 3 others); Mon, 14 Dec 2020 16:02:17 -0500 Received: from fgw21-4.mail.saunalahti.fi ([62.142.5.108]:53762 "EHLO fgw21-4.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503495AbgLNVCG (ORCPT ); Mon, 14 Dec 2020 16:02:06 -0500 Received: from localhost.localdomain (85-76-8-36-nat.elisa-mobile.fi [85.76.8.36]) by fgw21.mail.saunalahti.fi (Halon) with ESMTP id 84c4f6bd-3e4f-11eb-9eb8-005056bdd08f; Mon, 14 Dec 2020 23:01:22 +0200 (EET) From: Aaro Koskinen To: Tony Lindgren , Linus Walleij , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] ARM: OMAP1: OSK: fix ohci-omap breakage Date: Mon, 14 Dec 2020 23:01:21 +0200 Message-Id: <20201214210121.22042-1-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.17.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Linus Walleij 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 --- This is the patch that should have been merged: https://marc.info/?l=linux-usb&m=160682513710441&w=2 arch/arm/mach-omap1/board-osk.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.0 Reviewed-by: Linus Walleij diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index a720259099ed..0a4c9b0b13b0 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);