Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4332165ybb; Tue, 7 Apr 2020 05:31:58 -0700 (PDT) X-Google-Smtp-Source: APiQypKVi7oKq+PYr4GDbL0n4GSkimuuqH5QaTSBz1KCUJ3jUTxbXOp+XRl0rsUYQlq3jmuTgAPX X-Received: by 2002:a05:6830:18eb:: with SMTP id d11mr1325088otf.243.1586262718128; Tue, 07 Apr 2020 05:31:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586262718; cv=none; d=google.com; s=arc-20160816; b=J7rVTXHLgTItT0kYtAtD8nFWUzoPTa+ODvBMVaif87XDDjFGP9Fe0PWFPMkQrmG1Vx sgKt7iwA80uBoXOhDw+ODgmM/x/xc2XQz8BFNBlz4P24jvrkIWXPMTwD/G3+iWasjDdt F3CAdU1icqhbmsdSoBQH1jD3yPKY+xwdwILbLfUByWUiUkBo96Lmi+M8ns29gNmXVEHw SxGEcXeVdRGcPpy0N6q7AE5l8JzHHOkO8IxmaPFNExYAhgYoQa/BPx8KfO6qikNa7qeL HSYEKYNatvSeoKG2mmpfL0aYzf9UYeVUYMPa2+yPV2zHYu4orvjZFrjEGquRjMMGFO8G CG3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:dkim-signature; bh=A4Hh87zuPw+vWZ9RyVhd+zvjhj05Y8vTP3RkpQgg/Ik=; b=GiEmxThIdalSqj8youXSOCfuM/p9RQHvmN5PHuwYJTn8IYPnRzyywkoSRLn/k4LCPb fKc5qSJsQoORphVVFV7jnT30YYrSP5ro79qhgSVnKOvKDO79uzvmPdrbKGkYG36W0kP5 MS6t/Rw5KDmbyqKAZyWp8+qxI9TV1GVHG4YXCbmhbCVFbDlto1yILfRRzBa6mSjLo1DM 6HD80ExKbMXU5OTyDhOArtCee2WWuWKmrQUKFXZbTlKK4138R84BiDPXx8eaUikcFyxH qLDpFO6619KvC2E0HUXWJrPUpgIW8yQ/KnGEaYJZAiYrlSaZClvkIRLQAvMt1pTluM/Y 44zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=vE2bus5D; 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=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x14si1064486ooc.26.2020.04.07.05.31.45; Tue, 07 Apr 2020 05:31:58 -0700 (PDT) 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=fail header.i=@microchip.com header.s=mchp header.b=vE2bus5D; 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=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728782AbgDGM3u (ORCPT + 99 others); Tue, 7 Apr 2020 08:29:50 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:16110 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728771AbgDGM3s (ORCPT ); Tue, 7 Apr 2020 08:29:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1586262587; x=1617798587; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=EFXIwExObMHjh1goNYVJztAIzdQCu9r/PBJ7CO6BaHE=; b=vE2bus5D7NurWeY6PVm7d+3cDY4Lzw//TcguL1WgpZLHPqIpSJrHL9dQ 6QOGkBckz2Yv7l4+pkcXqQnkQQOB71TvxVVvLJYZLfLCxhgECLXuHtCoj XioCFNsIFNxTWJRJlSK78nUfIuKszP2uPk2C9Qi4UAnLw/lzJI4TKwGrh zqk/8lcQN6aRAAW3Xr2YYQSPk2FtN8EA/qMWwImiH050Zu1ctkUQvVHJZ lLqZB36Rbgo7BvdLZqMow6prYp2be8bWRfuB4BbCrCr0euZbAgCP/GXCe BfLJhcEwCZtvaWcwynwo731IL4NSfM2sCv7MXucqgn5FFB9gi5Y205m2Q g==; IronPort-SDR: Spjj5RbgFc3kEczZLkPqDcNWpJRu6HNsZOf6PzTOlB/qz6FI8ALxNbzNo+4gjKS6nB9xV8Mff7 5QGWgjn6MoviJcWAkxTh58YcyMibB2m2dBYsNARPpI10XrgbTpcLN+/V2hEtuDvyqw1xv8jZCN +lc2qHEGkN/bMGEJMZhok1EPQvpXGiQf4/WSOh2inrrR+jdLa+4g1iiPIYFjsDPlCZ54arag9G 4+gg0WZGOSIRfmVzhz2h0JydeCmpkev045bDlfxF043APpLkrdPujpgoxa+psTj0nzo8pQq2XN xwk= X-IronPort-AV: E=Sophos;i="5.72,354,1580799600"; d="scan'208";a="72565062" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Apr 2020 05:29:47 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 7 Apr 2020 05:29:46 -0700 Received: from cristi-P53.amer.actel.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Tue, 7 Apr 2020 05:29:44 -0700 From: To: , , , , , CC: , , Cristian Birsan Subject: [PATCH 6/7] usb: gadget: udc: atmel: rename errata into caps Date: Tue, 7 Apr 2020 15:28:51 +0300 Message-ID: <20200407122852.19422-7-cristian.birsan@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200407122852.19422-1-cristian.birsan@microchip.com> References: <20200407122852.19422-1-cristian.birsan@microchip.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cristian Birsan Rename errata structure into capabilities (caps). It will be used to add capabilities for new SoCs. Get the pointer to PMC only for the SoCs that need it to perform toggle_bias or pulse_bias. Signed-off-by: Cristian Birsan --- drivers/usb/gadget/udc/atmel_usba_udc.c | 21 ++++++++++----------- drivers/usb/gadget/udc/atmel_usba_udc.h | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 1e2194fe06cb..dfe30913c76b 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -389,8 +389,8 @@ static int vbus_is_present(struct usba_udc *udc) static void toggle_bias(struct usba_udc *udc, int is_on) { - if (udc->errata && udc->errata->toggle_bias) - udc->errata->toggle_bias(udc, is_on); + if (udc->caps && udc->caps->toggle_bias) + udc->caps->toggle_bias(udc, is_on); } static void generate_bias_pulse(struct usba_udc *udc) @@ -398,8 +398,8 @@ static void generate_bias_pulse(struct usba_udc *udc) if (!udc->bias_pulse_needed) return; - if (udc->errata && udc->errata->pulse_bias) - udc->errata->pulse_bias(udc); + if (udc->caps && udc->caps->pulse_bias) + udc->caps->pulse_bias(udc); udc->bias_pulse_needed = false; } @@ -2032,17 +2032,17 @@ static void at91sam9g45_pulse_bias(struct usba_udc *udc) AT91_PMC_BIASEN); } -static const struct usba_udc_errata at91sam9rl_errata = { +static const struct usba_udc_caps at91sam9rl_caps = { .toggle_bias = at91sam9rl_toggle_bias, }; -static const struct usba_udc_errata at91sam9g45_errata = { +static const struct usba_udc_caps at91sam9g45_caps = { .pulse_bias = at91sam9g45_pulse_bias, }; static const struct of_device_id atmel_udc_dt_ids[] = { - { .compatible = "atmel,at91sam9rl-udc", .data = &at91sam9rl_errata }, - { .compatible = "atmel,at91sam9g45-udc", .data = &at91sam9g45_errata }, + { .compatible = "atmel,at91sam9rl-udc", .data = &at91sam9rl_caps }, + { .compatible = "atmel,at91sam9g45-udc", .data = &at91sam9g45_caps }, { .compatible = "atmel,sama5d3-udc" }, { /* sentinel */ } }; @@ -2053,7 +2053,6 @@ static const struct of_device_id atmel_pmc_dt_ids[] = { { .compatible = "atmel,at91sam9g45-pmc" }, { .compatible = "atmel,at91sam9rl-pmc" }, { .compatible = "atmel,at91sam9x5-pmc" }, - { .compatible = "microchip,sam9x60-pmc" }, { /* sentinel */ } }; @@ -2071,8 +2070,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, if (!match) return ERR_PTR(-EINVAL); - udc->errata = match->data; - if (udc->errata) { + udc->caps = match->data; + if (udc->caps && (udc->caps->pulse_bias || udc->caps->toggle_bias)) { pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids, NULL); if (!pp) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h index 8de79356d31d..1a0f77bf8d4f 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.h +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h @@ -302,7 +302,7 @@ struct usba_request { unsigned int mapped:1; }; -struct usba_udc_errata { +struct usba_udc_caps { void (*toggle_bias)(struct usba_udc *udc, int is_on); void (*pulse_bias)(struct usba_udc *udc); }; @@ -320,7 +320,7 @@ struct usba_udc { struct usb_gadget gadget; struct usb_gadget_driver *driver; struct platform_device *pdev; - const struct usba_udc_errata *errata; + const struct usba_udc_caps *caps; int irq; struct gpio_desc *vbus_pin; int num_ep; -- 2.17.1