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

Commit 9af2ebbd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'hwmod_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus

parents 493c32a0 74ff3a68

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o



omap-2-3-common				= irq.o sdrc.o

omap-2-3-common				= irq.o sdrc.o prm2xxx_3xxx.o

hwmod-common				= omap_hwmod.o \

					  omap_hwmod_common_data.o

prcm-common				= prcm.o powerdomain.o
@@ -15,7 +15,7 @@ clock-common = clock.o clock_common_data.o \ 


obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

arch/arm/mach-omap2/omap_hwmod.c

+472 −90

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/prcm.c

+27 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "cm.h"

#include "prm.h"

#include "prm-regbits-24xx.h"

#include "prm-regbits-44xx.h"



static void __iomem *prm_base;

static void __iomem *cm_base;
@@ -161,8 +162,8 @@ void omap_prcm_arch_reset(char mode, const char *cmd) 
		prm_set_mod_reg_bits(OMAP_RST_DPLL3_MASK, prcm_offs,

						 OMAP2_RM_RSTCTRL);

	if (cpu_is_omap44xx())

		prm_set_mod_reg_bits(OMAP_RST_DPLL3_MASK, prcm_offs,

						 OMAP4_RM_RSTCTRL);

		prm_set_mod_reg_bits(OMAP4430_RST_GLOBAL_WARM_SW_MASK,

				     prcm_offs, OMAP4_RM_RSTCTRL);

}



static inline u32 __omap_prcm_read(void __iomem *base, s16 module, u16 reg)
@@ -215,6 +216,30 @@ u32 prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask) 
	return v;

}



/* Read a PRM register, AND it, and shift the result down to bit 0 */

u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask)

{

	u32 v;



	v = __raw_readl(reg);

	v &= mask;

	v >>= __ffs(mask);



	return v;

}



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

u32 omap4_prm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *reg)

{

	u32 v;



	v = __raw_readl(reg);

	v &= ~mask;

	v |= bits;

	__raw_writel(v, reg);



	return v;

}

/* Read a register in a CM module */

u32 cm_read_mod_reg(s16 module, u16 idx)

{

arch/arm/mach-omap2/prm.h

+17 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * OMAP2/3 Power/Reset Management (PRM) register definitions

 *

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

 * Copyright (C) 2009 Nokia Corporation

 * Copyright (C) 2010 Nokia Corporation

 *

 * Written by Paul Walmsley

 *
@@ -246,6 +246,15 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) 
	return prm_rmw_mod_reg_bits(bits, 0x0, module, idx);

}



/* These omap2_ PRM functions apply to both OMAP2 and 3 */

int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);

int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);

int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift);



int omap4_prm_is_hardreset_asserted(void __iomem *rstctrl_reg, u8 shift);

int omap4_prm_assert_hardreset(void __iomem *rstctrl_reg, u8 shift);

int omap4_prm_deassert_hardreset(void __iomem *rstctrl_reg, u8 shift);



#endif



/*
@@ -398,4 +407,11 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) 
#define OMAP_POWERSTATE_MASK				(0x3 << 0)





/*

 * MAX_MODULE_HARDRESET_WAIT: Maximum microseconds to wait for an OMAP

 * submodule to exit hardreset

 */

#define MAX_MODULE_HARDRESET_WAIT		10000





#endif

arch/arm/mach-omap2/prm2xxx_3xxx.c

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

 * OMAP2/3 PRM module functions

 *

 * Copyright (C) 2010 Texas Instruments, Inc.

 * Copyright (C) 2010 Nokia Corporation

 * Benoît Cousson

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

 */



#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/err.h>



#include <plat/common.h>

#include <plat/cpu.h>

#include <plat/prcm.h>



#include "prm.h"

#include "prm-regbits-24xx.h"

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



/**

 * omap2_prm_is_hardreset_asserted - read the HW reset line state of

 * submodules contained in the hwmod module

 * @prm_mod: PRM submodule base (e.g. CORE_MOD)

 * @shift: register bit shift corresponding to the reset line to check

 *

 * Returns 1 if the (sub)module hardreset line is currently asserted,

 * 0 if the (sub)module hardreset line is not currently asserted, or

 * -EINVAL if called while running on a non-OMAP2/3 chip.

 */

int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)

{

	if (!(cpu_is_omap24xx() || cpu_is_omap34xx()))

		return -EINVAL;



	return prm_read_mod_bits_shift(prm_mod, OMAP2_RM_RSTCTRL,

				       (1 << shift));

}



/**

 * omap2_prm_assert_hardreset - assert the HW reset line of a submodule

 * @prm_mod: PRM submodule base (e.g. CORE_MOD)

 * @shift: register bit shift corresponding to the reset line to assert

 *

 * Some IPs like dsp or iva contain processors that require an HW

 * reset line to be asserted / deasserted in order to fully enable the

 * IP.  These modules may have multiple hard-reset lines that reset

 * different 'submodules' inside the IP block.  This function will

 * place the submodule into reset.  Returns 0 upon success or -EINVAL

 * upon an argument error.

 */

int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)

{

	u32 mask;



	if (!(cpu_is_omap24xx() || cpu_is_omap34xx()))

		return -EINVAL;



	mask = 1 << shift;

	prm_rmw_mod_reg_bits(mask, mask, prm_mod, OMAP2_RM_RSTCTRL);



	return 0;

}



/**

 * omap2_prm_deassert_hardreset - deassert a submodule hardreset line and wait

 * @prm_mod: PRM submodule base (e.g. CORE_MOD)

 * @shift: register bit shift corresponding to the reset line to deassert

 *

 * Some IPs like dsp or iva contain processors that require an HW

 * reset line to be asserted / deasserted in order to fully enable the

 * IP.  These modules may have multiple hard-reset lines that reset

 * different 'submodules' inside the IP block.  This function will

 * take the submodule out of reset and wait until the PRCM indicates

 * that the reset has completed before returning.  Returns 0 upon success or

 * -EINVAL upon an argument error, -EEXIST if the submodule was already out

 * of reset, or -EBUSY if the submodule did not exit reset promptly.

 */

int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift)

{

	u32 mask;

	int c;



	if (!(cpu_is_omap24xx() || cpu_is_omap34xx()))

		return -EINVAL;



	mask = 1 << shift;



	/* Check the current status to avoid de-asserting the line twice */

	if (prm_read_mod_bits_shift(prm_mod, OMAP2_RM_RSTCTRL, mask) == 0)

		return -EEXIST;



	/* Clear the reset status by writing 1 to the status bit */

	prm_rmw_mod_reg_bits(0xffffffff, mask, prm_mod, OMAP2_RM_RSTST);

	/* de-assert the reset control line */

	prm_rmw_mod_reg_bits(mask, 0, prm_mod, OMAP2_RM_RSTCTRL);

	/* wait the status to be set */

	omap_test_timeout(prm_read_mod_bits_shift(prm_mod, OMAP2_RM_RSTST,

						  mask),

			  MAX_MODULE_HARDRESET_WAIT, c);



	return (c == MAX_MODULE_HARDRESET_WAIT) ? -EBUSY : 0;

}