]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Davinci: support LPSC SwRstDisable state
authorCyril Chemparathy <cyril@ti.com>
Thu, 25 Mar 2010 21:43:47 +0000 (17:43 -0400)
committerKevin Hilman <khilman@deeprootsystems.com>
Thu, 6 May 2010 22:02:04 +0000 (15:02 -0700)
commit52958be3ad6e2b72a5943718f339ed4e11685739
treedcb17c4491930a31f98701e2e2879877780908d3
parent449ef7f6a9c732657938b222f8804d3e34a3603e
Davinci: support LPSC SwRstDisable state

The current clock control code always gates the clock (PSC state Disable = 2)
on clk_disable().  Some on-chip peripherals (e.g. LCD controller on TNETV107X)
need to be put into SwRstDisable = 0 on clock disable, to maintain
hardware sanity.

This patch extends the davinci_psc_config() arguments to pass in the desired
module state instead of a boolean enable/disable.  Further, clk_disable() now
checks for the PSC_SWRSTDISABLE clk flag before selecting the target state.

Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
arch/arm/mach-davinci/clock.c
arch/arm/mach-davinci/clock.h
arch/arm/mach-davinci/include/mach/psc.h
arch/arm/mach-davinci/psc.c