Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4215afaf authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP4: CM: make cminst direct register access functions static 



These shall not be accessed outside the CM driver. This also removes the
need for the cminst44xx.h header.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ab6c9bbf

arch/arm/mach-omap2/cminst44xx.c

+10 −10
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "cm1_44xx.h"

#include "cm2_44xx.h"

#include "cm44xx.h"

#include "cminst44xx.h"

#include "cm-regbits-34xx.h"

#include "prcm44xx.h"

#include "prm44xx.h"
@@ -74,6 +73,8 @@ void omap_cm_base_init(void) 


/* Private functions */



static u32 omap4_cminst_read_inst_reg(u8 part, u16 inst, u16 idx);



/**

 * _clkctrl_idlest - read a CM_*_CLKCTRL register; mask & shift IDLEST bitfield

 * @part: PRCM partition ID that the CM_CLKCTRL register exists in
@@ -110,10 +111,8 @@ static bool _is_module_ready(u8 part, u16 inst, u16 clkctrl_offs) 
		v == CLKCTRL_IDLEST_INTERFACE_IDLE) ? true : false;

}



/* Public functions */



/* Read a register in a CM instance */

u32 omap4_cminst_read_inst_reg(u8 part, u16 inst, u16 idx)

static u32 omap4_cminst_read_inst_reg(u8 part, u16 inst, u16 idx)

{

	BUG_ON(part >= OMAP4_MAX_PRCM_PARTITIONS ||

	       part == OMAP4430_INVALID_PRCM_PARTITION ||
@@ -122,7 +121,7 @@ u32 omap4_cminst_read_inst_reg(u8 part, u16 inst, u16 idx) 
}



/* Write into a register in a CM instance */

void omap4_cminst_write_inst_reg(u32 val, u8 part, u16 inst, u16 idx)

static void omap4_cminst_write_inst_reg(u32 val, u8 part, u16 inst, u16 idx)

{

	BUG_ON(part >= OMAP4_MAX_PRCM_PARTITIONS ||

	       part == OMAP4430_INVALID_PRCM_PARTITION ||
@@ -131,7 +130,7 @@ void omap4_cminst_write_inst_reg(u32 val, u8 part, u16 inst, u16 idx) 
}



/* Read-modify-write a register in CM1. Caller must lock */

u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part, u16 inst,

static u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part, u16 inst,

					  s16 idx)

{

	u32 v;
@@ -144,17 +143,18 @@ u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part, u16 inst, 
	return v;

}



u32 omap4_cminst_set_inst_reg_bits(u32 bits, u8 part, u16 inst, s16 idx)

static u32 omap4_cminst_set_inst_reg_bits(u32 bits, u8 part, u16 inst, s16 idx)

{

	return omap4_cminst_rmw_inst_reg_bits(bits, bits, part, inst, idx);

}



u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, u16 inst, s16 idx)

static u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, u16 inst,

					    s16 idx)

{

	return omap4_cminst_rmw_inst_reg_bits(bits, 0x0, part, inst, idx);

}



u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx, u32 mask)

static u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx, u32 mask)

{

	u32 v;

arch/arm/mach-omap2/cminst44xx.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * OMAP4 Clock Management (CM) function prototypes

 *

 * Copyright (C) 2010 Nokia Corporation

 * Paul Walmsley

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __ARCH_ASM_MACH_OMAP2_CMINST44XX_H

#define __ARCH_ASM_MACH_OMAP2_CMINST44XX_H



/*

 * In an ideal world, we would not export these low-level functions,

 * but this will probably take some time to fix properly

 */

u32 omap4_cminst_read_inst_reg(u8 part, u16 inst, u16 idx);

void omap4_cminst_write_inst_reg(u32 val, u8 part, u16 inst, u16 idx);

u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part,

				   u16 inst, s16 idx);

u32 omap4_cminst_set_inst_reg_bits(u32 bits, u8 part, u16 inst,

				   s16 idx);

u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, u16 inst,

				     s16 idx);

extern u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx,

					   u32 mask);



#endif