diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:23:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:23:10 -0400 |
| commit | 632a686b8fd49245c7ae9271e2c705a06071ade3 (patch) | |
| tree | 2ba9c7a6ed07a70f25cf7b15a7b1d390f5ae51d9 /arch/arm/boot/dts/am335x-evmsk.dts | |
| parent | aad3ae05bba3e95a9748919131760d93c4fb581b (diff) | |
| parent | f25bf74c8862efdc30453d16d60cf22958a4873e (diff) | |
Merge tag 'omap-for-v4.1/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Few minimal omap device tree fixes for v4.1-rc series" from Tony Lindgren:
- Disable BeagleBone black RTC-only sleep mode because of hardare
related issues
- Fix NAND on Devkit8000
- Fix WLAN interrupt line on AM335x EVM-SK
* tag 'omap-for-v4.1/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK
ARM: dts: omap3-devkit8000: Fix NAND DT node
ARM: dts: am335x-boneblack: disable RTC-only sleep
Diffstat (limited to 'arch/arm/boot/dts/am335x-evmsk.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 87fc7a35e802..156d05efcb70 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts | |||
| @@ -654,7 +654,7 @@ | |||
| 654 | wlcore: wlcore@2 { | 654 | wlcore: wlcore@2 { |
| 655 | compatible = "ti,wl1271"; | 655 | compatible = "ti,wl1271"; |
| 656 | reg = <2>; | 656 | reg = <2>; |
| 657 | interrupt-parent = <&gpio1>; | 657 | interrupt-parent = <&gpio0>; |
| 658 | interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ | 658 | interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ |
| 659 | ref-clock-frequency = <38400000>; | 659 | ref-clock-frequency = <38400000>; |
| 660 | }; | 660 | }; |