All of lore.kernel.org
 help / color / mirror / Atom feed
From: Suman Anna <s-anna@ti.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 05/18] arm: mach-k3: Move mmr_unlock to a common location
Date: Mon, 27 Jul 2020 12:12:23 -0500	[thread overview]
Message-ID: <50a4fd20-9b5d-1402-cdf4-f6dba1c3fc52@ti.com> (raw)
In-Reply-To: <20200727094543.28484-6-lokeshvutla@ti.com>

On 7/27/20 4:45 AM, Lokesh Vutla wrote:
> mmr_unlock api is common for all k3 devices. Move it to a common
> location.
> 
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Reviewed-by: Suman Anna <s-anna@ti.com>

> ---
>   arch/arm/mach-k3/am6_init.c   | 10 ----------
>   arch/arm/mach-k3/common.c     | 10 ++++++++++
>   arch/arm/mach-k3/common.h     |  1 +
>   arch/arm/mach-k3/j721e_init.c | 10 ----------
>   4 files changed, 11 insertions(+), 20 deletions(-)
> 
> diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
> index 516a02e8a8..abdec76d73 100644
> --- a/arch/arm/mach-k3/am6_init.c
> +++ b/arch/arm/mach-k3/am6_init.c
> @@ -41,16 +41,6 @@ struct fwl_data main_cbass_fwls[] = {
>   #endif
>   #endif
>   
> -static void mmr_unlock(u32 base, u32 partition)
> -{
> -	/* Translate the base address */
> -	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
> -
> -	/* Unlock the requested partition if locked using two-step sequence */
> -	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
> -	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
> -}
> -
>   static void ctrl_mmr_unlock(void)
>   {
>   	/* Unlock all WKUP_CTRL_MMR0 module registers */
> diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
> index 63bf060616..eb72451d06 100644
> --- a/arch/arm/mach-k3/common.c
> +++ b/arch/arm/mach-k3/common.c
> @@ -61,6 +61,16 @@ void k3_sysfw_print_ver(void)
>   	       ti_sci->version.firmware_revision, fw_desc);
>   }
>   
> +void mmr_unlock(phys_addr_t base, u32 partition)
> +{
> +	/* Translate the base address */
> +	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
> +
> +	/* Unlock the requested partition if locked using two-step sequence */
> +	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
> +	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
> +}
> +
>   DECLARE_GLOBAL_DATA_PTR;
>   
>   #ifdef CONFIG_K3_EARLY_CONS
> diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
> index 94cdcb56ad..e8cc3daac1 100644
> --- a/arch/arm/mach-k3/common.h
> +++ b/arch/arm/mach-k3/common.h
> @@ -28,3 +28,4 @@ void start_non_linux_remote_cores(void);
>   int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
>   void k3_sysfw_print_ver(void);
>   void spl_enable_dcache(void);
> +void mmr_unlock(phys_addr_t base, u32 partition);
> diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
> index 5ec62a92f8..2010cab1d1 100644
> --- a/arch/arm/mach-k3/j721e_init.c
> +++ b/arch/arm/mach-k3/j721e_init.c
> @@ -64,16 +64,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = {
>   #endif
>   #endif
>   
> -static void mmr_unlock(u32 base, u32 partition)
> -{
> -	/* Translate the base address */
> -	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
> -
> -	/* Unlock the requested partition if locked using two-step sequence */
> -	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
> -	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
> -}
> -
>   static void ctrl_mmr_unlock(void)
>   {
>   	/* Unlock all WKUP_CTRL_MMR0 module registers */
> 

  reply	other threads:[~2020-07-27 17:12 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27  9:45 [PATCH v2 00/18] arm: mach-k3: Initial support for Texas Instrument's J7200 Platform Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 01/18] board: ti: board_detect: Add stub functions for EEPROM detection apis Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 02/18] board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 03/18] board: ti: j721e: Update fdt fixup logic for interconnect nodes Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 04/18] arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 05/18] arm: mach-k3: Move mmr_unlock to a common location Lokesh Vutla
2020-07-27 17:12   ` Suman Anna [this message]
2020-07-27  9:45 ` [PATCH v2 06/18] arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image Lokesh Vutla
2020-07-27 17:17   ` Suman Anna
2020-07-29  2:35     ` Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 07/18] arm: mach-k3: j721e: Add detection for j721e Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 08/18] arm: mach-k3: j721e: Fix unlocking control module registers Lokesh Vutla
2020-07-27 17:19   ` Suman Anna
2020-07-27  9:45 ` [PATCH v2 09/18] arm: mach-k3: j7200: Add support for SOC detection Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 10/18] arm: mach-k3: j7200: Add support for storing extended boot info from ROM Lokesh Vutla
2020-07-27 17:34   ` Suman Anna
2020-07-27  9:45 ` [PATCH v2 11/18] arm: mach-k3: j7200: Detect if ROM has already loaded sysfw Lokesh Vutla
2020-07-27 17:36   ` Suman Anna
2020-07-27  9:45 ` [PATCH v2 12/18] board: ti: j7200: Introduce support for j7200 build targets Lokesh Vutla
2020-08-05  8:50   ` Vignesh Raghavendra
2020-08-05 14:00     ` Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 13/18] board: ti: j7200: Add board detection support for j7200 Lokesh Vutla
2020-07-27 17:38   ` Suman Anna
2020-07-27  9:45 ` [PATCH v2 14/18] ram: k3-j721e: Relax version checks for memory controller Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 15/18] arm: dts: k3-j7200: Add dts support Lokesh Vutla
2020-08-04 14:11   ` Vignesh Raghavendra
2020-07-27  9:45 ` [PATCH v2 16/18] arm: dts: k3-j7200: Add R5 specific " Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 17/18] configs: j7200_evm_r5: Add initial support Lokesh Vutla
2020-07-27  9:45 ` [PATCH v2 18/18] configs: j7200_evm_a72: Add Initial support Lokesh Vutla
2020-08-04 15:25   ` Vignesh Raghavendra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50a4fd20-9b5d-1402-cdf4-f6dba1c3fc52@ti.com \
    --to=s-anna@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.