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

Merge tag 'omap-for-v4.4/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v4.4-rc4" from Tony Lindgren

Few fixes for omaps for v4.4-rc cycle:

- Fix clock source for ARM TWD and global timers on am437x

- Always select REGULATOR_FIXED_VOLTAGE for omap2+ instead of
when MACH_OMAP3_PANDORA is selected

- Fix SPI DMA handles for dm816x as only some were mapped

- Fix up mbox cells for dm816x to make mailbox usable

* tag 'omap-for-v4.4/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am4372: fix clock source for arm twd and global timers
ARM: OMAP2+: enable REGULATOR_FIXED_VOLTAGE
ARM: dts: add dm816x missing spi DT dma handles
ARM: dts: add dm816x missing #mbox-cells

+17 -5
+2 -2
arch/arm/boot/dts/am4372.dtsi
··· 74 74 reg = <0x48240200 0x100>; 75 75 interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; 76 76 interrupt-parent = <&gic>; 77 - clocks = <&dpll_mpu_m2_ck>; 77 + clocks = <&mpu_periphclk>; 78 78 }; 79 79 80 80 local_timer: timer@48240600 { ··· 82 82 reg = <0x48240600 0x100>; 83 83 interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; 84 84 interrupt-parent = <&gic>; 85 - clocks = <&dpll_mpu_m2_ck>; 85 + clocks = <&mpu_periphclk>; 86 86 }; 87 87 88 88 l2-cache-controller@48242000 {
+8
arch/arm/boot/dts/am43xx-clocks.dtsi
··· 259 259 ti,invert-autoidle-bit; 260 260 }; 261 261 262 + mpu_periphclk: mpu_periphclk { 263 + #clock-cells = <0>; 264 + compatible = "fixed-factor-clock"; 265 + clocks = <&dpll_mpu_m2_ck>; 266 + clock-mult = <1>; 267 + clock-div = <2>; 268 + }; 269 + 262 270 dpll_ddr_ck: dpll_ddr_ck { 263 271 #clock-cells = <0>; 264 272 compatible = "ti,am3-dpll-clock";
+6 -2
arch/arm/boot/dts/dm816x.dtsi
··· 218 218 reg = <0x480c8000 0x2000>; 219 219 interrupts = <77>; 220 220 ti,hwmods = "mailbox"; 221 + #mbox-cells = <1>; 221 222 ti,mbox-num-users = <4>; 222 223 ti,mbox-num-fifos = <12>; 223 224 mbox_dsp: mbox_dsp { ··· 280 279 ti,spi-num-cs = <4>; 281 280 ti,hwmods = "mcspi1"; 282 281 dmas = <&edma 16 &edma 17 283 - &edma 18 &edma 19>; 284 - dma-names = "tx0", "rx0", "tx1", "rx1"; 282 + &edma 18 &edma 19 283 + &edma 20 &edma 21 284 + &edma 22 &edma 23>; 285 + dma-names = "tx0", "rx0", "tx1", "rx1", 286 + "tx2", "rx2", "tx3", "rx3"; 285 287 }; 286 288 287 289 mmc1: mmc@48060000 {
+1 -1
arch/arm/mach-omap2/Kconfig
··· 121 121 select NEON if CPU_V7 122 122 select PM 123 123 select REGULATOR 124 + select REGULATOR_FIXED_VOLTAGE 124 125 select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 125 126 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 126 127 select VFP ··· 202 201 depends on ARCH_OMAP3 203 202 default y 204 203 select OMAP_PACKAGE_CBB 205 - select REGULATOR_FIXED_VOLTAGE if REGULATOR 206 204 207 205 config MACH_NOKIA_N810 208 206 bool