From patchwork Sun Jan 28 16:19:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 866874 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EBzL30cQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zTzHJ0LHYz9sCZ for ; Mon, 29 Jan 2018 03:53:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 968BDC21CB6; Sun, 28 Jan 2018 16:33:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 17DD8C22041; Sun, 28 Jan 2018 16:31:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CBA69C21EF0; Sun, 28 Jan 2018 16:25:53 +0000 (UTC) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by lists.denx.de (Postfix) with ESMTPS id 8F420C2203F for ; Sun, 28 Jan 2018 16:25:49 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id p5so2090401plo.12 for ; Sun, 28 Jan 2018 08:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WDqOoa0gqHctpcGgr6JlzQSNGAxjdL3VjcY7WAOD4AM=; b=EBzL30cQv9HH8o70HQqWQCzZ/Ef9FyWhl/5oHLUvgEx/XNPwB4t+zUFcW09eHtC4PS im9A6wBsFDEZ6yaHgkA8SrTIfxylUDOqTxt+O8GAM6Our82+IPas+7hQjTsJebxJ5uCl tTfeH319mBNpQpuL7iyiST+N0p+7QGKkUKHBgOqIqXuiAlimNCplsQfxtVjU9mRJ8Jzx QZMXgVOIExmLENkvasrmsUByTiYPg1xKyfZwQV7gQ99YCxlyTAH7J791LgEojmOWWHMP oKsA9NrHx9Y46ZZ8n0meg6HxTjIhcLqKLX8V3jbTzLoJyoP6DJDRlQ5/ogoV3aMj6T9i TPnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WDqOoa0gqHctpcGgr6JlzQSNGAxjdL3VjcY7WAOD4AM=; b=uFQYfiFPe/AjLTPEcipiKRgG/bYUHFlaE/5MTwdgbeI43N/Zq3T/W5+d3VabwEepmF RXp7RdtVQqVf/j1KInxsRRbB5nz/Z/zYYLYzjx2UNwf8U8gaZvMozo1ojtd7+HEvGPG/ 0sUe3mpObwOYV9hQn53KaDIJf9gU/eTm4uwn7uVqtWJ8UYl99J2j0zqdewh244l8m5It b5Qu0xgWkP0kw6Swww8ng9ZwPa2QhSA1Ga45+LeW0xYpksWRvV1xu89zEQvzavkKsgb8 EP1XIVk+FiPu9d66eVluEoYivPDurIH7SpPFfS6mk+8O8zxdeXlIbjkSJY/7mP5dkwsO X6eg== X-Gm-Message-State: AKwxytdJjKHW+hdlgAlBYWqZt2JUtuZfXw41a71cpK5dU/pJrRdyEq2+ 7qEm/CWFTFWJzI1QjQS5AtsBJULe X-Google-Smtp-Source: AH8x227HrkmM8Lzj5inS7Y3y4zptJZ5Bw59Z218eo5FRew0R30X2QorItM/tWZ53Q6E9rOcfOJ1iYw== X-Received: by 2002:a17:902:560f:: with SMTP id h15-v6mr18837631pli.75.1517156747907; Sun, 28 Jan 2018 08:25:47 -0800 (PST) Received: from localhost.localdomain ([115.97.187.51]) by smtp.gmail.com with ESMTPSA id y79sm26075776pfb.177.2018.01.28.08.25.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Jan 2018 08:25:47 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: u-boot@lists.denx.de Date: Sun, 28 Jan 2018 21:49:35 +0530 Message-Id: <1517156391-11353-15-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517156391-11353-1-git-send-email-jagan@amarulasolutions.com> References: <1517156391-11353-1-git-send-email-jagan@amarulasolutions.com> Cc: Maxime Ripard Subject: [U-Boot] [PATCH v3 14/30] sunxi: usb_phy: Fix phy_config to handle all SOC's X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" - enable_pmu_unk1 for V3S/H3/H5/A64 - enable usb 45 Ohm calibration for all non A83T SOC's - adjust PHY's magnitude for all non A83T SOC's Signed-off-by: Jagan Teki --- arch/arm/mach-sunxi/usb_phy.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-sunxi/usb_phy.c b/arch/arm/mach-sunxi/usb_phy.c index 32ee0d4..a81425d 100644 --- a/arch/arm/mach-sunxi/usb_phy.c +++ b/arch/arm/mach-sunxi/usb_phy.c @@ -153,41 +153,32 @@ __maybe_unused static void usb_phy_write(struct sunxi_usb_phy *phy, int addr, } } -#if defined(CONFIG_MACH_SUNXI_H3_H5) || defined(CONFIG_MACH_SUN50I) +#ifndef CONFIG_MACH_SUN8I_A83T static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy) { #if defined CONFIG_MACH_SUNXI_H3_H5 if (phy->id == 0) clrbits_le32(SUNXI_USBPHY_BASE + REG_PHY_UNK_H3, 0x01); #endif + +# if defined(CONFIG_MACH_SUNXI_H3_H5) || defined(CONFIG_MACH_SUN50I) || \ + defined(CONFIG_MACH_SUN8I_V3S) clrbits_le32(phy->base + REG_PMU_UNK_H3, 0x02); -} -#elif defined CONFIG_MACH_SUN8I_A83T -static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy) -{ -} -#else -static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy) -{ - /* The following comments are machine - * translated from Chinese, you have been warned! - */ +# endif - /* Regulation 45 ohms */ + /* Enable USB 45 Ohm resistor calibration */ if (phy->id == 0) usb_phy_write(phy, 0x0c, 0x01, 1); - /* adjust PHY's magnitude and rate */ + /* Adjust PHY's magnitude and rate */ usb_phy_write(phy, 0x20, 0x14, 5); - /* threshold adjustment disconnect */ -#if defined CONFIG_MACH_SUN5I || defined CONFIG_MACH_SUN7I + /* Disconnect threshold adjustment */ +# if defined CONFIG_MACH_SUN5I || defined CONFIG_MACH_SUN7I usb_phy_write(phy, 0x2a, 2, 2); -#else +# else usb_phy_write(phy, 0x2a, 3, 2); -#endif - - return; +# endif } #endif