From patchwork Thu Jun 28 14:10:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 936160 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ul1qesxq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41GhXP64Vqz9ryk for ; Fri, 29 Jun 2018 00:11:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DF8BAC21DA6; Thu, 28 Jun 2018 14:11:12 +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_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 C4BF7C21C4A; Thu, 28 Jun 2018 14:11:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 70D25C21C4A; Thu, 28 Jun 2018 14:11:08 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id C0F00C21C29 for ; Thu, 28 Jun 2018 14:11:07 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id c41-v6so2829261plj.10 for ; Thu, 28 Jun 2018 07:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=X9fQoWeZLeuIBwRbptr7ffTIAO7VHaJL87twg5RH46A=; b=ul1qesxqd1r+rCG0CD65ZUH/IFe87S8a+3LlM1xb+8qObeCUJXXEjcSYFxll0y46tr kI19yydBGd8hDjchAcwl7tM/641+MqwWhB/q1RrkUjjnz1FR48dv52C4HIy/+m99StB7 YDs9UwxFlEWS6KB3k6+SDoSObfM5Bn9ooM81Nfr0Z9StPKlcC3Hvht0EaH2lv8fofwaK am2u4k/7BeltRj3Bo97Ww4L8vEdb5OCen8rfiLWkjct89dNLfRAgNZQfd1gOgcN95buy wULdQSTIluTUvOHXgka0/6JWdsLK/nW2YjLyWyLs4xsl2DGG9FUC9WmMdHatOiSUT+Db 12Iw== 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; bh=X9fQoWeZLeuIBwRbptr7ffTIAO7VHaJL87twg5RH46A=; b=SUzkwwjcsWENYSrgnYDNhMpok2YD2llS6OdlHewXcE5xnC5OtdUqNwXzGuEpScuzyK +ytIGCwi91MHBqmCTaFTiChSkneuqyp6don9wX4L5hhwsYFTTqRb7srwAd1Ygp9zit3Z 7Ps1o/DM/gHBPPyp0UMh7MHYqp4TD46GyYxyrWMZtSq/ugFwYeDPtuk4OlNZD8tB9A/y UKsxbgfFU2pjUDwNHdyR21s6oMwu3KnkzYkjwDjVyIltzsWhCo48LlO0KDWfvk+BCo1K s9XEwoOegEjWen79biEF5lxedNlfCbF8wUb4elhwtg3oSQOwUnj5EVMNBJvNbb7GOXZv oOvA== X-Gm-Message-State: APt69E3tq9LRfTXsnofQf8QBLWFy2kKko5DCss98OQlGDo+kBEevgu6a WL5LgSgPqoC3Xuqek3bpc36Wx4lc X-Google-Smtp-Source: ADUXVKKKW2SX2wB3f7p6eSZ+DsMCBr/hQQLkB2sEG7/VW3zjWd9Hzhnjxf7QzqtRw6DcL6O0pqQ9YQ== X-Received: by 2002:a17:902:7248:: with SMTP id c8-v6mr10763571pll.128.1530195065850; Thu, 28 Jun 2018 07:11:05 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.240]) by smtp.gmail.com with ESMTPSA id x2-v6sm12559687pgq.33.2018.06.28.07.11.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 07:11:05 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: u-boot@lists.denx.de Date: Thu, 28 Jun 2018 19:40:45 +0530 Message-Id: <20180628141046.3707-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Cc: Maxime Ripard , Marek Vasut Subject: [U-Boot] [for v2018.07 1/2] sunxi: Fix USB PHY index for H3 (missed chage) 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" This patch update the USB PHY index for Allwinner H3. Same change[1] initially sent, by 'Chen-Yu Tai' but missed to apply due to recursive version changes on the same series. [1] https://lists.denx.de/pipermail/u-boot/2018-January/318817.html Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 8afeaf872e..3a59016955 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -275,9 +275,13 @@ struct sunxi_ccm_reg { * These are EHCI1 - EHCI3 in the datasheet (EHCI0 is for the OTG) we call * them 0 - 2 like they were called on older SoCs. */ +#define AHB_GATE_OFFSET_USB_OHCI3 31 +#define AHB_GATE_OFFSET_USB_OHCI2 30 +#define AHB_GATE_OFFSET_USB_OHCI1 29 #define AHB_GATE_OFFSET_USB_OHCI0 28 -#define AHB_GATE_OFFSET_USB_EHCI2 27 -#define AHB_GATE_OFFSET_USB_EHCI1 26 +#define AHB_GATE_OFFSET_USB_EHCI3 27 +#define AHB_GATE_OFFSET_USB_EHCI2 26 +#define AHB_GATE_OFFSET_USB_EHCI1 25 #define AHB_GATE_OFFSET_USB_EHCI0 24 #elif defined(CONFIG_MACH_SUN50I) #define AHB_GATE_OFFSET_USB_OHCI0 28 @@ -290,7 +294,7 @@ struct sunxi_ccm_reg { #define AHB_GATE_OFFSET_USB_EHCI1 27 #define AHB_GATE_OFFSET_USB_EHCI0 26 #endif -#ifdef CONFIG_MACH_SUN50I +#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUNXI_H3_H5) #define AHB_GATE_OFFSET_USB0 23 #elif !defined(CONFIG_MACH_SUN8I_R40) #define AHB_GATE_OFFSET_USB0 24