diff options
| author | Tero Kristo | 2016-06-14 03:10:32 -0500 |
|---|---|---|
| committer | Tero Kristo | 2016-06-14 03:10:32 -0500 |
| commit | e36550f0b17984893b767f7a0fec56c36c84ec41 (patch) | |
| tree | ec9b1ac4cbd7a2e3a68cd2fa4247c648a7f3f3dd | |
| parent | e56808779cc5a72f471cbb396dd6b1d86eff8b7e (diff) | |
| parent | 9c24db846241e376453e0a11a44443b6d30ef21d (diff) | |
| download | kernel-audio-e36550f0b17984893b767f7a0fec56c36c84ec41.tar.gz kernel-audio-e36550f0b17984893b767f7a0fec56c36c84ec41.tar.xz kernel-audio-e36550f0b17984893b767f7a0fec56c36c84ec41.zip | |
Merge branch 'platform-ti-linux-4.4.y-golden' into platform-ti-linux-4.4.y-next
| -rw-r--r-- | arch/arm/boot/dts/am437x-sk-evm.dts | 2 | ||||
| -rw-r--r-- | drivers/soc/ti/ti-opp-domain.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts index 18a34456750e..5f67001e1d30 100644 --- a/arch/arm/boot/dts/am437x-sk-evm.dts +++ b/arch/arm/boot/dts/am437x-sk-evm.dts | |||
| @@ -490,7 +490,7 @@ | |||
| 490 | status = "okay"; | 490 | status = "okay"; |
| 491 | pinctrl-names = "default"; | 491 | pinctrl-names = "default"; |
| 492 | pinctrl-0 = <&i2c0_pins>; | 492 | pinctrl-0 = <&i2c0_pins>; |
| 493 | clock-frequency = <400000>; | 493 | clock-frequency = <100000>; |
| 494 | 494 | ||
| 495 | tps@24 { | 495 | tps@24 { |
| 496 | compatible = "ti,tps65218"; | 496 | compatible = "ti,tps65218"; |
diff --git a/drivers/soc/ti/ti-opp-domain.c b/drivers/soc/ti/ti-opp-domain.c index 10e16b560dc8..528776dbe252 100644 --- a/drivers/soc/ti/ti-opp-domain.c +++ b/drivers/soc/ti/ti-opp-domain.c | |||
| @@ -277,7 +277,7 @@ static int ti_oppdm_do_transition(struct device *dev, | |||
| 277 | if (do_abb_first && !IS_ERR(data->vbb_reg)) { | 277 | if (do_abb_first && !IS_ERR(data->vbb_reg)) { |
| 278 | dev_dbg(dev, "vbb pre %duV[min %duV max %duV]\n", uv, uv_min, | 278 | dev_dbg(dev, "vbb pre %duV[min %duV max %duV]\n", uv, uv_min, |
| 279 | uv_max); | 279 | uv_max); |
| 280 | ret = regulator_set_voltage_triplet(data->vdd_reg, uv_min, | 280 | ret = regulator_set_voltage_triplet(data->vbb_reg, uv_min, |
| 281 | uv, uv_max); | 281 | uv, uv_max); |
| 282 | if (ret) { | 282 | if (ret) { |
| 283 | dev_err(dev, | 283 | dev_err(dev, |
| @@ -302,7 +302,7 @@ static int ti_oppdm_do_transition(struct device *dev, | |||
| 302 | if (!do_abb_first && !IS_ERR(data->vbb_reg)) { | 302 | if (!do_abb_first && !IS_ERR(data->vbb_reg)) { |
| 303 | dev_dbg(dev, "vbb post %duV[min %duV max %duV]\n", uv, uv_min, | 303 | dev_dbg(dev, "vbb post %duV[min %duV max %duV]\n", uv, uv_min, |
| 304 | uv_max); | 304 | uv_max); |
| 305 | ret = regulator_set_voltage_triplet(data->vdd_reg, uv_min, | 305 | ret = regulator_set_voltage_triplet(data->vbb_reg, uv_min, |
| 306 | uv, uv_max); | 306 | uv, uv_max); |
| 307 | if (ret) { | 307 | if (ret) { |
| 308 | dev_err(dev, | 308 | dev_err(dev, |