diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 15:40:13 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 15:40:13 (GMT) |
commit | 71e84db1aab65ba71cb6d6d26b0f1e0d2eacc65b (patch) | |
tree | 1a6245bdac94571377339b87249f68bffa2b99bc /arch/arm/boot/dts/dra7.dtsi | |
parent | 590b9066185aebfd280bb94b033cf1ed44ac467e (diff) | |
parent | a2a2b8215621536a7620e31f36bede81bb86680b (diff) | |
download | linux-71e84db1aab65ba71cb6d6d26b0f1e0d2eacc65b.tar.xz |
Merge tag 'omap-for-v4.9/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "omap dts updates for v4.9 merge window, part 2" from Tony Lindgren:
Part two of device tree changes for omaps for v4.9 merge window. This
is mostly usability and non-critical fixes except for the addition of
beagleboard-x15 rev B1 support:
- Fix omap4 pandaboard SDIO WLAN latencies in idle mode by enabling wakeirq
- Usability fixes for WLAN, USB, LEDs and power button on omap5 boards
- Remove am57xx beagleboard-x15 pinmux configuration as the processor requires
that it's done in IO isolation in bootloader except for MMC and DCAN
- Add support for beagleboard-x15 rev B1 by moving most of the
configuration to am57xx-beagle-x15-common.dtsi
- Enable support for more than 2GB of memory for omap5 with LPAE with
#address-cells
- Fix omap3-gta04 backlight PWM frequency until the PWM driver
- Revert am335x dts changes related to cpufreq as the driver changes
still have not merged and the dts changes broke cpufreq
* tag 'omap-for-v4.9/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
Revert "ARM: dts: dra7: Move to operating-points-v2 table"
Revert "ARM: dts: am33xx: Move to operating-points-v2 table and ti-cpufreq driver"
Revert "ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu"
ARM: dts: omap3-gta04: reduce panel backlight PWM frequency to 83Hz
ARM: dts: Add support for more than 2GB of memory for omap5
ARM: dts: am57xx-beagle-x15: Add support for rev B1
ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869
ARM: dts: Fix LEDs for igepv5
ARM: dts: Add power button support for igepv5
ARM: dts: Configure omap5 OTG ID pin
ARM: dts: ARM: dts: Fix omap5 SDIO dat1 interrupt
ARM: dts: Configure panda SDIO WLAN wakeirq
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
-rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 147df90..d4fcd68 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -80,9 +80,11 @@ compatible = "arm,cortex-a15"; reg = <0>; - operating-points-v2 = <&cpu0_opp_table>; - ti,syscon-efuse = <&scm_wkup 0x20c 0xf80000 19>; - ti,syscon-rev = <&scm_wkup 0x204>; + operating-points = < + /* kHz uV */ + 1000000 1060000 + 1176000 1160000 + >; clocks = <&dpll_mpu_ck>; clock-names = "cpu"; @@ -96,24 +98,6 @@ }; }; - cpu0_opp_table: opp_table0 { - compatible = "operating-points-v2"; - opp-shared; - - opp_nom@1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt = <1060000 850000 1150000>; - opp-supported-hw = <0xFF 0x01>; - opp-suspend; - }; - - opp_od@1176000000 { - opp-hz = /bits/ 64 <1176000000>; - opp-microvolt = <1160000 885000 1160000>; - opp-supported-hw = <0xFF 0x02>; - }; - }; - /* * The soc node represents the soc top level view. It is used for IPs * that are not memory mapped in the MPU view or for the MPU itself. |