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 /arch/arm/boot | |
| 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
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 12 |
1 files changed, 2 insertions, 10 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; */ |