|
@@ -142,13 +142,13 @@ struct chip_desc {
|
|
irq_handler_t irq_handler;
|
|
irq_handler_t irq_handler;
|
|
const struct rtc_class_ops *rtc_ops;
|
|
const struct rtc_class_ops *rtc_ops;
|
|
u16 trickle_charger_reg;
|
|
u16 trickle_charger_reg;
|
|
- u8 (*do_trickle_setup)(struct ds1307 *, uint32_t,
|
|
|
|
|
|
+ u8 (*do_trickle_setup)(struct ds1307 *, u32,
|
|
bool);
|
|
bool);
|
|
};
|
|
};
|
|
|
|
|
|
static int ds1307_get_time(struct device *dev, struct rtc_time *t);
|
|
static int ds1307_get_time(struct device *dev, struct rtc_time *t);
|
|
static int ds1307_set_time(struct device *dev, struct rtc_time *t);
|
|
static int ds1307_set_time(struct device *dev, struct rtc_time *t);
|
|
-static u8 do_trickle_setup_ds1339(struct ds1307 *, uint32_t ohms, bool diode);
|
|
|
|
|
|
+static u8 do_trickle_setup_ds1339(struct ds1307 *, u32 ohms, bool diode);
|
|
static irqreturn_t rx8130_irq(int irq, void *dev_id);
|
|
static irqreturn_t rx8130_irq(int irq, void *dev_id);
|
|
static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t);
|
|
static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t);
|
|
static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t);
|
|
static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t);
|
|
@@ -963,7 +963,7 @@ static int ds1307_nvram_write(void *priv, unsigned int offset, void *val,
|
|
/*----------------------------------------------------------------------*/
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
|
static u8 do_trickle_setup_ds1339(struct ds1307 *ds1307,
|
|
static u8 do_trickle_setup_ds1339(struct ds1307 *ds1307,
|
|
- uint32_t ohms, bool diode)
|
|
|
|
|
|
+ u32 ohms, bool diode)
|
|
{
|
|
{
|
|
u8 setup = (diode) ? DS1307_TRICKLE_CHARGER_DIODE :
|
|
u8 setup = (diode) ? DS1307_TRICKLE_CHARGER_DIODE :
|
|
DS1307_TRICKLE_CHARGER_NO_DIODE;
|
|
DS1307_TRICKLE_CHARGER_NO_DIODE;
|
|
@@ -989,7 +989,7 @@ static u8 do_trickle_setup_ds1339(struct ds1307 *ds1307,
|
|
static u8 ds1307_trickle_init(struct ds1307 *ds1307,
|
|
static u8 ds1307_trickle_init(struct ds1307 *ds1307,
|
|
const struct chip_desc *chip)
|
|
const struct chip_desc *chip)
|
|
{
|
|
{
|
|
- uint32_t ohms;
|
|
|
|
|
|
+ u32 ohms;
|
|
bool diode = true;
|
|
bool diode = true;
|
|
|
|
|
|
if (!chip->do_trickle_setup)
|
|
if (!chip->do_trickle_setup)
|