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

Merge tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v3.18-rc4" from Tony Lindgren:

Few omap fixes for hangs and wrong pinctrl defines, and update
MAINTAINERS file to avoid missing PMIC and SoC related patches:

- Fix random hangs on am437x because of incorrect default
value for the DDR regulator

- Fix wrong partition name for NAND on am335x-evm

- Fix wrong pinctrl defines for dra7xx

- Update maintainers entries for PMICs and SoCs

* tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
pinctrl: dra: dt-bindings: Fix output pull up/down
MAINTAINERS: Update entry for omap related .dts files to cover new SoCs
MAINTAINERS: add more files under OMAP SUPPORT
ARM: dts: AM437x-SK-EVM: Fix DCDC3 voltage
ARM: dts: AM437x-GP-EVM: Fix DCDC3 voltage
ARM: dts: AM43x-EPOS-EVM: Fix DCDC3 voltage
ARM: dts: am335x-evm: Fix 5th NAND partition's name

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson f7efdad0 ae8f5041

options
unified split
Changed files
+29 -9
MAINTAINERS
arch
arm
boot
dts
am335x-evm.dts
am437x-gp-evm.dts
am437x-sk-evm.dts
am43x-epos-evm.dts
include
dt-bindings
pinctrl
dra.h
+20
MAINTAINERS
··· 6596 6596 S: Maintained 6597 6597 F: arch/arm/*omap*/ 6598 6598 F: drivers/i2c/busses/i2c-omap.c 6599 + F: drivers/irqchip/irq-omap-intc.c 6600 + F: drivers/mfd/*omap*.c 6601 + F: drivers/mfd/menelaus.c 6602 + F: drivers/mfd/palmas.c 6603 + F: drivers/mfd/tps65217.c 6604 + F: drivers/mfd/tps65218.c 6605 + F: drivers/mfd/tps65910.c 6606 + F: drivers/mfd/twl-core.[ch] 6607 + F: drivers/mfd/twl4030*.c 6608 + F: drivers/mfd/twl6030*.c 6609 + F: drivers/mfd/twl6040*.c 6610 + F: drivers/regulator/palmas-regulator*.c 6611 + F: drivers/regulator/pbias-regulator.c 6612 + F: drivers/regulator/tps65217-regulator.c 6613 + F: drivers/regulator/tps65218-regulator.c 6614 + F: drivers/regulator/tps65910-regulator.c 6615 + F: drivers/regulator/twl-regulator.c 6599 6616 F: include/linux/i2c-omap.h 6600 6617 6601 6618 OMAP DEVICE TREE SUPPORT ··· 6623 6606 S: Maintained 6624 6607 F: arch/arm/boot/dts/*omap* 6625 6608 F: arch/arm/boot/dts/*am3* 6609 + F: arch/arm/boot/dts/*am4* 6610 + F: arch/arm/boot/dts/*am5* 6611 + F: arch/arm/boot/dts/*dra7* 6626 6612 6627 6613 OMAP CLOCK FRAMEWORK SUPPORT 6628 6614 M: Paul Walmsley <paul@pwsan.com>
+1 -1
arch/arm/boot/dts/am335x-evm.dts
··· 489 489 reg = <0x00060000 0x00020000>; 490 490 }; 491 491 partition@4 { 492 - label = "NAND.u-boot-spl"; 492 + label = "NAND.u-boot-spl-os"; 493 493 reg = <0x00080000 0x00040000>; 494 494 }; 495 495 partition@5 {
+2 -2
arch/arm/boot/dts/am437x-gp-evm.dts
··· 291 291 dcdc3: regulator-dcdc3 { 292 292 compatible = "ti,tps65218-dcdc3"; 293 293 regulator-name = "vdcdc3"; 294 - regulator-min-microvolt = <1350000>; 295 - regulator-max-microvolt = <1350000>; 294 + regulator-min-microvolt = <1500000>; 295 + regulator-max-microvolt = <1500000>; 296 296 regulator-boot-on; 297 297 regulator-always-on; 298 298 };
+2 -2
arch/arm/boot/dts/am437x-sk-evm.dts
··· 363 363 dcdc3: regulator-dcdc3 { 364 364 compatible = "ti,tps65218-dcdc3"; 365 365 regulator-name = "vdds_ddr"; 366 - regulator-min-microvolt = <1350000>; 367 - regulator-max-microvolt = <1350000>; 366 + regulator-min-microvolt = <1500000>; 367 + regulator-max-microvolt = <1500000>; 368 368 regulator-boot-on; 369 369 regulator-always-on; 370 370 };
+2 -2
arch/arm/boot/dts/am43x-epos-evm.dts
··· 358 358 dcdc3: regulator-dcdc3 { 359 359 compatible = "ti,tps65218-dcdc3"; 360 360 regulator-name = "vdcdc3"; 361 - regulator-min-microvolt = <1350000>; 362 - regulator-max-microvolt = <1350000>; 361 + regulator-min-microvolt = <1500000>; 362 + regulator-max-microvolt = <1500000>; 363 363 regulator-boot-on; 364 364 regulator-always-on; 365 365 };
+2 -2
include/dt-bindings/pinctrl/dra.h
··· 40 40 41 41 /* Active pin states */ 42 42 #define PIN_OUTPUT (0 | PULL_DIS) 43 - #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP) 44 - #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) 43 + #define PIN_OUTPUT_PULLUP (PULL_UP) 44 + #define PIN_OUTPUT_PULLDOWN (0) 45 45 #define PIN_INPUT (INPUT_EN | PULL_DIS) 46 46 #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) 47 47 #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)