Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp4596590pja; Thu, 21 Nov 2019 22:32:43 -0800 (PST) X-Google-Smtp-Source: APXvYqzPxm3cA71vJC8H7ZjVnsdLA1mQmL1pel1OpgwakC/OYN7+1hGPYuyrOyDgs9QdAV19TA10 X-Received: by 2002:a17:906:3019:: with SMTP id 25mr19972927ejz.280.1574404363407; Thu, 21 Nov 2019 22:32:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574404363; cv=none; d=google.com; s=arc-20160816; b=wpzOXGHp31C7gHHUewAM5KkORwZkM7rsZE3ipk2dJKgdobVnbRfk5Zfxf13/AIkmLy yGauFMYAIzFMGdWzOb8R+v2qdiRLJGR+vUn7S10mIe6wiAs3lq4TELOifYUuVVgUD44u ZTc+jr/7PkrzcSISJ8s/+yPJjwd9l43pyUKXUrf4JLfx4MewCWCfICdV5KxKXlvzRTJ+ F0PI6VBpNuqqSohaKTsiMmGMBr20xxqHq2u+mOEBeKcy2DNefV5sIYhT8OvV+G03qDCI fTkjGn8PJJ/itrCXkeXeBxYeE/aifwnPK1OynaHNvPZ+DxOlRd2zvfB6gBzAYxL+0TE8 Xshg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2a8F0XIAmHH+NwVr3gMPSXiQS56DAGNZqlza/0UayI0=; b=IE4AGDNybrcDeAX7KkwlpmMuWJsNNp44SGxXKlfT6Gj9L+93kWw7KiF60iexK7kg/+ wE3XJAfeYuPEsQoi4LzrTL1/aLdy7q3uDynWVoFcKV9Gya5xMqY7Cio+sZFJWlAQuWX+ RRYdxm4iOrujRPz5l0bLouPDnnQfwOekvk9Fr6nns7t3OSW1uJZ6Ex2pvUQDYbgbPY2W 8ykJMg/MYS2on2ZHVl2x4XT9d4A5U68ecJwk+WgWT6qhw8NWznf7z4j5VAubOelnukih sStW4jkopuTbQJ90IArWqQFB4I0GtnanvXL7Fq3e68+bYWRniTB7SlAt7VGfCc4qEPgi C+Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y5YPfQbr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a11si3447237eju.356.2019.11.21.22.32.19; Thu, 21 Nov 2019 22:32:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y5YPfQbr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727217AbfKVFtn (ORCPT + 99 others); Fri, 22 Nov 2019 00:49:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:53876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727171AbfKVFtk (ORCPT ); Fri, 22 Nov 2019 00:49:40 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 748E920718; Fri, 22 Nov 2019 05:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401780; bh=SX2sF24SxxN0DTRfvAZ+p3qN/yPB1GS57zgjqYDAA+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5YPfQbrgF4CuNiuoCfOAH7TH3cehkxgDJwSShK1FC5R2vmO7UbJv4yDWbpj9joHb 8LLmvu4oLgBucIPULJs8ZctV86eSgJCFp3g/0IXRdseRdq1hAgFaPeOsN4U+1DHWEg rf4R8xyeZpaFiTM+JMX3+L7u80grqRZmPWg177t0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aaro Koskinen , Tony Lindgren , Sasha Levin , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 029/219] ARM: OMAP1: fix USB configuration for device-only setups Date: Fri, 22 Nov 2019 00:46:01 -0500 Message-Id: <20191122054911.1750-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aaro Koskinen [ Upstream commit c7b7b5cbd0c859b1546a5a3455d457708bdadf4c ] Currently we do USB configuration only if the host mode (CONFIG_USB) is enabled. But it should be done also in the case of device-only setups, so change the condition to CONFIG_USB_SUPPORT. This allows to use omap_udc on Palm Tungsten E. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/include/mach/usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index e8ccf51c6f292..ec0235899de20 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -25,7 +25,7 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) led-y := leds.o -usb-fs-$(CONFIG_USB) := usb.o +usb-fs-$(CONFIG_USB_SUPPORT) := usb.o obj-y += $(usb-fs-m) $(usb-fs-y) # Specific board support diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h index 77867778d4ec7..5429d86c7190d 100644 --- a/arch/arm/mach-omap1/include/mach/usb.h +++ b/arch/arm/mach-omap1/include/mach/usb.h @@ -11,7 +11,7 @@ #include -#if IS_ENABLED(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_SUPPORT) void omap1_usb_init(struct omap_usb_config *pdata); #else static inline void omap1_usb_init(struct omap_usb_config *pdata) -- 2.20.1