From patchwork Tue Sep 29 13:06:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1373404 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=g1AOY2Xs; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C105M1VcGz9sVk for ; Tue, 29 Sep 2020 23:06:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DE9282287; Tue, 29 Sep 2020 15:06:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g1AOY2Xs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E05CC82369; Tue, 29 Sep 2020 15:06:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8607181F22 for ; Tue, 29 Sep 2020 15:06:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x444.google.com with SMTP id m6so5354390wrn.0 for ; Tue, 29 Sep 2020 06:06:24 -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:mime-version :content-transfer-encoding; bh=oPaE7c5jl+q5j/fXcqU6e4m/8uTW6NjwXUTozt2bMwE=; b=g1AOY2Xsxo03rJycDo7GvHowa2qyGvCi/wQNO6sX6G4bgs5WIJCGzHZ78JZ9Z1I0YP J64cC8iVTFJiiPyuqlsi+VZ7fafKOT0qvlt2vNB8mbDxLagsmlHkcFUG4TL2TLYz3rCn CsE8ZBwr3d3qMc9Qqo+LRUfF2QfJaxszmCCmnUFSD3zsYnSkTAlQtkKaJaAjwVKZv3C0 seK1PmVTX6qlZWaR3rF1BJC4m7XWk4KVJdL8DUxD4RIvTl0j2hjjuQwFI2HSsdoCUkSt NYeDDk5xyW75Pnkxvn53ZBQ82zUHHxsWBjR8/0QKdEW69+aOngM5UKMPRQqsrfo6pBiF 4qIg== 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:mime-version :content-transfer-encoding; bh=oPaE7c5jl+q5j/fXcqU6e4m/8uTW6NjwXUTozt2bMwE=; b=R+4o3ll7YGsDtwk6jlxZufqlw/oUH5A5QKhvjMyFONYyiP1HUBMbkn1NO8NKz9aR6j xCf8JCd5IFkNa1kmvEiPplQDDnyh3XY8xdSdm4ojeU3HEhWO+YJRGNHa2+lOo/kRhUaf /jeOms+QM/rEBPiN1U6EAzLuubkVsp88B9PoqIhDTvtDjyVFq5WPJM8Kl+VB64+KMc6g xxBp3D7mTUfC/FhnaIQuBxITzxf5aAbXXc6CeDpHciSnZnYEYayMxFu7cvcFTSHvL5T5 2Rmb1vZkaTpt0CJjMKs+BnfSVNqX5m+rkNyuygVfD3eqjpeAGBJ9jMI1rXhzKGQbx3hd Pvcg== X-Gm-Message-State: AOAM532ovA7c1c2wdiF/PFOIRG929mjBD3UZXRvO75dbPPA3uycTguAK KDtd9DqvyQE887sgD7s8B4w= X-Google-Smtp-Source: ABdhPJz3H3IMv+OIHyY8axHypjZuDwSIjkNqrHQ6Zi8/9ilpkGlxfP6kWclFZ+cuDAYfbgV6TCWadw== X-Received: by 2002:adf:de11:: with SMTP id b17mr4237120wrm.82.1601384784027; Tue, 29 Sep 2020 06:06:24 -0700 (PDT) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id y68sm5674439wmd.39.2020.09.29.06.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 06:06:23 -0700 (PDT) From: Peter Robinson To: Manivannan Sadhasivam , Kever Yang , Simon Glass , Philipp Tomsich , u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCH] rockchip: Rock960: fix up USB support Date: Tue, 29 Sep 2020 14:06:18 +0100 Message-Id: <20200929130618.1265409-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Fix up USB config options so keyboards and other USB devices work. Signed-off-by: Peter Robinson --- configs/rock960-rk3399_defconfig | 9 ++++++--- include/configs/rock960_rk3399.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 1d997847c2..a5a50785c5 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -3,12 +3,12 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ROCKCHIP_RK3399=y -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 CONFIG_TARGET_ROCK960_RK3399=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" CONFIG_DEBUG_UART=y +CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y @@ -41,6 +41,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_DM_ETH=y CONFIG_NVME=y CONFIG_PCI=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y @@ -54,10 +56,11 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC3=y -CONFIG_ROCKCHIP_USB2_PHY=y +CONFIG_DM_KEYBOARD=y CONFIG_USB_KEYBOARD=y -CONFIG_USB_GADGET=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h index c6f9122154..2edad71028 100644 --- a/include/configs/rock960_rk3399.h +++ b/include/configs/rock960_rk3399.h @@ -15,4 +15,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #endif