diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-05-05 00:28:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | d461ebe9ada981f1aea84e762e79bc3771cb65c7 (patch) | |
| tree | 5dd37281deff1c4dc30bd32d08a8d1a8152fd956 | |
| parent | 6551bfc47e36b80d783af26fa36b3df163308f15 (diff) | |
| parent | 9fed79637320f99a185545ae4982ba25c681fcde (diff) | |
| download | olio-linux-3.10-d461ebe9ada981f1aea84e762e79bc3771cb65c7.tar.xz olio-linux-3.10-d461ebe9ada981f1aea84e762e79bc3771cb65c7.zip | |
Merge "Further minor fixes to tps65910 and interrupts. No smoking guns, just minor tweaks and some clean-up." into android-3.10-bringup
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 12 | ||||
| -rw-r--r-- | drivers/mfd/tps65910.c | 9 | ||||
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 2 |
3 files changed, 8 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 41b52faec8e..5e6f915499a 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -310,18 +310,15 @@ dev_pins: pinmux_pv_pins { /include/ "tps65910.dtsi" &tps { - interrupts = <7>; /* SYS_NIRQ */ interrupt-parent = <&intc>; + interrupts = <7>; /* SYS_NIRQ */ -#interrupt-cells = <2>; + #interrupt-cells = <1>; interrupt-controller; /* This is from HEAD */ /* ti,en-ck32k-xtal; */ - /* set SR_CTL_I2C_SEL - access to smartreflex registers by control i2c */ - /* ti,system-power-controller; */ - /* This is from GL's suspend branch */ /* crystal oscillator is installed on the board */ @@ -375,11 +372,6 @@ dev_pins: pinmux_pv_pins { vdd2_reg: regulator@3 { /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ /* - - regulator-name = "vdd_core"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1200000>; - regulator-boot-on; regulator-always-on; */ diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index f40d98b892c..7d1a1769bb1 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -367,7 +367,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, dev = tps65910->dev; - /* set polarity of SLLEEPSIG requst ot enter OFF mode */ + /* set polarity of SLEEPSIG request to enter OFF mode */ ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL2, DEVCTRL2_SLEEPSIG_POL_MASK); if (ret < 0) { @@ -376,7 +376,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, } /* - * set polarity of SLLEEPSIG requst to enter OFF mode + * set polarity of SLEEPSIG request to enter OFF mode * before enabling sleep */ ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL2, @@ -503,7 +503,8 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, board_info->slp_keepon.clkout32k_keepon = prop; board_info->irq = client->irq; - board_info->irq_base = -1; + /* board_info->irq_base = -1; */ + board_info->irq_base = 0; /* OLIO: if (-1) is true ... seems weird. */ board_info->pm_off = of_property_read_bool(np, "ti,system-power-controller"); @@ -534,7 +535,7 @@ static void tps65910_power_off(void) } static int tps65910_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) + const struct i2c_device_id *id) { struct tps65910 *tps65910; struct tps65910_board *pmic_plat_data; diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 46e5f663151..0e42a7be2ab 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -410,7 +410,7 @@ static unsigned int tps65910_get_mode(struct regulator_dev *dev) struct tps65910_reg *pmic = rdev_get_drvdata(dev); int ret, reg, value, id = rdev_get_id(dev); - dev_info(&(dev->dev), "Getting mode for regulator: %d", reg); + /* dev_info(&(dev->dev), "Getting mode for regulator: %d", reg); */ reg = pmic->get_ctrl_reg(id); if (reg < 0) return reg; |