diff options
author | Olof Johansson <olof@lixom.net> | 2014-11-16 18:09:53 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-11-16 18:09:53 -0500 |
commit | f7efdad02551c0dd64160c766c37aeddebb42a11 (patch) | |
tree | 233e8fc595321057d0e88e6cc898ccc273ddab8a /MAINTAINERS | |
parent | ae8f5041a5422016ae21d6f9d0bfa2caa839590f (diff) | |
parent | 73b3a6657a88ef5348a0d69c9a8107d6f01ae862 (diff) |
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7b690fc1e449..e55d22745ecc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6596,6 +6596,23 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git | |||
6596 | S: Maintained | 6596 | S: Maintained |
6597 | F: arch/arm/*omap*/ | 6597 | F: arch/arm/*omap*/ |
6598 | F: drivers/i2c/busses/i2c-omap.c | 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 | F: include/linux/i2c-omap.h | 6616 | F: include/linux/i2c-omap.h |
6600 | 6617 | ||
6601 | OMAP DEVICE TREE SUPPORT | 6618 | OMAP DEVICE TREE SUPPORT |
@@ -6606,6 +6623,9 @@ L: devicetree@vger.kernel.org | |||
6606 | S: Maintained | 6623 | S: Maintained |
6607 | F: arch/arm/boot/dts/*omap* | 6624 | F: arch/arm/boot/dts/*omap* |
6608 | F: arch/arm/boot/dts/*am3* | 6625 | F: arch/arm/boot/dts/*am3* |
6626 | F: arch/arm/boot/dts/*am4* | ||
6627 | F: arch/arm/boot/dts/*am5* | ||
6628 | F: arch/arm/boot/dts/*dra7* | ||
6609 | 6629 | ||
6610 | OMAP CLOCK FRAMEWORK SUPPORT | 6630 | OMAP CLOCK FRAMEWORK SUPPORT |
6611 | M: Paul Walmsley <paul@pwsan.com> | 6631 | M: Paul Walmsley <paul@pwsan.com> |