Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+3 -5
-4
arch/arm/boot/dts/am335x-boneblack.dts
··· 80 80 status = "okay"; 81 81 }; 82 82 }; 83 - 84 - &rtc { 85 - system-power-controller; 86 - };
+1 -1
arch/arm/boot/dts/am335x-evmsk.dts
··· 654 654 wlcore: wlcore@2 { 655 655 compatible = "ti,wl1271"; 656 656 reg = <2>; 657 - interrupt-parent = <&gpio1>; 657 + interrupt-parent = <&gpio0>; 658 658 interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ 659 659 ref-clock-frequency = <38400000>; 660 660 };
+2
arch/arm/boot/dts/omap3-devkit8000.dts
··· 110 110 nand@0,0 { 111 111 reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ 112 112 nand-bus-width = <16>; 113 + gpmc,device-width = <2>; 114 + ti,nand-ecc-opt = "sw"; 113 115 114 116 gpmc,sync-clk-ps = <0>; 115 117 gpmc,cs-on-ns = <0>;