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

Commit 40243ad3 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Paul Walmsley
Browse files

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



OMAP5 reuses OMAP4 MPU PRCM IP block which lets us re-use functions.
So move the function prototypes from prcm_mpu44xx.h to prcm_mpu_44xx_54xx.h
header. The suggestion came from Paul Walmsley as part of the
OMAP5 data file review.

This is preparatory  patch to add OMAP5 MPU PRCM 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 dfab439f

arch/arm/mach-omap2/prcm_mpu44xx.h

+1 −13
Original line number Diff line number Diff line
@@ -25,12 +25,9 @@ 
#ifndef __ARCH_ARM_MACH_OMAP2_PRCM_MPU44XX_H

#define __ARCH_ARM_MACH_OMAP2_PRCM_MPU44XX_H



#include "prcm_mpu_44xx_54xx.h"

#include "common.h"



# ifndef __ASSEMBLER__

extern void __iomem *prcm_mpu_base;

# endif



#define OMAP4430_PRCM_MPU_BASE			0x48243000



#define OMAP44XX_PRCM_MPU_REGADDR(inst, reg)				\
@@ -98,13 +95,4 @@ extern void __iomem *prcm_mpu_base; 
#define OMAP4_CM_CPU1_CLKSTCTRL_OFFSET		0x0018

#define OMAP4430_CM_CPU1_CLKSTCTRL		OMAP44XX_PRCM_MPU_REGADDR(OMAP4430_PRCM_MPU_CPU1_INST, 0x0018)



/* Function prototypes */

# ifndef __ASSEMBLER__

extern u32 omap4_prcm_mpu_read_inst_reg(s16 inst, u16 idx);

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

extern u32 omap4_prcm_mpu_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst,

					    s16 idx);

extern void __init omap2_set_globals_prcm_mpu(void __iomem *prcm_mpu);

# endif



#endif

arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h

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

 * OMAP44xx and OMAP54xx PRCM MPU function prototypes

 *

 * Copyright (C) 2010, 2013 Texas Instruments, Inc.

 * Copyright (C) 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_PRCM_MPU_44XX_54XX_H

#define __ARCH_ARM_MACH_OMAP2_PRCM_MPU_44XX_54XX_H



#ifndef __ASSEMBLER__

extern void __iomem *prcm_mpu_base;



extern u32 omap4_prcm_mpu_read_inst_reg(s16 inst, u16 idx);

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

extern u32 omap4_prcm_mpu_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst,

					    s16 idx);

extern void __init omap2_set_globals_prcm_mpu(void __iomem *prcm_mpu);

#endif



#endif