Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1FD7EC6FA82 for ; Thu, 22 Sep 2022 06:47:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AEAB884CB8; Thu, 22 Sep 2022 08:47:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=startmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=startmail.com header.i=@startmail.com header.b="RmqxE9pv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B3E784CBD; Thu, 22 Sep 2022 08:47:21 +0200 (CEST) Received: from mx-out2.startmail.com (mx-out2.startmail.com [145.131.90.155]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F86A84CB2 for ; Thu, 22 Sep 2022 08:47:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=startmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hanetzer@startmail.com From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2020-07; t=1663829237; bh=H+nf1+4JmDAT+zKgeFUVZDdfw2lL7B7tEgGbGUkHUrA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:From:Subject:To:Date:Sender: Content-Type:Content-Transfer-Encoding:Content-Disposition: Mime-Version:Reply-To:In-Reply-To:References:Message-Id:Autocrypt; b=RmqxE9pv4jqGARIlkBEDB681xX1n1FXwzd3j7mqgZbKssLwFJdsjLK0+iSEMifKr9 polLPuWLnefuRO4k3ufzXJsUwH2ApIOhsIz38CvRBjQ3J+zMQKFRoVwEdDWu/h9WKF Trzyad3Lw964aMzLEPl7KFDjGfaVwKWIZIgwf7AKAJZdl0anJUyeRwt9QbT9xV0njy xrSj7xnLlVXjKaCRc1pmABwbvXEMQLh1dFY9LZNEGJM7SO0B+ygQAUtzauwHvcE0P5 GLIIK/JKTnRRNq518kLRwF9X3ZOmFu4RCv4sjcp9Fh2s3P0R2LGpDPwI2RVoFlwLsg R3pqDrlXImvwQ== To: U-Boot Mailing List Cc: Simon Glass , Kever Yang , Philipp Tomsich , "Marty E. Plummer" , Johan Jonker , Philipp Tomsich , linux-rockchip@lists.infradead.org Subject: [RFC PATCH 2/4] rockchip: rk3288: enable uart2->usb redirection Date: Thu, 22 Sep 2022 01:47:01 -0500 Message-Id: <20220922064704.1740759-3-hanetzer@startmail.com> In-Reply-To: <20220922064704.1740759-1-hanetzer@startmail.com> References: <20220922064704.1740759-1-hanetzer@startmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean Code snagged from rk3188's u-boot implementation and the linux kernel's implementation of rockchip.usb_uart=1 Tested on rk3288-veyron-speedy patman/checkpatch.pl doesn't like my indentation here and I can't quite figure out what it actually wants. Complaint is: arch/arm/mach-rockchip/rk3288/rk3288.c:95: check: Alignment should match open parenthesis arch/arm/mach-rockchip/rk3288/rk3288.c:99: check: Alignment should match open parenthesis arch/arm/mach-rockchip/rk3288/rk3288.c:101: check: Alignment should match open parenthesis arch/arm/mach-rockchip/rk3288/rk3288.c:108: check: Alignment should match open parenthesis Signed-off-by: Marty E. Plummer --- .../include/asm/arch-rockchip/grf_rk3288.h | 41 +++++++++++++++++++ arch/arm/mach-rockchip/rk3288/rk3288.c | 20 +++++++++ 2 files changed, 61 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h index 894d3a40b0..d94cd9a27a 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h @@ -1152,4 +1152,45 @@ enum GPIO_BIAS { #define GPIO_PULL_MASK 0x3 #define GPIO_PULL_SHIFT(x) ((x) * 2) +/* GRF_UOC_CON0 */ +enum { + SIDDQ_SHIFT = 13, + SIDDQ_MASK = 1 << SIDDQ_SHIFT, + + UOC_DISABLE_SHIFT = 4, + UOC_DISABLE_MASK = 1 << UOC_DISABLE_SHIFT, + + COMMON_ON_N_SHIFT = 0, + COMMON_ON_N_MASK = 1 << COMMON_ON_N_SHIFT, +}; + +/* GRF_UOC_CON2 */ +enum { + SOFT_CON_SEL_SHIFT = 2, + SOFT_CON_SEL_MASK = 1 << SOFT_CON_SEL_SHIFT, +}; + +/* GRF_UOC0_CON3 */ +enum { + BYPASSSEL_SHIFT = 7, + BYPASSSEL_MASK = 1 << BYPASSSEL_SHIFT, + + BYPASSDMEN_SHIFT = 6, + BYPASSDMEN_MASK = 1 << BYPASSDMEN_SHIFT, + + TERMSEL_FULLSPEED_SHIFT = 5, + TERMSEL_FULLSPEED_MASK = 1 << TERMSEL_FULLSPEED_SHIFT, + + XCVRSELECT_SHIFT = 3, + XCVRSELECT_FSTRANSC = 1, + XCVRSELECT_MASK = 3 << XCVRSELECT_SHIFT, + + OPMODE_SHIFT = 1, + OPMODE_NODRIVING = 1, + OPMODE_MASK = 3 << OPMODE_SHIFT, + + SUSPENDN_SHIFT = 0, + SUSPENDN_MASK = 1 << SUSPENDN_SHIFT, +}; + #endif diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 3ad2887575..d9bb1add87 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -89,6 +89,26 @@ int arch_cpu_init(void) rk_clrreg(&grf->soc_con0, 1 << 12); rk3288_qos_init(); + + if (IS_ENABLED(CONFIG_ROCKCHIP_USB_UART)) { + rk_clrsetreg(&grf->uoc0_con[0], + SIDDQ_MASK | UOC_DISABLE_MASK | COMMON_ON_N_MASK, + 1 << SIDDQ_SHIFT | 1 << UOC_DISABLE_SHIFT | + 1 << COMMON_ON_N_SHIFT); + rk_clrsetreg(&grf->uoc0_con[2], + SOFT_CON_SEL_MASK, 1 << SOFT_CON_SEL_SHIFT); + rk_clrsetreg(&grf->uoc0_con[3], + OPMODE_MASK | XCVRSELECT_MASK | + TERMSEL_FULLSPEED_MASK | SUSPENDN_MASK, + OPMODE_NODRIVING << OPMODE_SHIFT | + XCVRSELECT_FSTRANSC << XCVRSELECT_SHIFT | + 1 << TERMSEL_FULLSPEED_SHIFT | + 1 << SUSPENDN_SHIFT); + rk_clrsetreg(&grf->uoc0_con[3], + BYPASSSEL_MASK | BYPASSDMEN_MASK, + 1 << BYPASSSEL_SHIFT | 1 << BYPASSDMEN_SHIFT); + } + #endif return 0; -- 2.37.3