From mboxrd@z Thu Jan 1 00:00:00 1970 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 6ED2BC433EF for ; Sat, 29 Jan 2022 02:11:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F29BA835B3; Sat, 29 Jan 2022 03:11:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 8E6B983282; Sat, 29 Jan 2022 03:11:54 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id AD5C483673 for ; Sat, 29 Jan 2022 03:11:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andre.przywara@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B3DC0D6E; Fri, 28 Jan 2022 18:11:50 -0800 (PST) Received: from slackpad.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0BEAF3F7D7; Fri, 28 Jan 2022 18:11:47 -0800 (PST) Date: Sat, 29 Jan 2022 02:11:24 +0000 From: Andre Przywara To: Jesse Taube Cc: u-boot@lists.denx.de, jagan@amarulasolutions.com, hdegoede@redhat.com, sjg@chromium.org, icenowy@aosc.io, marek.behun@nic.cz, festevam@denx.de, narmstrong@baylibre.com, tharvey@gateworks.com, christianshewitt@gmail.com, pbrobinson@gmail.com, jernej.skrabec@gmail.com, hs@denx.de, samuel@sholland.org, arnaud.ferraris@gmail.com, giulio.benetti@benettiengineering.com, thirtythreeforty@gmail.com Subject: Re: [PATCH v2 06/12] ARM: sunxi: Add clock and uart to sunxi headers Message-ID: <20220129021102.3d879543@slackpad.fritz.box> In-Reply-To: <20220126135329.2997430-7-Mr.Bossman075@gmail.com> References: <20220126135329.2997430-1-Mr.Bossman075@gmail.com> <20220126135329.2997430-7-Mr.Bossman075@gmail.com> Organization: Arm Ltd. X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.31; x86_64-slackware-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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.5 at phobos.denx.de X-Virus-Status: Clean On Wed, 26 Jan 2022 08:53:23 -0500 Jesse Taube wrote: > From: Icenowy Zheng > > This patch aims to add header files for the suniv. > The header files included add support for uart, and clocks. > > Signed-off-by: Icenowy Zheng > Signed-off-by: Jesse Taube Thanks for the changes, looks good now. Reviewed-by: Andre Przywara Cheers, Andre > --- > V1->V2: > * Change commit description and topic > * Change PLL6_CFG_DEFAULT > * Combine APB1_GATE ifdefs > * Combine SUNXI_UART0_BASE ifdefs > * Fix negative logic > * Remove unused macros > --- > arch/arm/include/asm/arch-sunxi/clock.h | 2 +- > arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 13 +++++++++++++ > arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 ++++++ > arch/arm/include/asm/arch-sunxi/gpio.h | 1 + > 4 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/arch-sunxi/clock.h b/arch/arm/include/asm/arch-sunxi/clock.h > index cbbe5c7a1e..2cfd540742 100644 > --- a/arch/arm/include/asm/arch-sunxi/clock.h > +++ b/arch/arm/include/asm/arch-sunxi/clock.h > @@ -19,7 +19,7 @@ > #elif defined(CONFIG_SUN50I_GEN_H6) > #include > #elif defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I) || \ > - defined(CONFIG_MACH_SUN50I) > + defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUNIV) > #include > #elif defined(CONFIG_MACH_SUN9I) > #include > diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > index ee387127f3..7fcf340db6 100644 > --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > @@ -226,7 +226,12 @@ struct sunxi_ccm_reg { > #define CCM_PLL5_CTRL_SIGMA_DELTA_EN (0x1 << 24) > #define CCM_PLL5_CTRL_EN (0x1 << 31) > > +#ifdef CONFIG_MACH_SUNIV > +/* suniv pll6 doesn't have postdiv 2, so k is set to 0 */ > +#define PLL6_CFG_DEFAULT 0x90041801 > +#else > #define PLL6_CFG_DEFAULT 0x90041811 /* 600 MHz */ > +#endif > > #define CCM_PLL6_CTRL_N_SHIFT 8 > #define CCM_PLL6_CTRL_N_MASK (0x1f << CCM_PLL6_CTRL_N_SHIFT) > @@ -488,6 +493,14 @@ struct sunxi_ccm_reg { > #define AHB_RESET_OFFSET_EPHY 2 > #define AHB_RESET_OFFSET_LVDS 0 > > +/* apb1 reset */ > +#ifdef CONFIG_MACH_SUNIV > +#define APB1_GATE_UART_SHIFT (20) > +#define APB1_GATE_TWI_SHIFT (16) > +#define APB1_RESET_UART_SHIFT (20) > +#define APB1_RESET_TWI_SHIFT (16) > +#endif > + > /* apb2 reset */ > #define APB2_RESET_UART_SHIFT (16) > #define APB2_RESET_UART_MASK (0xff << APB2_RESET_UART_SHIFT) > diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h > index d4c795d89c..b7b4564af3 100644 > --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h > +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h > @@ -129,9 +129,15 @@ defined(CONFIG_MACH_SUN50I) > #define SUNXI_CPUCFG_BASE 0x01c25c00 > #endif > > +#ifndef CONFIG_MACH_SUNIV > #define SUNXI_UART0_BASE 0x01c28000 > #define SUNXI_UART1_BASE 0x01c28400 > #define SUNXI_UART2_BASE 0x01c28800 > +#else > +#define SUNXI_UART0_BASE 0x01c25000 > +#define SUNXI_UART1_BASE 0x01c25400 > +#define SUNXI_UART2_BASE 0x01c25800 > +#endif > #define SUNXI_UART3_BASE 0x01c28c00 > #define SUNXI_UART4_BASE 0x01c29000 > #define SUNXI_UART5_BASE 0x01c29400 > diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h > index f3ab1aea0e..ced69f7dd4 100644 > --- a/arch/arm/include/asm/arch-sunxi/gpio.h > +++ b/arch/arm/include/asm/arch-sunxi/gpio.h > @@ -165,6 +165,7 @@ enum sunxi_gpio_number { > #define SUNXI_GPD_LVDS0 3 > #define SUNXI_GPD_PWM 2 > > +#define SUNIV_GPE_UART0 5 > #define SUN8I_GPE_TWI2 3 > #define SUN50I_GPE_TWI2 3 >