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

Commit 19fa20d7 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Paul Walmsley
Browse files

ARM: OMAP4+: CM: Move function prototypes to common header for re-use 



OMAP5 reuses OMAP4 CM IP block which lets us re-use CM1/CM2 functions.
So move the function prototypes from cm1_44xx.h, cm2_44xx.h to
cm_prm44xx_54xx.h header. The suggestion came from Paul Walmsley
as part of the OMAP5 data file review.

This is preparatory  patch to add OMAP5 CM data file.

Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 42e872a4

arch/arm/mach-omap2/cm1_44xx.h

+2 −5
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#ifndef __ARCH_ARM_MACH_OMAP2_CM1_44XX_H

#define __ARCH_ARM_MACH_OMAP2_CM1_44XX_H



#include "cm_44xx_54xx.h"



/* CM1 base address */

#define OMAP4430_CM1_BASE		0x4a004000
@@ -217,9 +219,4 @@ 
#define OMAP4_CM1_ABE_WDT3_CLKCTRL_OFFSET		0x0088

#define OMAP4430_CM1_ABE_WDT3_CLKCTRL			OMAP44XX_CM1_REGADDR(OMAP4430_CM1_ABE_INST, 0x0088)



/* Function prototypes */

extern u32 omap4_cm1_read_inst_reg(s16 inst, u16 idx);

extern void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 idx);

extern u32 omap4_cm1_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);



#endif

arch/arm/mach-omap2/cm2_44xx.h

+2 −5
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#ifndef __ARCH_ARM_MACH_OMAP2_CM2_44XX_H

#define __ARCH_ARM_MACH_OMAP2_CM2_44XX_H



#include "cm_44xx_54xx.h"



/* CM2 base address */

#define OMAP4430_CM2_BASE		0x4a008000
@@ -449,9 +451,4 @@ 
#define OMAP4_CM_CEFUSE_CEFUSE_CLKCTRL_OFFSET		0x0020

#define OMAP4430_CM_CEFUSE_CEFUSE_CLKCTRL		OMAP44XX_CM2_REGADDR(OMAP4430_CM2_CEFUSE_INST, 0x0020)



/* Function prototypes */

extern u32 omap4_cm2_read_inst_reg(s16 inst, u16 idx);

extern void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 idx);

extern u32 omap4_cm2_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);



#endif

arch/arm/mach-omap2/cm_44xx_54xx.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * OMAP44xx and OMAP54xx CM1/CM2 function prototypes

 *

 * Copyright (C) 2009-2013 Texas Instruments, Inc.

 * Copyright (C) 2009-2010 Nokia Corporation

 *

 * Paul Walmsley (paul@pwsan.com)

 * Rajendra Nayak (rnayak@ti.com)

 * Benoit Cousson (b-cousson@ti.com)

 *

 * This file is automatically generated from the OMAP hardware databases.

 * We respectfully ask that any modifications to this file be coordinated

 * with the public linux-omap@vger.kernel.org mailing list and the

 * authors above to ensure that the autogeneration scripts are kept

 * up-to-date with the file contents.

 *

 * 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_ARM_MACH_OMAP2_CM_44XX_54XX_H

#define __ARCH_ARM_MACH_OMAP2_CM_44XX_55XX_H



/* CM1 Function prototypes */

extern u32 omap4_cm1_read_inst_reg(s16 inst, u16 idx);

extern void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 idx);

extern u32 omap4_cm1_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);



/* CM2 Function prototypes */

extern u32 omap4_cm2_read_inst_reg(s16 inst, u16 idx);

extern void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 idx);

extern u32 omap4_cm2_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);



#endif