Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

This commit is contained in:
Mariano Alvira 2010-11-10 13:41:17 -05:00
commit 57a8a204b2

View file

@ -266,8 +266,8 @@ static const int ROSC_CTUNE = 9; /* 4 bits */
static const int ROSC_FTUNE = 4; /* 4 bits */
static const int ROSC_EN = 0;
#define ring_osc_on() (set_bit(*CRM_RINGOSC_CNTL,ROSC_EN))
#define ring_osc_off() (clear_bit(*CRM_RINGOSC_CNTL,ROSC_EN))
#define ring_osc_on() (CRM->RINGOSC_CNTLbits.ROSC_EN = 1)
#define ring_osc_off() (CRM->RINGOSC_CNTLbits.ROSC_EN = 0)
#define REF_OSC 24000000UL /* reference osc. frequency */
#define NOMINAL_RING_OSC_SEC 2000 /* nominal ring osc. frequency */