Skip to content

L
linux
Commit d7f080e6 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Greg Kroah-Hartman
Browse files
Options

staging: omap-thermal: rename bg_ptr to bgp 

Use a shorter name to bandgap pointer.

Cc: Benoit <b-cousson@ti.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 648b4c6c
Hide whitespace changes
Inline Side-by-side
Showing with 327 additions and 329 deletions
drivers/staging/omap-thermal/omap-bandgap.c
View file @ d7f080e6
...@@ -46,28 +46,28 @@ ...@@ -46,28 +46,28 @@
/** /**
* omap_bandgap_readl() - simple read helper function * omap_bandgap_readl() - simple read helper function
* @bg_ptr: pointer to omap_bandgap structure * @bgp: pointer to omap_bandgap structure
* @reg: desired register (offset) to be read * @reg: desired register (offset) to be read
* *
* Helper function to read bandgap registers. It uses the io remapped area. * Helper function to read bandgap registers. It uses the io remapped area.
* Returns the register value. * Returns the register value.
*/ */
static u32 omap_bandgap_readl(struct omap_bandgap *bg_ptr, u32 reg) static u32 omap_bandgap_readl(struct omap_bandgap *bgp, u32 reg)
{ {
return readl(bg_ptr->base + reg); return readl(bgp->base + reg);
} }
/** /**
* omap_bandgap_writel() - simple write helper function * omap_bandgap_writel() - simple write helper function
* @bg_ptr: pointer to omap_bandgap structure * @bgp: pointer to omap_bandgap structure
* @val: desired register value to be written * @val: desired register value to be written
* @reg: desired register (offset) to be written * @reg: desired register (offset) to be written
* *
* Helper function to write bandgap registers. It uses the io remapped area. * Helper function to write bandgap registers. It uses the io remapped area.
*/ */
static void omap_bandgap_writel(struct omap_bandgap *bg_ptr, u32 val, u32 reg) static void omap_bandgap_writel(struct omap_bandgap *bgp, u32 val, u32 reg)
{ {
writel(val, bg_ptr->base + reg); writel(val, bgp->base + reg);
} }
/** /**
...@@ -76,38 +76,38 @@ static void omap_bandgap_writel(struct omap_bandgap *bg_ptr, u32 val, u32 reg) ...@@ -76,38 +76,38 @@ static void omap_bandgap_writel(struct omap_bandgap *bg_ptr, u32 val, u32 reg)
* RMW_BITS() - used to read, modify and update bandgap bitfields. * RMW_BITS() - used to read, modify and update bandgap bitfields.
* The value passed will be shifted. * The value passed will be shifted.
*/ */
#define RMW_BITS(bg_ptr, id, reg, mask, val) \ #define RMW_BITS(bgp, id, reg, mask, val) \
do { \ do { \
struct temp_sensor_registers *t; \ struct temp_sensor_registers *t; \
u32 r; \ u32 r; \
\ \
t = bg_ptr->conf->sensors[(id)].registers; \ t = bgp->conf->sensors[(id)].registers; \
r = omap_bandgap_readl(bg_ptr, t->reg); \ r = omap_bandgap_readl(bgp, t->reg); \
r &= ~t->mask; \ r &= ~t->mask; \
r |= (val) << __ffs(t->mask); \ r |= (val) << __ffs(t->mask); \
omap_bandgap_writel(bg_ptr, r, t->reg); \ omap_bandgap_writel(bgp, r, t->reg); \
} while (0) } while (0)
/*** Basic helper functions ***/ /*** Basic helper functions ***/
/** /**
* omap_bandgap_power() - controls the power state of a bandgap device * omap_bandgap_power() - controls the power state of a bandgap device
* @bg_ptr: pointer to omap_bandgap structure * @bgp: pointer to omap_bandgap structure
* @on: desired power state (1 - on, 0 - off) * @on: desired power state (1 - on, 0 - off)
* *
* Used to power on/off a bandgap device instance. Only used on those * Used to power on/off a bandgap device instance. Only used on those
* that features tempsoff bit. * that features tempsoff bit.
*/ */
static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on) static int omap_bandgap_power(struct omap_bandgap *bgp, bool on)
{ {
int i; int i;
if (!OMAP_BANDGAP_HAS(bg_ptr, POWER_SWITCH)) if (!OMAP_BANDGAP_HAS(bgp, POWER_SWITCH))
goto exit; goto exit;
for (i = 0; i < bg_ptr->conf->sensor_count; i++) for (i = 0; i < bgp->conf->sensor_count; i++)
/* active on 0 */ /* active on 0 */
RMW_BITS(bg_ptr, i, temp_sensor_ctrl, bgap_tempsoff_mask, !on); RMW_BITS(bgp, i, temp_sensor_ctrl, bgap_tempsoff_mask, !on);
exit: exit:
return 0; return 0;
...@@ -115,7 +115,7 @@ static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on) ...@@ -115,7 +115,7 @@ static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on)
/** /**
* omap_bandgap_read_temp() - helper function to read sensor temperature * omap_bandgap_read_temp() - helper function to read sensor temperature
* @bg_ptr: pointer to omap_bandgap structure * @bgp: pointer to omap_bandgap structure
* @id: bandgap sensor id * @id: bandgap sensor id
* *
* Function to concentrate the steps to read sensor temperature register. * Function to concentrate the steps to read sensor temperature register.
...@@ -123,16 +123,16 @@ static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on) ...@@ -123,16 +123,16 @@ static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on)
* it might be needed to freeze the bandgap state machine, before fetching * it might be needed to freeze the bandgap state machine, before fetching
* the register value. * the register value.
*/ */
static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id) static u32 omap_bandgap_read_temp(struct omap_bandgap *bgp, int id)
{ {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 temp, reg; u32 temp, reg;
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
reg = tsr->temp_sensor_ctrl; reg = tsr->temp_sensor_ctrl;
if (OMAP_BANDGAP_HAS(bg_ptr, FREEZE_BIT)) { if (OMAP_BANDGAP_HAS(bgp, FREEZE_BIT)) {
RMW_BITS(bg_ptr, id, bgap_mask_ctrl, mask_freeze_mask, 1); RMW_BITS(bgp, id, bgap_mask_ctrl, mask_freeze_mask, 1);
/* /*
* In case we cannot read from cur_dtemp / dtemp_0, * In case we cannot read from cur_dtemp / dtemp_0,
* then we read from the last valid temp read * then we read from the last valid temp read
...@@ -141,11 +141,11 @@ static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id) ...@@ -141,11 +141,11 @@ static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id)
} }
/* read temperature */ /* read temperature */
temp = omap_bandgap_readl(bg_ptr, reg); temp = omap_bandgap_readl(bgp, reg);
temp &= tsr->bgap_dtemp_mask; temp &= tsr->bgap_dtemp_mask;
if (OMAP_BANDGAP_HAS(bg_ptr, FREEZE_BIT)) if (OMAP_BANDGAP_HAS(bgp, FREEZE_BIT))
RMW_BITS(bg_ptr, id, bgap_mask_ctrl, mask_freeze_mask, 0); RMW_BITS(bgp, id, bgap_mask_ctrl, mask_freeze_mask, 0);
return temp; return temp;
} }
...@@ -165,15 +165,15 @@ static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id) ...@@ -165,15 +165,15 @@ static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id)
*/ */
static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data) static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data)
{ {
struct omap_bandgap *bg_ptr = data; struct omap_bandgap *bgp = data;
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 t_hot = 0, t_cold = 0, ctrl; u32 t_hot = 0, t_cold = 0, ctrl;
int i; int i;
spin_lock(&bg_ptr->lock); spin_lock(&bgp->lock);
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
tsr = bg_ptr->conf->sensors[i].registers; tsr = bgp->conf->sensors[i].registers;
ctrl = omap_bandgap_readl(bg_ptr, tsr->bgap_status); ctrl = omap_bandgap_readl(bgp, tsr->bgap_status);
/* Read the status of t_hot */ /* Read the status of t_hot */
t_hot = ctrl & tsr->status_hot_mask; t_hot = ctrl & tsr->status_hot_mask;
...@@ -184,7 +184,7 @@ static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data) ...@@ -184,7 +184,7 @@ static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data)
if (!t_cold && !t_hot) if (!t_cold && !t_hot)
continue; continue;
ctrl = omap_bandgap_readl(bg_ptr, tsr->bgap_mask_ctrl); ctrl = omap_bandgap_readl(bgp, tsr->bgap_mask_ctrl);
/* /*
* One TALERT interrupt: Two sources * One TALERT interrupt: Two sources
* If the interrupt is due to t_hot then mask t_hot and * If the interrupt is due to t_hot then mask t_hot and
...@@ -198,18 +198,18 @@ static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data) ...@@ -198,18 +198,18 @@ static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data)
ctrl |= tsr->mask_hot_mask; ctrl |= tsr->mask_hot_mask;
} }
omap_bandgap_writel(bg_ptr, ctrl, tsr->bgap_mask_ctrl); omap_bandgap_writel(bgp, ctrl, tsr->bgap_mask_ctrl);
dev_dbg(bg_ptr->dev, dev_dbg(bgp->dev,
"%s: IRQ from %s sensor: hotevent %d coldevent %d\n", "%s: IRQ from %s sensor: hotevent %d coldevent %d\n",
__func__, bg_ptr->conf->sensors[i].domain, __func__, bgp->conf->sensors[i].domain,
t_hot, t_cold); t_hot, t_cold);
/* report temperature to whom may concern */ /* report temperature to whom may concern */
if (bg_ptr->conf->report_temperature) if (bgp->conf->report_temperature)
bg_ptr->conf->report_temperature(bg_ptr, i); bgp->conf->report_temperature(bgp, i);
} }
spin_unlock(&bg_ptr->lock); spin_unlock(&bgp->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -237,7 +237,7 @@ static irqreturn_t omap_bandgap_tshut_irq_handler(int irq, void *data) ...@@ -237,7 +237,7 @@ static irqreturn_t omap_bandgap_tshut_irq_handler(int irq, void *data)
/** /**
* omap_bandgap_adc_to_mcelsius() - converts an ADC value to mCelsius scale * omap_bandgap_adc_to_mcelsius() - converts an ADC value to mCelsius scale
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @adc_val: value in ADC representation * @adc_val: value in ADC representation
* @t: address where to write the resulting temperature in mCelsius * @t: address where to write the resulting temperature in mCelsius
* *
...@@ -246,10 +246,10 @@ static irqreturn_t omap_bandgap_tshut_irq_handler(int irq, void *data) ...@@ -246,10 +246,10 @@ static irqreturn_t omap_bandgap_tshut_irq_handler(int irq, void *data)
* The conversion table is indexed by the ADC values. * The conversion table is indexed by the ADC values.
*/ */
static static
int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bgp,
int adc_val, int *t) int adc_val, int *t)
{ {
struct omap_bandgap_data *conf = bg_ptr->conf; struct omap_bandgap_data *conf = bgp->conf;
int ret = 0; int ret = 0;
/* look up for temperature in the table and return the temperature */ /* look up for temperature in the table and return the temperature */
...@@ -258,7 +258,7 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, ...@@ -258,7 +258,7 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr,
goto exit; goto exit;
} }
*t = bg_ptr->conf->conv_table[adc_val - conf->adc_start_val]; *t = bgp->conf->conv_table[adc_val - conf->adc_start_val];
exit: exit:
return ret; return ret;
...@@ -266,7 +266,7 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, ...@@ -266,7 +266,7 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr,
/** /**
* omap_bandgap_mcelsius_to_adc() - converts a mCelsius value to ADC scale * omap_bandgap_mcelsius_to_adc() - converts a mCelsius value to ADC scale
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @temp: value in mCelsius * @temp: value in mCelsius
* @adc: address where to write the resulting temperature in ADC representation * @adc: address where to write the resulting temperature in ADC representation
* *
...@@ -275,11 +275,11 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, ...@@ -275,11 +275,11 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr,
* The conversion table is indexed by the ADC values. * The conversion table is indexed by the ADC values.
*/ */
static static
int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, long temp, int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bgp, long temp,
int *adc) int *adc)
{ {
struct omap_bandgap_data *conf = bg_ptr->conf; struct omap_bandgap_data *conf = bgp->conf;
const int *conv_table = bg_ptr->conf->conv_table; const int *conv_table = bgp->conf->conv_table;
int high, low, mid, ret = 0; int high, low, mid, ret = 0;
low = 0; low = 0;
...@@ -307,7 +307,7 @@ int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, long temp, ...@@ -307,7 +307,7 @@ int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, long temp,
/** /**
* omap_bandgap_add_hyst() - add hysteresis (in mCelsius) to an ADC value * omap_bandgap_add_hyst() - add hysteresis (in mCelsius) to an ADC value
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @adc_val: temperature value in ADC representation * @adc_val: temperature value in ADC representation
* @hyst_val: hysteresis value in mCelsius * @hyst_val: hysteresis value in mCelsius
* @sum: address where to write the resulting temperature (in ADC scale) * @sum: address where to write the resulting temperature (in ADC scale)
...@@ -316,7 +316,7 @@ int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, long temp, ...@@ -316,7 +316,7 @@ int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, long temp,
* Returns 0 on success, -ERANGE otherwise. * Returns 0 on success, -ERANGE otherwise.
*/ */
static static
int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val, int omap_bandgap_add_hyst(struct omap_bandgap *bgp, int adc_val,
int hyst_val, u32 *sum) int hyst_val, u32 *sum)
{ {
int temp, ret; int temp, ret;
...@@ -325,13 +325,13 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val, ...@@ -325,13 +325,13 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val,
* Need to add in the mcelsius domain, so we have a temperature * Need to add in the mcelsius domain, so we have a temperature
* the conv_table range * the conv_table range
*/ */
ret = omap_bandgap_adc_to_mcelsius(bg_ptr, adc_val, &temp); ret = omap_bandgap_adc_to_mcelsius(bgp, adc_val, &temp);
if (ret < 0) if (ret < 0)
goto exit; goto exit;
temp += hyst_val; temp += hyst_val;
ret = omap_bandgap_mcelsius_to_adc(bg_ptr, temp, sum); ret = omap_bandgap_mcelsius_to_adc(bgp, temp, sum);
exit: exit:
return ret; return ret;
...@@ -341,24 +341,24 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val, ...@@ -341,24 +341,24 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val,
/** /**
* omap_bandgap_unmask_interrupts() - unmasks the events of thot & tcold * omap_bandgap_unmask_interrupts() - unmasks the events of thot & tcold
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @t_hot: hot temperature value to trigger alert signal * @t_hot: hot temperature value to trigger alert signal
* @t_cold: cold temperature value to trigger alert signal * @t_cold: cold temperature value to trigger alert signal
* *
* Checks the requested t_hot and t_cold values and configures the IRQ event * Checks the requested t_hot and t_cold values and configures the IRQ event
* masks accordingly. Call this function only if bandgap features HAS(TALERT). * masks accordingly. Call this function only if bandgap features HAS(TALERT).
*/ */
static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bgp, int id,
u32 t_hot, u32 t_cold) u32 t_hot, u32 t_cold)
{ {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 temp, reg_val; u32 temp, reg_val;
/* Read the current on die temperature */ /* Read the current on die temperature */
temp = omap_bandgap_read_temp(bg_ptr, id); temp = omap_bandgap_read_temp(bgp, id);
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
reg_val = omap_bandgap_readl(bg_ptr, tsr->bgap_mask_ctrl); reg_val = omap_bandgap_readl(bgp, tsr->bgap_mask_ctrl);
if (temp < t_hot) if (temp < t_hot)
reg_val |= tsr->mask_hot_mask; reg_val |= tsr->mask_hot_mask;
...@@ -369,12 +369,12 @@ static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, ...@@ -369,12 +369,12 @@ static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,
reg_val |= tsr->mask_cold_mask; reg_val |= tsr->mask_cold_mask;
else else
reg_val &= ~tsr->mask_cold_mask; reg_val &= ~tsr->mask_cold_mask;
omap_bandgap_writel(bg_ptr, reg_val, tsr->bgap_mask_ctrl); omap_bandgap_writel(bgp, reg_val, tsr->bgap_mask_ctrl);
} }
/** /**
* omap_bandgap_update_alert_threshold() - sequence to update thresholds * omap_bandgap_update_alert_threshold() - sequence to update thresholds
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @id: bandgap sensor id * @id: bandgap sensor id
* @val: value (ADC) of a new threshold * @val: value (ADC) of a new threshold
* @hot: desired threshold to be updated. true if threshold hot, false if * @hot: desired threshold to be updated. true if threshold hot, false if
...@@ -387,18 +387,18 @@ static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, ...@@ -387,18 +387,18 @@ static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,
* Call this function only if bandgap features HAS(TALERT). * Call this function only if bandgap features HAS(TALERT).
*/ */
static static
int omap_bandgap_update_alert_threshold(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_update_alert_threshold(struct omap_bandgap *bgp, int id,
int val, bool hot) int val, bool hot)
{ {
struct temp_sensor_data *ts_data = bg_ptr->conf->sensors[id].ts_data; struct temp_sensor_data *ts_data = bgp->conf->sensors[id].ts_data;
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 thresh_val, reg_val, t_hot, t_cold; u32 thresh_val, reg_val, t_hot, t_cold;
int err = 0; int err = 0;
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
/* obtain the current value */ /* obtain the current value */
thresh_val = omap_bandgap_readl(bg_ptr, tsr->bgap_threshold); thresh_val = omap_bandgap_readl(bgp, tsr->bgap_threshold);
t_cold = (thresh_val & tsr->threshold_tcold_mask) >> t_cold = (thresh_val & tsr->threshold_tcold_mask) >>
__ffs(tsr->threshold_tcold_mask); __ffs(tsr->threshold_tcold_mask);
t_hot = (thresh_val & tsr->threshold_thot_mask) >> t_hot = (thresh_val & tsr->threshold_thot_mask) >>
...@@ -410,11 +410,11 @@ int omap_bandgap_update_alert_threshold(struct omap_bandgap *bg_ptr, int id, ...@@ -410,11 +410,11 @@ int omap_bandgap_update_alert_threshold(struct omap_bandgap *bg_ptr, int id,
if (t_cold < t_hot) { if (t_cold < t_hot) {
if (hot) if (hot)
err = omap_bandgap_add_hyst(bg_ptr, t_hot, err = omap_bandgap_add_hyst(bgp, t_hot,
-ts_data->hyst_val, -ts_data->hyst_val,
&t_cold); &t_cold);
else else
err = omap_bandgap_add_hyst(bg_ptr, t_cold, err = omap_bandgap_add_hyst(bgp, t_cold,
ts_data->hyst_val, ts_data->hyst_val,
&t_hot); &t_hot);
} }
...@@ -424,39 +424,39 @@ int omap_bandgap_update_alert_threshold(struct omap_bandgap *bg_ptr, int id, ...@@ -424,39 +424,39 @@ int omap_bandgap_update_alert_threshold(struct omap_bandgap *bg_ptr, int id,
reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask)); reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask));
reg_val |= thresh_val & ~tsr->threshold_tcold_mask; reg_val |= thresh_val & ~tsr->threshold_tcold_mask;
reg_val |= (t_cold << __ffs(tsr->threshold_tcold_mask)); reg_val |= (t_cold << __ffs(tsr->threshold_tcold_mask));
omap_bandgap_writel(bg_ptr, reg_val, tsr->bgap_threshold); omap_bandgap_writel(bgp, reg_val, tsr->bgap_threshold);
if (err) { if (err) {
dev_err(bg_ptr->dev, "failed to reprogram thot threshold\n"); dev_err(bgp->dev, "failed to reprogram thot threshold\n");
err = -EIO; err = -EIO;
goto exit; goto exit;
} }
omap_bandgap_unmask_interrupts(bg_ptr, id, t_hot, t_cold); omap_bandgap_unmask_interrupts(bgp, id, t_hot, t_cold);
exit: exit:
return err; return err;
} }
/** /**
* omap_bandgap_validate() - helper to check the sanity of a struct omap_bandgap * omap_bandgap_validate() - helper to check the sanity of a struct omap_bandgap
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @id: bandgap sensor id * @id: bandgap sensor id
* *
* Checks if the bandgap pointer is valid and if the sensor id is also * Checks if the bandgap pointer is valid and if the sensor id is also
* applicable. * applicable.
*/ */
static inline int omap_bandgap_validate(struct omap_bandgap *bg_ptr, int id) static inline int omap_bandgap_validate(struct omap_bandgap *bgp, int id)
{ {
int ret = 0; int ret = 0;
if (IS_ERR_OR_NULL(bg_ptr)) { if (IS_ERR_OR_NULL(bgp)) {
pr_err("%s: invalid bandgap pointer\n", __func__); pr_err("%s: invalid bandgap pointer\n", __func__);
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
if ((id < 0) || (id >= bg_ptr->conf->sensor_count)) { if ((id < 0) || (id >= bgp->conf->sensor_count)) {
dev_err(bg_ptr->dev, "%s: sensor id out of range (%d)\n", dev_err(bgp->dev, "%s: sensor id out of range (%d)\n",
__func__, id); __func__, id);
ret = -ERANGE; ret = -ERANGE;
} }
...@@ -467,7 +467,7 @@ static inline int omap_bandgap_validate(struct omap_bandgap *bg_ptr, int id) ...@@ -467,7 +467,7 @@ static inline int omap_bandgap_validate(struct omap_bandgap *bg_ptr, int id)
/** /**
* _omap_bandgap_write_threshold() - helper to update TALERT t_cold or t_hot * _omap_bandgap_write_threshold() - helper to update TALERT t_cold or t_hot
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @id: bandgap sensor id * @id: bandgap sensor id
* @val: value (mCelsius) of a new threshold * @val: value (mCelsius) of a new threshold
* @hot: desired threshold to be updated. true if threshold hot, false if * @hot: desired threshold to be updated. true if threshold hot, false if
...@@ -478,7 +478,7 @@ static inline int omap_bandgap_validate(struct omap_bandgap *bg_ptr, int id) ...@@ -478,7 +478,7 @@ static inline int omap_bandgap_validate(struct omap_bandgap *bg_ptr, int id)
* Validates the mCelsius range and update the requested threshold. * Validates the mCelsius range and update the requested threshold.
* Call this function only if bandgap features HAS(TALERT). * Call this function only if bandgap features HAS(TALERT).
*/ */
int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val, int _omap_bandgap_write_threshold(struct omap_bandgap *bgp, int id, int val,
bool hot) bool hot)
{ {
struct temp_sensor_data *ts_data; struct temp_sensor_data *ts_data;
...@@ -486,17 +486,17 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val, ...@@ -486,17 +486,17 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val,
u32 adc_val; u32 adc_val;
int ret; int ret;
ret = omap_bandgap_validate(bg_ptr, id); ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
goto exit; goto exit;
if (!OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (!OMAP_BANDGAP_HAS(bgp, TALERT)) {
ret = -ENOTSUPP; ret = -ENOTSUPP;
goto exit; goto exit;
} }
ts_data = bg_ptr->conf->sensors[id].ts_data; ts_data = bgp->conf->sensors[id].ts_data;
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
if (hot) { if (hot) {
if (val < ts_data->min_temp + ts_data->hyst_val) if (val < ts_data->min_temp + ts_data->hyst_val)
ret = -EINVAL; ret = -EINVAL;
...@@ -508,13 +508,13 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val, ...@@ -508,13 +508,13 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val,
if (ret) if (ret)
goto exit; goto exit;
ret = omap_bandgap_mcelsius_to_adc(bg_ptr, val, &adc_val); ret = omap_bandgap_mcelsius_to_adc(bgp, val, &adc_val);
if (ret < 0) if (ret < 0)
goto exit; goto exit;
spin_lock(&bg_ptr->lock); spin_lock(&bgp->lock);
omap_bandgap_update_alert_threshold(bg_ptr, id, adc_val, hot); omap_bandgap_update_alert_threshold(bgp, id, adc_val, hot);
spin_unlock(&bg_ptr->lock); spin_unlock(&bgp->lock);
exit: exit:
return ret; return ret;
...@@ -522,7 +522,7 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val, ...@@ -522,7 +522,7 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val,
/** /**
* _omap_bandgap_read_threshold() - helper to read TALERT t_cold or t_hot * _omap_bandgap_read_threshold() - helper to read TALERT t_cold or t_hot
* @bg_ptr: struct omap_bandgap pointer * @bgp: struct omap_bandgap pointer
* @id: bandgap sensor id * @id: bandgap sensor id
* @val: value (mCelsius) of a threshold * @val: value (mCelsius) of a threshold
* @hot: desired threshold to be read. true if threshold hot, false if * @hot: desired threshold to be read. true if threshold hot, false if
...@@ -532,33 +532,33 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val, ...@@ -532,33 +532,33 @@ int _omap_bandgap_write_threshold(struct omap_bandgap *bg_ptr, int id, int val,
* This function can be used to read t_hot or t_cold, depending on @hot value. * This function can be used to read t_hot or t_cold, depending on @hot value.
* Call this function only if bandgap features HAS(TALERT). * Call this function only if bandgap features HAS(TALERT).
*/ */
int _omap_bandgap_read_threshold(struct omap_bandgap *bg_ptr, int id, int _omap_bandgap_read_threshold(struct omap_bandgap *bgp, int id,
int *val, bool hot) int *val, bool hot)
{ {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 temp, mask; u32 temp, mask;
int ret = 0; int ret = 0;
ret = omap_bandgap_validate(bg_ptr, id); ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
goto exit; goto exit;
if (!OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (!OMAP_BANDGAP_HAS(bgp, TALERT)) {
ret = -ENOTSUPP; ret = -ENOTSUPP;
goto exit; goto exit;
} }
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
if (hot) if (hot)
mask = tsr->threshold_thot_mask; mask = tsr->threshold_thot_mask;
else else
mask = tsr->threshold_tcold_mask; mask = tsr->threshold_tcold_mask;
temp = omap_bandgap_readl(bg_ptr, tsr->bgap_threshold); temp = omap_bandgap_readl(bgp, tsr->bgap_threshold);
temp = (temp & mask) >> __ffs(mask); temp = (temp & mask) >> __ffs(mask);
ret |= omap_bandgap_adc_to_mcelsius(bg_ptr, temp, &temp); ret |= omap_bandgap_adc_to_mcelsius(bgp, temp, &temp);
if (ret) { if (ret) {
dev_err(bg_ptr->dev, "failed to read thot\n"); dev_err(bgp->dev, "failed to read thot\n");
ret = -EIO; ret = -EIO;
goto exit; goto exit;
} }
...@@ -573,84 +573,84 @@ int _omap_bandgap_read_threshold(struct omap_bandgap *bg_ptr, int id, ...@@ -573,84 +573,84 @@ int _omap_bandgap_read_threshold(struct omap_bandgap *bg_ptr, int id,
/** /**
* omap_bandgap_read_thot() - reads sensor current thot * omap_bandgap_read_thot() - reads sensor current thot
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @thot - resulting current thot value * @thot - resulting current thot value
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_read_thot(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_thot(struct omap_bandgap *bgp, int id,
int *thot) int *thot)
{ {
return _omap_bandgap_read_threshold(bg_ptr, id, thot, true); return _omap_bandgap_read_threshold(bgp, id, thot, true);
} }
/** /**
* omap_bandgap_write_thot() - sets sensor current thot * omap_bandgap_write_thot() - sets sensor current thot
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @val - desired thot value * @val - desired thot value
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_write_thot(struct omap_bandgap *bg_ptr, int id, int val) int omap_bandgap_write_thot(struct omap_bandgap *bgp, int id, int val)
{ {
return _omap_bandgap_write_threshold(bg_ptr, id, val, true); return _omap_bandgap_write_threshold(bgp, id, val, true);
} }
/** /**
* omap_bandgap_read_tcold() - reads sensor current tcold * omap_bandgap_read_tcold() - reads sensor current tcold
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @tcold - resulting current tcold value * @tcold - resulting current tcold value
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_read_tcold(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_tcold(struct omap_bandgap *bgp, int id,
int *tcold) int *tcold)
{ {
return _omap_bandgap_read_threshold(bg_ptr, id, tcold, false); return _omap_bandgap_read_threshold(bgp, id, tcold, false);
} }
/** /**
* omap_bandgap_write_tcold() - sets the sensor tcold * omap_bandgap_write_tcold() - sets the sensor tcold
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @val - desired tcold value * @val - desired tcold value
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_write_tcold(struct omap_bandgap *bg_ptr, int id, int val) int omap_bandgap_write_tcold(struct omap_bandgap *bgp, int id, int val)
{ {
return _omap_bandgap_write_threshold(bg_ptr, id, val, false); return _omap_bandgap_write_threshold(bgp, id, val, false);
} }
/** /**
* omap_bandgap_read_update_interval() - read the sensor update interval * omap_bandgap_read_update_interval() - read the sensor update interval
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @interval - resulting update interval in miliseconds * @interval - resulting update interval in miliseconds
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_update_interval(struct omap_bandgap *bgp, int id,
int *interval) int *interval)
{ {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 time; u32 time;
int ret; int ret;
ret = omap_bandgap_validate(bg_ptr, id); ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
return ret; return ret;
if (!OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (!OMAP_BANDGAP_HAS(bgp, COUNTER))
return -ENOTSUPP; return -ENOTSUPP;
tsr = bg_ptr->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
time = omap_bandgap_readl(bg_ptr, tsr->bgap_counter); time = omap_bandgap_readl(bgp, tsr->bgap_counter);
time = (time & tsr->counter_mask) >> __ffs(tsr->counter_mask); time = (time & tsr->counter_mask) >> __ffs(tsr->counter_mask);
time = time * 1000 / bg_ptr->clk_rate; time = time * 1000 / bgp->clk_rate;
*interval = time; *interval = time;
...@@ -659,53 +659,53 @@ int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id, ...@@ -659,53 +659,53 @@ int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id,
/** /**
* omap_bandgap_write_update_interval() - set the update interval * omap_bandgap_write_update_interval() - set the update interval
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @interval - desired update interval in miliseconds * @interval - desired update interval in miliseconds
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_write_update_interval(struct omap_bandgap *bg_ptr, int omap_bandgap_write_update_interval(struct omap_bandgap *bgp,
int id, u32 interval) int id, u32 interval)
{ {
int ret = omap_bandgap_validate(bg_ptr, id); int ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
return ret; return ret;
if (!OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (!OMAP_BANDGAP_HAS(bgp, COUNTER))
return -ENOTSUPP; return -ENOTSUPP;
interval = interval * bg_ptr->clk_rate / 1000; interval = interval * bgp->clk_rate / 1000;
spin_lock(&bg_ptr->lock); spin_lock(&bgp->lock);
RMW_BITS(bg_ptr, id, bgap_counter, counter_mask, interval); RMW_BITS(bgp, id, bgap_counter, counter_mask, interval);
spin_unlock(&bg_ptr->lock); spin_unlock(&bgp->lock);
return 0; return 0;
} }
/** /**
* omap_bandgap_read_temperature() - report current temperature * omap_bandgap_read_temperature() - report current temperature
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @temperature - resulting temperature * @temperature - resulting temperature
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_read_temperature(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_temperature(struct omap_bandgap *bgp, int id,
int *temperature) int *temperature)
{ {
u32 temp; u32 temp;
int ret; int ret;
ret = omap_bandgap_validate(bg_ptr, id); ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
return ret; return ret;
spin_lock(&bg_ptr->lock); spin_lock(&bgp->lock);
temp = omap_bandgap_read_temp(bg_ptr, id); temp = omap_bandgap_read_temp(bgp, id);
spin_unlock(&bg_ptr->lock); spin_unlock(&bgp->lock);
ret |= omap_bandgap_adc_to_mcelsius(bg_ptr, temp, &temp); ret |= omap_bandgap_adc_to_mcelsius(bgp, temp, &temp);
if (ret) if (ret)
return -EIO; return -EIO;
...@@ -717,20 +717,20 @@ int omap_bandgap_read_temperature(struct omap_bandgap *bg_ptr, int id, ...@@ -717,20 +717,20 @@ int omap_bandgap_read_temperature(struct omap_bandgap *bg_ptr, int id,
/** /**
* omap_bandgap_set_sensor_data() - helper function to store thermal * omap_bandgap_set_sensor_data() - helper function to store thermal
* framework related data. * framework related data.
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* @data - thermal framework related data to be stored * @data - thermal framework related data to be stored
* *
* returns 0 on success or the proper error code * returns 0 on success or the proper error code
*/ */
int omap_bandgap_set_sensor_data(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_set_sensor_data(struct omap_bandgap *bgp, int id,
void *data) void *data)
{ {
int ret = omap_bandgap_validate(bg_ptr, id); int ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
return ret; return ret;
bg_ptr->conf->sensors[id].data = data; bgp->conf->sensors[id].data = data;
return 0; return 0;
} }
...@@ -738,71 +738,71 @@ int omap_bandgap_set_sensor_data(struct omap_bandgap *bg_ptr, int id, ...@@ -738,71 +738,71 @@ int omap_bandgap_set_sensor_data(struct omap_bandgap *bg_ptr, int id,
/** /**
* omap_bandgap_get_sensor_data() - helper function to get thermal * omap_bandgap_get_sensor_data() - helper function to get thermal
* framework related data. * framework related data.
* @bg_ptr - pointer to bandgap instance * @bgp - pointer to bandgap instance
* @id - sensor id * @id - sensor id
* *
* returns data stored by set function with sensor id on success or NULL * returns data stored by set function with sensor id on success or NULL
*/ */
void *omap_bandgap_get_sensor_data(struct omap_bandgap *bg_ptr, int id) void *omap_bandgap_get_sensor_data(struct omap_bandgap *bgp, int id)
{ {
int ret = omap_bandgap_validate(bg_ptr, id); int ret = omap_bandgap_validate(bgp, id);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
return bg_ptr->conf->sensors[id].data; return bgp->conf->sensors[id].data;
} }
/*** Helper functions used during device initialization ***/ /*** Helper functions used during device initialization ***/
/** /**
* omap_bandgap_force_single_read() - executes 1 single ADC conversion * omap_bandgap_force_single_read() - executes 1 single ADC conversion
* @bg_ptr: pointer to struct omap_bandgap * @bgp: pointer to struct omap_bandgap
* @id: sensor id which it is desired to read 1 temperature * @id: sensor id which it is desired to read 1 temperature
* *
* Used to initialize the conversion state machine and set it to a valid * Used to initialize the conversion state machine and set it to a valid
* state. Called during device initialization and context restore events. * state. Called during device initialization and context restore events.
*/ */
static int static int
omap_bandgap_force_single_read(struct omap_bandgap *bg_ptr, int id) omap_bandgap_force_single_read(struct omap_bandgap *bgp, int id)
{ {
u32 temp = 0, counter = 1000; u32 temp = 0, counter = 1000;
/* Select single conversion mode */ /* Select single conversion mode */
if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, MODE_CONFIG))
RMW_BITS(bg_ptr, id, bgap_mode_ctrl, mode_ctrl_mask, 0); RMW_BITS(bgp, id, bgap_mode_ctrl, mode_ctrl_mask, 0);
/* Start of Conversion = 1 */ /* Start of Conversion = 1 */
RMW_BITS(bg_ptr, id, temp_sensor_ctrl, bgap_soc_mask, 1); RMW_BITS(bgp, id, temp_sensor_ctrl, bgap_soc_mask, 1);
/* Wait until DTEMP is updated */ /* Wait until DTEMP is updated */
temp = omap_bandgap_read_temp(bg_ptr, id); temp = omap_bandgap_read_temp(bgp, id);
while ((temp == 0) && --counter) while ((temp == 0) && --counter)
temp = omap_bandgap_read_temp(bg_ptr, id); temp = omap_bandgap_read_temp(bgp, id);
/* REVISIT: Check correct condition for end of conversion */ /* REVISIT: Check correct condition for end of conversion */
/* Start of Conversion = 0 */ /* Start of Conversion = 0 */
RMW_BITS(bg_ptr, id, temp_sensor_ctrl, bgap_soc_mask, 0); RMW_BITS(bgp, id, temp_sensor_ctrl, bgap_soc_mask, 0);
return 0; return 0;
} }
/** /**
* omap_bandgap_set_continous_mode() - One time enabling of continuous mode * omap_bandgap_set_continous_mode() - One time enabling of continuous mode
* @bg_ptr: pointer to struct omap_bandgap * @bgp: pointer to struct omap_bandgap
* *
* Call this function only if HAS(MODE_CONFIG) is set. As this driver may * Call this function only if HAS(MODE_CONFIG) is set. As this driver may
* be used for junction temperature monitoring, it is desirable that the * be used for junction temperature monitoring, it is desirable that the
* sensors are operational all the time, so that alerts are generated * sensors are operational all the time, so that alerts are generated
* properly. * properly.
*/ */
static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bg_ptr) static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bgp)
{ {
int i; int i;
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
/* Perform a single read just before enabling continuous */ /* Perform a single read just before enabling continuous */
omap_bandgap_force_single_read(bg_ptr, i); omap_bandgap_force_single_read(bgp, i);
RMW_BITS(bg_ptr, i, bgap_mode_ctrl, mode_ctrl_mask, 1); RMW_BITS(bgp, i, bgap_mode_ctrl, mode_ctrl_mask, 1);
} }
return 0; return 0;
...@@ -810,7 +810,7 @@ static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bg_ptr) ...@@ -810,7 +810,7 @@ static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bg_ptr)
/** /**
* omap_bandgap_tshut_init() - setup and initialize tshut handling * omap_bandgap_tshut_init() - setup and initialize tshut handling
* @bg_ptr: pointer to struct omap_bandgap * @bgp: pointer to struct omap_bandgap
* @pdev: pointer to device struct platform_device * @pdev: pointer to device struct platform_device
* *
* Call this function only in case the bandgap features HAS(TSHUT). * Call this function only in case the bandgap features HAS(TSHUT).
...@@ -820,23 +820,21 @@ static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bg_ptr) ...@@ -820,23 +820,21 @@ static int omap_bandgap_set_continuous_mode(struct omap_bandgap *bg_ptr)
* one of the bandgap sensors violates the TSHUT high/hot threshold. * one of the bandgap sensors violates the TSHUT high/hot threshold.
* And in that case, the system must go off. * And in that case, the system must go off.
*/ */
static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr, static int omap_bandgap_tshut_init(struct omap_bandgap *bgp,
struct platform_device *pdev) struct platform_device *pdev)
{ {
int gpio_nr = bg_ptr->tshut_gpio; int gpio_nr = bgp->tshut_gpio;
int status; int status;
/* Request for gpio_86 line */ /* Request for gpio_86 line */
status = gpio_request(gpio_nr, "tshut"); status = gpio_request(gpio_nr, "tshut");
if (status < 0) { if (status < 0) {
dev_err(bg_ptr->dev, dev_err(bgp->dev, "Could not request for TSHUT GPIO:%i\n", 86);
"Could not request for TSHUT GPIO:%i\n", 86);
return status; return status;
} }
status = gpio_direction_input(gpio_nr); status = gpio_direction_input(gpio_nr);
if (status) { if (status) {
dev_err(bg_ptr->dev, dev_err(bgp->dev, "Cannot set input TSHUT GPIO %d\n", gpio_nr);
"Cannot set input TSHUT GPIO %d\n", gpio_nr);
return status; return status;
} }
...@@ -846,7 +844,7 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr, ...@@ -846,7 +844,7 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr,
NULL); NULL);
if (status) { if (status) {
gpio_free(gpio_nr); gpio_free(gpio_nr);
dev_err(bg_ptr->dev, "request irq failed for TSHUT"); dev_err(bgp->dev, "request irq failed for TSHUT");
} }
return 0; return 0;
...@@ -854,7 +852,7 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr, ...@@ -854,7 +852,7 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr,
/** /**
* omap_bandgap_alert_init() - setup and initialize talert handling * omap_bandgap_alert_init() - setup and initialize talert handling
* @bg_ptr: pointer to struct omap_bandgap * @bgp: pointer to struct omap_bandgap
* @pdev: pointer to device struct platform_device * @pdev: pointer to device struct platform_device
* *
* Call this function only in case the bandgap features HAS(TALERT). * Call this function only in case the bandgap features HAS(TALERT).
...@@ -863,20 +861,20 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr, ...@@ -863,20 +861,20 @@ static int omap_bandgap_tshut_init(struct omap_bandgap *bg_ptr,
* are violated. In these situation, the driver must reprogram the thresholds, * are violated. In these situation, the driver must reprogram the thresholds,
* accordingly to specified policy. * accordingly to specified policy.
*/ */
static int omap_bandgap_talert_init(struct omap_bandgap *bg_ptr, static int omap_bandgap_talert_init(struct omap_bandgap *bgp,
struct platform_device *pdev) struct platform_device *pdev)
{ {
int ret; int ret;
bg_ptr->irq = platform_get_irq(pdev, 0); bgp->irq = platform_get_irq(pdev, 0);
if (bg_ptr->irq < 0) { if (bgp->irq < 0) {
dev_err(&pdev->dev, "get_irq failed\n"); dev_err(&pdev->dev, "get_irq failed\n");
return bg_ptr->irq; return bgp->irq;
} }
ret = request_threaded_irq(bg_ptr->irq, NULL, ret = request_threaded_irq(bgp->irq, NULL,
omap_bandgap_talert_irq_handler, omap_bandgap_talert_irq_handler,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT, IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
"talert", bg_ptr); "talert", bgp);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Request threaded irq failed.\n"); dev_err(&pdev->dev, "Request threaded irq failed.\n");
return ret; return ret;
...@@ -887,7 +885,7 @@ static int omap_bandgap_talert_init(struct omap_bandgap *bg_ptr, ...@@ -887,7 +885,7 @@ static int omap_bandgap_talert_init(struct omap_bandgap *bg_ptr,
/** /**
* omap_bandgap_build() - parse DT and setup a struct omap_bandgap * omap_bandgap_build() - parse DT and setup a struct omap_bandgap
* @bg_ptr: pointer to struct omap_bandgap * @bgp: pointer to struct omap_bandgap
* @pdev: pointer to device struct platform_device * @pdev: pointer to device struct platform_device
* *
* Used to read the device tree properties accordingly to the bandgap * Used to read the device tree properties accordingly to the bandgap
...@@ -899,7 +897,7 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev) ...@@ -899,7 +897,7 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev)
{ {
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
const struct of_device_id *of_id; const struct of_device_id *of_id;
struct omap_bandgap *bg_ptr; struct omap_bandgap *bgp;
struct resource *res; struct resource *res;
u32 prop; u32 prop;
int i; int i;
...@@ -910,16 +908,16 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev) ...@@ -910,16 +908,16 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
bg_ptr = devm_kzalloc(&pdev->dev, sizeof(struct omap_bandgap), bgp = devm_kzalloc(&pdev->dev, sizeof(struct omap_bandgap),
GFP_KERNEL); GFP_KERNEL);
if (!bg_ptr) { if (!bgp) {
dev_err(&pdev->dev, "Unable to allocate mem for driver ref\n"); dev_err(&pdev->dev, "Unable to allocate mem for driver ref\n");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
of_id = of_match_device(of_omap_bandgap_match, &pdev->dev); of_id = of_match_device(of_omap_bandgap_match, &pdev->dev);
if (of_id) if (of_id)
bg_ptr->conf = of_id->data; bgp->conf = of_id->data;
i = 0; i = 0;
do { do {
...@@ -930,27 +928,27 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev) ...@@ -930,27 +928,27 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev)
break; break;
chunk = devm_ioremap_resource(&pdev->dev, res); chunk = devm_ioremap_resource(&pdev->dev, res);
if (i == 0) if (i == 0)
bg_ptr->base = chunk; bgp->base = chunk;
if (IS_ERR(chunk)) if (IS_ERR(chunk))
return ERR_CAST(chunk); return ERR_CAST(chunk);
i++; i++;
} while (res); } while (res);
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT)) { if (OMAP_BANDGAP_HAS(bgp, TSHUT)) {
if (of_property_read_u32(node, "ti,tshut-gpio", &prop) < 0) { if (of_property_read_u32(node, "ti,tshut-gpio", &prop) < 0) {
dev_err(&pdev->dev, "missing tshut gpio in device tree\n"); dev_err(&pdev->dev, "missing tshut gpio in device tree\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
bg_ptr->tshut_gpio = prop; bgp->tshut_gpio = prop;
if (!gpio_is_valid(bg_ptr->tshut_gpio)) { if (!gpio_is_valid(bgp->tshut_gpio)) {
dev_err(&pdev->dev, "invalid gpio for tshut (%d)\n", dev_err(&pdev->dev, "invalid gpio for tshut (%d)\n",
bg_ptr->tshut_gpio); bgp->tshut_gpio);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
} }
return bg_ptr; return bgp;
} }
/*** Device driver call backs ***/ /*** Device driver call backs ***/
...@@ -958,18 +956,18 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev) ...@@ -958,18 +956,18 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev)
static static
int omap_bandgap_probe(struct platform_device *pdev) int omap_bandgap_probe(struct platform_device *pdev)
{ {
struct omap_bandgap *bg_ptr; struct omap_bandgap *bgp;
int clk_rate, ret = 0, i; int clk_rate, ret = 0, i;
bg_ptr = omap_bandgap_build(pdev); bgp = omap_bandgap_build(pdev);
if (IS_ERR_OR_NULL(bg_ptr)) { if (IS_ERR_OR_NULL(bgp)) {
dev_err(&pdev->dev, "failed to fetch platform data\n"); dev_err(&pdev->dev, "failed to fetch platform data\n");
return PTR_ERR(bg_ptr); return PTR_ERR(bgp);
} }
bg_ptr->dev = &pdev->dev; bgp->dev = &pdev->dev;
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT)) { if (OMAP_BANDGAP_HAS(bgp, TSHUT)) {
ret = omap_bandgap_tshut_init(bg_ptr, pdev); ret = omap_bandgap_tshut_init(bgp, pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to initialize system tshut IRQ\n"); "failed to initialize system tshut IRQ\n");
...@@ -977,111 +975,111 @@ int omap_bandgap_probe(struct platform_device *pdev) ...@@ -977,111 +975,111 @@ int omap_bandgap_probe(struct platform_device *pdev)
} }
} }
bg_ptr->fclock = clk_get(NULL, bg_ptr->conf->fclock_name); bgp->fclock = clk_get(NULL, bgp->conf->fclock_name);
ret = IS_ERR_OR_NULL(bg_ptr->fclock); ret = IS_ERR_OR_NULL(bgp->fclock);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request fclock reference\n"); dev_err(&pdev->dev, "failed to request fclock reference\n");
goto free_irqs; goto free_irqs;
} }
bg_ptr->div_clk = clk_get(NULL, bg_ptr->conf->div_ck_name); bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name);
ret = IS_ERR_OR_NULL(bg_ptr->div_clk); ret = IS_ERR_OR_NULL(bgp->div_clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to request div_ts_ck clock ref\n"); "failed to request div_ts_ck clock ref\n");
goto free_irqs; goto free_irqs;
} }
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
u32 val; u32 val;
tsr = bg_ptr->conf->sensors[i].registers; tsr = bgp->conf->sensors[i].registers;
/* /*
* check if the efuse has a non-zero value if not * check if the efuse has a non-zero value if not
* it is an untrimmed sample and the temperatures * it is an untrimmed sample and the temperatures
* may not be accurate * may not be accurate
*/ */
val = omap_bandgap_readl(bg_ptr, tsr->bgap_efuse); val = omap_bandgap_readl(bgp, tsr->bgap_efuse);
if (ret || !val) if (ret || !val)
dev_info(&pdev->dev, dev_info(&pdev->dev,
"Non-trimmed BGAP, Temp not accurate\n"); "Non-trimmed BGAP, Temp not accurate\n");
} }
clk_rate = clk_round_rate(bg_ptr->div_clk, clk_rate = clk_round_rate(bgp->div_clk,
bg_ptr->conf->sensors[0].ts_data->max_freq); bgp->conf->sensors[0].ts_data->max_freq);
if (clk_rate < bg_ptr->conf->sensors[0].ts_data->min_freq || if (clk_rate < bgp->conf->sensors[0].ts_data->min_freq ||
clk_rate == 0xffffffff) { clk_rate == 0xffffffff) {
ret = -ENODEV; ret = -ENODEV;
dev_err(&pdev->dev, "wrong clock rate (%d)\n", clk_rate); dev_err(&pdev->dev, "wrong clock rate (%d)\n", clk_rate);
goto put_clks; goto put_clks;
} }
ret = clk_set_rate(bg_ptr->div_clk, clk_rate); ret = clk_set_rate(bgp->div_clk, clk_rate);
if (ret) if (ret)
dev_err(&pdev->dev, "Cannot re-set clock rate. Continuing\n"); dev_err(&pdev->dev, "Cannot re-set clock rate. Continuing\n");
bg_ptr->clk_rate = clk_rate; bgp->clk_rate = clk_rate;
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bgp, CLK_CTRL))
clk_prepare_enable(bg_ptr->fclock); clk_prepare_enable(bgp->fclock);
spin_lock_init(&bg_ptr->lock); spin_lock_init(&bgp->lock);
bg_ptr->dev = &pdev->dev; bgp->dev = &pdev->dev;
platform_set_drvdata(pdev, bg_ptr); platform_set_drvdata(pdev, bgp);
omap_bandgap_power(bg_ptr, true); omap_bandgap_power(bgp, true);
/* Set default counter to 1 for now */ /* Set default counter to 1 for now */
if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (OMAP_BANDGAP_HAS(bgp, COUNTER))
for (i = 0; i < bg_ptr->conf->sensor_count; i++) for (i = 0; i < bgp->conf->sensor_count; i++)
RMW_BITS(bg_ptr, i, bgap_counter, counter_mask, 1); RMW_BITS(bgp, i, bgap_counter, counter_mask, 1);
/* Set default thresholds for alert and shutdown */ /* Set default thresholds for alert and shutdown */
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
struct temp_sensor_data *ts_data; struct temp_sensor_data *ts_data;
ts_data = bg_ptr->conf->sensors[i].ts_data; ts_data = bgp->conf->sensors[i].ts_data;
if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (OMAP_BANDGAP_HAS(bgp, TALERT)) {
/* Set initial Talert thresholds */ /* Set initial Talert thresholds */
RMW_BITS(bg_ptr, i, bgap_threshold, RMW_BITS(bgp, i, bgap_threshold,
threshold_tcold_mask, ts_data->t_cold); threshold_tcold_mask, ts_data->t_cold);
RMW_BITS(bg_ptr, i, bgap_threshold, RMW_BITS(bgp, i, bgap_threshold,
threshold_thot_mask, ts_data->t_hot); threshold_thot_mask, ts_data->t_hot);
/* Enable the alert events */ /* Enable the alert events */
RMW_BITS(bg_ptr, i, bgap_mask_ctrl, mask_hot_mask, 1); RMW_BITS(bgp, i, bgap_mask_ctrl, mask_hot_mask, 1);
RMW_BITS(bg_ptr, i, bgap_mask_ctrl, mask_cold_mask, 1); RMW_BITS(bgp, i, bgap_mask_ctrl, mask_cold_mask, 1);
} }
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG)) { if (OMAP_BANDGAP_HAS(bgp, TSHUT_CONFIG)) {
/* Set initial Tshut thresholds */ /* Set initial Tshut thresholds */
RMW_BITS(bg_ptr, i, tshut_threshold, RMW_BITS(bgp, i, tshut_threshold,
tshut_hot_mask, ts_data->tshut_hot); tshut_hot_mask, ts_data->tshut_hot);
RMW_BITS(bg_ptr, i, tshut_threshold, RMW_BITS(bgp, i, tshut_threshold,
tshut_cold_mask, ts_data->tshut_cold); tshut_cold_mask, ts_data->tshut_cold);
} }
} }
if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, MODE_CONFIG))
omap_bandgap_set_continuous_mode(bg_ptr); omap_bandgap_set_continuous_mode(bgp);
/* Set .250 seconds time as default counter */ /* Set .250 seconds time as default counter */
if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (OMAP_BANDGAP_HAS(bgp, COUNTER))
for (i = 0; i < bg_ptr->conf->sensor_count; i++) for (i = 0; i < bgp->conf->sensor_count; i++)
RMW_BITS(bg_ptr, i, bgap_counter, counter_mask, RMW_BITS(bgp, i, bgap_counter, counter_mask,
bg_ptr->clk_rate / 4); bgp->clk_rate / 4);
/* Every thing is good? Then expose the sensors */ /* Every thing is good? Then expose the sensors */
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
char *domain; char *domain;
if (bg_ptr->conf->sensors[i].register_cooling) if (bgp->conf->sensors[i].register_cooling)
bg_ptr->conf->sensors[i].register_cooling(bg_ptr, i); bgp->conf->sensors[i].register_cooling(bgp, i);
domain = bg_ptr->conf->sensors[i].domain; domain = bgp->conf->sensors[i].domain;
if (bg_ptr->conf->expose_sensor) if (bgp->conf->expose_sensor)
bg_ptr->conf->expose_sensor(bg_ptr, i, domain); bgp->conf->expose_sensor(bgp, i, domain);
} }
/* /*
...@@ -1089,11 +1087,11 @@ int omap_bandgap_probe(struct platform_device *pdev) ...@@ -1089,11 +1087,11 @@ int omap_bandgap_probe(struct platform_device *pdev)
* might be called as soon as it is enabled where as rest of framework * might be called as soon as it is enabled where as rest of framework
* is still getting initialised. * is still getting initialised.
*/ */
if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (OMAP_BANDGAP_HAS(bgp, TALERT)) {
ret = omap_bandgap_talert_init(bg_ptr, pdev); ret = omap_bandgap_talert_init(bgp, pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to initialize Talert IRQ\n"); dev_err(&pdev->dev, "failed to initialize Talert IRQ\n");
i = bg_ptr->conf->sensor_count; i = bgp->conf->sensor_count;
goto disable_clk; goto disable_clk;
} }
} }
...@@ -1101,15 +1099,15 @@ int omap_bandgap_probe(struct platform_device *pdev) ...@@ -1101,15 +1099,15 @@ int omap_bandgap_probe(struct platform_device *pdev)
return 0; return 0;
disable_clk: disable_clk:
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bgp, CLK_CTRL))
clk_disable_unprepare(bg_ptr->fclock); clk_disable_unprepare(bgp->fclock);
put_clks: put_clks:
clk_put(bg_ptr->fclock); clk_put(bgp->fclock);
clk_put(bg_ptr->div_clk); clk_put(bgp->div_clk);
free_irqs: free_irqs:
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT)) { if (OMAP_BANDGAP_HAS(bgp, TSHUT)) {
free_irq(gpio_to_irq(bg_ptr->tshut_gpio), NULL); free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
gpio_free(bg_ptr->tshut_gpio); gpio_free(bgp->tshut_gpio);
} }
return ret; return ret;
...@@ -1118,102 +1116,102 @@ int omap_bandgap_probe(struct platform_device *pdev) ...@@ -1118,102 +1116,102 @@ int omap_bandgap_probe(struct platform_device *pdev)
static static
int omap_bandgap_remove(struct platform_device *pdev) int omap_bandgap_remove(struct platform_device *pdev)
{ {
struct omap_bandgap *bg_ptr = platform_get_drvdata(pdev); struct omap_bandgap *bgp = platform_get_drvdata(pdev);
int i; int i;
/* First thing is to remove sensor interfaces */ /* First thing is to remove sensor interfaces */
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
if (bg_ptr->conf->sensors[i].register_cooling) if (bgp->conf->sensors[i].register_cooling)
bg_ptr->conf->sensors[i].unregister_cooling(bg_ptr, i); bgp->conf->sensors[i].unregister_cooling(bgp, i);
if (bg_ptr->conf->remove_sensor) if (bgp->conf->remove_sensor)
bg_ptr->conf->remove_sensor(bg_ptr, i); bgp->conf->remove_sensor(bgp, i);
} }
omap_bandgap_power(bg_ptr, false); omap_bandgap_power(bgp, false);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bgp, CLK_CTRL))
clk_disable_unprepare(bg_ptr->fclock); clk_disable_unprepare(bgp->fclock);
clk_put(bg_ptr->fclock); clk_put(bgp->fclock);
clk_put(bg_ptr->div_clk); clk_put(bgp->div_clk);
if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) if (OMAP_BANDGAP_HAS(bgp, TALERT))
free_irq(bg_ptr->irq, bg_ptr); free_irq(bgp->irq, bgp);
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT)) { if (OMAP_BANDGAP_HAS(bgp, TSHUT)) {
free_irq(gpio_to_irq(bg_ptr->tshut_gpio), NULL); free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
gpio_free(bg_ptr->tshut_gpio); gpio_free(bgp->tshut_gpio);
} }
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int omap_bandgap_save_ctxt(struct omap_bandgap *bg_ptr) static int omap_bandgap_save_ctxt(struct omap_bandgap *bgp)
{ {
int i; int i;
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
struct temp_sensor_regval *rval; struct temp_sensor_regval *rval;
rval = &bg_ptr->conf->sensors[i].regval; rval = &bgp->conf->sensors[i].regval;
tsr = bg_ptr->conf->sensors[i].registers; tsr = bgp->conf->sensors[i].registers;
if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, MODE_CONFIG))
rval->bg_mode_ctrl = omap_bandgap_readl(bg_ptr, rval->bg_mode_ctrl = omap_bandgap_readl(bgp,
tsr->bgap_mode_ctrl); tsr->bgap_mode_ctrl);
if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (OMAP_BANDGAP_HAS(bgp, COUNTER))
rval->bg_counter = omap_bandgap_readl(bg_ptr, rval->bg_counter = omap_bandgap_readl(bgp,
tsr->bgap_counter); tsr->bgap_counter);
if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (OMAP_BANDGAP_HAS(bgp, TALERT)) {
rval->bg_threshold = omap_bandgap_readl(bg_ptr, rval->bg_threshold = omap_bandgap_readl(bgp,
tsr->bgap_threshold); tsr->bgap_threshold);
rval->bg_ctrl = omap_bandgap_readl(bg_ptr, rval->bg_ctrl = omap_bandgap_readl(bgp,
tsr->bgap_mask_ctrl); tsr->bgap_mask_ctrl);
} }
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, TSHUT_CONFIG))
rval->tshut_threshold = omap_bandgap_readl(bg_ptr, rval->tshut_threshold = omap_bandgap_readl(bgp,
tsr->tshut_threshold); tsr->tshut_threshold);
} }
return 0; return 0;
} }
static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr) static int omap_bandgap_restore_ctxt(struct omap_bandgap *bgp)
{ {
int i; int i;
for (i = 0; i < bg_ptr->conf->sensor_count; i++) { for (i = 0; i < bgp->conf->sensor_count; i++) {
struct temp_sensor_registers *tsr; struct temp_sensor_registers *tsr;
struct temp_sensor_regval *rval; struct temp_sensor_regval *rval;
u32 val = 0; u32 val = 0;
rval = &bg_ptr->conf->sensors[i].regval; rval = &bgp->conf->sensors[i].regval;
tsr = bg_ptr->conf->sensors[i].registers; tsr = bgp->conf->sensors[i].registers;
if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (OMAP_BANDGAP_HAS(bgp, COUNTER))
val = omap_bandgap_readl(bg_ptr, tsr->bgap_counter); val = omap_bandgap_readl(bgp, tsr->bgap_counter);
if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, TSHUT_CONFIG))
omap_bandgap_writel(bg_ptr, rval->tshut_threshold, omap_bandgap_writel(bgp, rval->tshut_threshold,
tsr->tshut_threshold); tsr->tshut_threshold);
/* Force immediate temperature measurement and update /* Force immediate temperature measurement and update
* of the DTEMP field * of the DTEMP field
*/ */
omap_bandgap_force_single_read(bg_ptr, i); omap_bandgap_force_single_read(bgp, i);
if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) if (OMAP_BANDGAP_HAS(bgp, COUNTER))
omap_bandgap_writel(bg_ptr, rval->bg_counter, omap_bandgap_writel(bgp, rval->bg_counter,
tsr->bgap_counter); tsr->bgap_counter);
if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG)) if (OMAP_BANDGAP_HAS(bgp, MODE_CONFIG))
omap_bandgap_writel(bg_ptr, rval->bg_mode_ctrl, omap_bandgap_writel(bgp, rval->bg_mode_ctrl,
tsr->bgap_mode_ctrl); tsr->bgap_mode_ctrl);
if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { if (OMAP_BANDGAP_HAS(bgp, TALERT)) {
omap_bandgap_writel(bg_ptr, rval->bg_threshold, omap_bandgap_writel(bgp, rval->bg_threshold,
tsr->bgap_threshold); tsr->bgap_threshold);
omap_bandgap_writel(bg_ptr, rval->bg_ctrl, omap_bandgap_writel(bgp, rval->bg_ctrl,
tsr->bgap_mask_ctrl); tsr->bgap_mask_ctrl);
} }
} }
...@@ -1223,28 +1221,28 @@ static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr) ...@@ -1223,28 +1221,28 @@ static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr)
static int omap_bandgap_suspend(struct device *dev) static int omap_bandgap_suspend(struct device *dev)
{ {
struct omap_bandgap *bg_ptr = dev_get_drvdata(dev); struct omap_bandgap *bgp = dev_get_drvdata(dev);
int err; int err;
err = omap_bandgap_save_ctxt(bg_ptr); err = omap_bandgap_save_ctxt(bgp);
omap_bandgap_power(bg_ptr, false); omap_bandgap_power(bgp, false);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bgp, CLK_CTRL))
clk_disable_unprepare(bg_ptr->fclock); clk_disable_unprepare(bgp->fclock);
return err; return err;
} }
static int omap_bandgap_resume(struct device *dev) static int omap_bandgap_resume(struct device *dev)
{ {
struct omap_bandgap *bg_ptr = dev_get_drvdata(dev); struct omap_bandgap *bgp = dev_get_drvdata(dev);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bgp, CLK_CTRL))
clk_prepare_enable(bg_ptr->fclock); clk_prepare_enable(bgp->fclock);
omap_bandgap_power(bg_ptr, true); omap_bandgap_power(bgp, true);
return omap_bandgap_restore_ctxt(bg_ptr); return omap_bandgap_restore_ctxt(bgp);
} }
static const struct dev_pm_ops omap_bandgap_dev_pm_ops = { static const struct dev_pm_ops omap_bandgap_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(omap_bandgap_suspend, SET_SYSTEM_SLEEP_PM_OPS(omap_bandgap_suspend,
......
drivers/staging/omap-thermal/omap-bandgap.h
View file @ d7f080e6
...@@ -269,8 +269,8 @@ struct omap_temp_sensor { ...@@ -269,8 +269,8 @@ struct omap_temp_sensor {
const int slope_pcb; const int slope_pcb;
const int constant_pcb; const int constant_pcb;
void *data; void *data;
int (*register_cooling)(struct omap_bandgap *bg_ptr, int id); int (*register_cooling)(struct omap_bandgap *bgp, int id);
int (*unregister_cooling)(struct omap_bandgap *bg_ptr, int id); int (*unregister_cooling)(struct omap_bandgap *bgp, int id);
}; };
/** /**
...@@ -345,27 +345,27 @@ struct omap_bandgap_data { ...@@ -345,27 +345,27 @@ struct omap_bandgap_data {
char *fclock_name; char *fclock_name;
char *div_ck_name; char *div_ck_name;
int sensor_count; int sensor_count;
int (*report_temperature)(struct omap_bandgap *bg_ptr, int id); int (*report_temperature)(struct omap_bandgap *bgp, int id);
int (*expose_sensor)(struct omap_bandgap *bg_ptr, int id, char *domain); int (*expose_sensor)(struct omap_bandgap *bgp, int id, char *domain);
int (*remove_sensor)(struct omap_bandgap *bg_ptr, int id); int (*remove_sensor)(struct omap_bandgap *bgp, int id);
/* this needs to be at the end */ /* this needs to be at the end */
struct omap_temp_sensor sensors[]; struct omap_temp_sensor sensors[];
}; };
int omap_bandgap_read_thot(struct omap_bandgap *bg_ptr, int id, int *thot); int omap_bandgap_read_thot(struct omap_bandgap *bgp, int id, int *thot);
int omap_bandgap_write_thot(struct omap_bandgap *bg_ptr, int id, int val); int omap_bandgap_write_thot(struct omap_bandgap *bgp, int id, int val);
int omap_bandgap_read_tcold(struct omap_bandgap *bg_ptr, int id, int *tcold); int omap_bandgap_read_tcold(struct omap_bandgap *bgp, int id, int *tcold);
int omap_bandgap_write_tcold(struct omap_bandgap *bg_ptr, int id, int val); int omap_bandgap_write_tcold(struct omap_bandgap *bgp, int id, int val);
int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_update_interval(struct omap_bandgap *bgp, int id,
int *interval); int *interval);
int omap_bandgap_write_update_interval(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_write_update_interval(struct omap_bandgap *bgp, int id,
u32 interval); u32 interval);
int omap_bandgap_read_temperature(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_read_temperature(struct omap_bandgap *bgp, int id,
int *temperature); int *temperature);
int omap_bandgap_set_sensor_data(struct omap_bandgap *bg_ptr, int id, int omap_bandgap_set_sensor_data(struct omap_bandgap *bgp, int id,
void *data); void *data);
void *omap_bandgap_get_sensor_data(struct omap_bandgap *bg_ptr, int id); void *omap_bandgap_get_sensor_data(struct omap_bandgap *bgp, int id);
#ifdef CONFIG_OMAP4_THERMAL #ifdef CONFIG_OMAP4_THERMAL
extern const struct omap_bandgap_data omap4430_data; extern const struct omap_bandgap_data omap4430_data;
......
drivers/staging/omap-thermal/omap-thermal-common.c
View file @ d7f080e6
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
struct omap_thermal_data { struct omap_thermal_data {
struct thermal_zone_device *omap_thermal; struct thermal_zone_device *omap_thermal;
struct thermal_cooling_device *cool_dev; struct thermal_cooling_device *cool_dev;
struct omap_bandgap *bg_ptr; struct omap_bandgap *bgp;
enum thermal_device_mode mode; enum thermal_device_mode mode;
struct work_struct thermal_wq; struct work_struct thermal_wq;
int sensor_id; int sensor_id;
...@@ -78,17 +78,17 @@ static inline int omap_thermal_get_temp(struct thermal_zone_device *thermal, ...@@ -78,17 +78,17 @@ static inline int omap_thermal_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp) unsigned long *temp)
{ {
struct omap_thermal_data *data = thermal->devdata; struct omap_thermal_data *data = thermal->devdata;
struct omap_bandgap *bg_ptr; struct omap_bandgap *bgp;
struct omap_temp_sensor *s; struct omap_temp_sensor *s;
int ret, tmp, pcb_temp, slope, constant; int ret, tmp, pcb_temp, slope, constant;
if (!data) if (!data)
return 0; return 0;
bg_ptr = data->bg_ptr; bgp = data->bgp;
s = &bg_ptr->conf->sensors[data->sensor_id]; s = &bgp->conf->sensors[data->sensor_id];
ret = omap_bandgap_read_temperature(bg_ptr, data->sensor_id, &tmp); ret = omap_bandgap_read_temperature(bgp, data->sensor_id, &tmp);
if (ret) if (ret)
return ret; return ret;
...@@ -236,32 +236,32 @@ static struct thermal_zone_device_ops omap_thermal_ops = { ...@@ -236,32 +236,32 @@ static struct thermal_zone_device_ops omap_thermal_ops = {
}; };
static struct omap_thermal_data static struct omap_thermal_data
*omap_thermal_build_data(struct omap_bandgap *bg_ptr, int id) *omap_thermal_build_data(struct omap_bandgap *bgp, int id)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = devm_kzalloc(bg_ptr->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(bgp->dev, sizeof(*data), GFP_KERNEL);
if (!data) { if (!data) {
dev_err(bg_ptr->dev, "kzalloc fail\n"); dev_err(bgp->dev, "kzalloc fail\n");
return NULL; return NULL;
} }
data->sensor_id = id; data->sensor_id = id;
data->bg_ptr = bg_ptr; data->bgp = bgp;
data->mode = THERMAL_DEVICE_ENABLED; data->mode = THERMAL_DEVICE_ENABLED;
INIT_WORK(&data->thermal_wq, omap_thermal_work); INIT_WORK(&data->thermal_wq, omap_thermal_work);
return data; return data;
} }
int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, int omap_thermal_expose_sensor(struct omap_bandgap *bgp, int id,
char *domain) char *domain)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = omap_bandgap_get_sensor_data(bg_ptr, id); data = omap_bandgap_get_sensor_data(bgp, id);
if (IS_ERR_OR_NULL(data)) if (IS_ERR_OR_NULL(data))
data = omap_thermal_build_data(bg_ptr, id); data = omap_thermal_build_data(bgp, id);
if (!data) if (!data)
return -EINVAL; return -EINVAL;
...@@ -273,44 +273,44 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, ...@@ -273,44 +273,44 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
NULL, FAST_TEMP_MONITORING_RATE, NULL, FAST_TEMP_MONITORING_RATE,
FAST_TEMP_MONITORING_RATE); FAST_TEMP_MONITORING_RATE);
if (IS_ERR_OR_NULL(data->omap_thermal)) { if (IS_ERR_OR_NULL(data->omap_thermal)) {
dev_err(bg_ptr->dev, "thermal zone device is NULL\n"); dev_err(bgp->dev, "thermal zone device is NULL\n");
return PTR_ERR(data->omap_thermal); return PTR_ERR(data->omap_thermal);
} }
data->omap_thermal->polling_delay = FAST_TEMP_MONITORING_RATE; data->omap_thermal->polling_delay = FAST_TEMP_MONITORING_RATE;
omap_bandgap_set_sensor_data(bg_ptr, id, data); omap_bandgap_set_sensor_data(bgp, id, data);
return 0; return 0;
} }
int omap_thermal_remove_sensor(struct omap_bandgap *bg_ptr, int id) int omap_thermal_remove_sensor(struct omap_bandgap *bgp, int id)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = omap_bandgap_get_sensor_data(bg_ptr, id); data = omap_bandgap_get_sensor_data(bgp, id);
thermal_zone_device_unregister(data->omap_thermal); thermal_zone_device_unregister(data->omap_thermal);
return 0; return 0;
} }
int omap_thermal_report_sensor_temperature(struct omap_bandgap *bg_ptr, int id) int omap_thermal_report_sensor_temperature(struct omap_bandgap *bgp, int id)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = omap_bandgap_get_sensor_data(bg_ptr, id); data = omap_bandgap_get_sensor_data(bgp, id);
schedule_work(&data->thermal_wq); schedule_work(&data->thermal_wq);
return 0; return 0;
} }
int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) int omap_thermal_register_cpu_cooling(struct omap_bandgap *bgp, int id)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = omap_bandgap_get_sensor_data(bg_ptr, id); data = omap_bandgap_get_sensor_data(bgp, id);
if (IS_ERR_OR_NULL(data)) if (IS_ERR_OR_NULL(data))
data = omap_thermal_build_data(bg_ptr, id); data = omap_thermal_build_data(bgp, id);
if (!data) if (!data)
return -EINVAL; return -EINVAL;
...@@ -318,20 +318,20 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) ...@@ -318,20 +318,20 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id)
/* Register cooling device */ /* Register cooling device */
data->cool_dev = cpufreq_cooling_register(cpu_present_mask); data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
if (IS_ERR_OR_NULL(data->cool_dev)) { if (IS_ERR_OR_NULL(data->cool_dev)) {
dev_err(bg_ptr->dev, dev_err(bgp->dev,
"Failed to register cpufreq cooling device\n"); "Failed to register cpufreq cooling device\n");
return PTR_ERR(data->cool_dev); return PTR_ERR(data->cool_dev);
} }
omap_bandgap_set_sensor_data(bg_ptr, id, data); omap_bandgap_set_sensor_data(bgp, id, data);
return 0; return 0;
} }
int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bg_ptr, int id) int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bgp, int id)
{ {
struct omap_thermal_data *data; struct omap_thermal_data *data;
data = omap_bandgap_get_sensor_data(bg_ptr, id); data = omap_bandgap_get_sensor_data(bgp, id);
cpufreq_cooling_unregister(data->cool_dev); cpufreq_cooling_unregister(data->cool_dev);
return 0; return 0;
......
drivers/staging/omap-thermal/omap-thermal.h
View file @ d7f080e6
...@@ -74,33 +74,33 @@ ...@@ -74,33 +74,33 @@
((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER) ((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER)
#ifdef CONFIG_OMAP_THERMAL #ifdef CONFIG_OMAP_THERMAL
int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, int omap_thermal_expose_sensor(struct omap_bandgap *bgp, int id,
char *domain); char *domain);
int omap_thermal_remove_sensor(struct omap_bandgap *bg_ptr, int id); int omap_thermal_remove_sensor(struct omap_bandgap *bgp, int id);
int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id); int omap_thermal_register_cpu_cooling(struct omap_bandgap *bgp, int id);
int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bg_ptr, int id); int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bgp, int id);
#else #else
static inline static inline
int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, int omap_thermal_expose_sensor(struct omap_bandgap *bgp, int id,
char *domain) char *domain)
{ {
return 0; return 0;
} }
static inline static inline
int omap_thermal_remove_sensor(struct omap_bandgap *bg_ptr, int id) int omap_thermal_remove_sensor(struct omap_bandgap *bgp, int id)
{ {
return 0; return 0;
} }
static inline static inline
int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) int omap_thermal_register_cpu_cooling(struct omap_bandgap *bgp, int id)
{ {
return 0; return 0;
} }
static inline static inline
int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bg_ptr, int id) int omap_thermal_unregister_cpu_cooling(struct omap_bandgap *bgp, int id)
{ {
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7