diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 17:15:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 17:15:36 -0800 |
| commit | f0d0b8cb6bb361bd88f10900e9716eec73e262d9 (patch) | |
| tree | 4648de6fb61e7e719d37b5fd6d34e6dceb0ec249 /MAINTAINERS | |
| parent | 37b3785b136289b36f5403b4f59b2dc47c35c485 (diff) | |
| parent | 8c4bc910633d942b4422e8b264c39a48e230a261 (diff) | |
| download | linux-f0d0b8cb6bb361bd88f10900e9716eec73e262d9.tar.gz linux-f0d0b8cb6bb361bd88f10900e9716eec73e262d9.tar.bz2 linux-f0d0b8cb6bb361bd88f10900e9716eec73e262d9.zip | |
Merge tag 'omap-for-v4.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC changes for omaps for v4.11 merge window. This adds support
for keeping the interconnect target module active for uart if
earlycon is specified. And we're adding Aaro Koskinen as a
co-maintainer for omap1 to make sure things stay working for
omap1. The other changes are mostly clean-up of old legacy code:
- Remove unused omap_display_init()
- Make omapdss_find_dss_of_node() function static
- Add support for earlycon
- Tidy up omap1 usb logging output with pr_cont
- Make omap_otg_init() static
- Delete redundant CPU class checks for omap1
- Remove unused mpurate cmdline option that has not done
anything for past 1.5 years at least
* tag 'omap-for-v4.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: clock: Remove unused mpurate cmdline option
ARM: OMAP2+: omap_hwmod: Add support for earlycon
MAINTAINERS: Add Aaro Koskinen as TI omap1 SoC co-maintainer
ARM: OMAP1: USB: delete redundant CPU class checks
ARM: OMAP1: USB: make omap_otg_init() static
ARM: OMAP1: USB: tidy up logging output
ARM: OMAP2+: Make the omapdss_find_dss_of_node() function static
ARM: OMAP2+: Remove unused omap_display_init() function
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f0420a0da5b..5e92f5500729 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8919,7 +8919,20 @@ M: Josh Poimboeuf <jpoimboe@redhat.com> S: Supported F: tools/objtool/ -OMAP SUPPORT +OMAP1 SUPPORT +M: Aaro Koskinen <aaro.koskinen@iki.fi> +M: Tony Lindgren <tony@atomide.com> +L: linux-omap@vger.kernel.org +Q: http://patchwork.kernel.org/project/linux-omap/list/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git +S: Maintained +F: arch/arm/mach-omap1/ +F: arch/arm/plat-omap/ +F: arch/arm/configs/omap1_defconfig +F: drivers/i2c/busses/i2c-omap.c +F: include/linux/i2c-omap.h + +OMAP2+ SUPPORT M: Tony Lindgren <tony@atomide.com> L: linux-omap@vger.kernel.org W: http://www.muru.com/linux/omap/ @@ -8927,8 +8940,8 @@ W: http://linux.omap.com/ Q: http://patchwork.kernel.org/project/linux-omap/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git S: Maintained -F: arch/arm/*omap*/ -F: arch/arm/configs/omap1_defconfig +F: arch/arm/mach-omap2/ +F: arch/arm/plat-omap/ F: arch/arm/configs/omap2plus_defconfig F: drivers/i2c/busses/i2c-omap.c F: drivers/irqchip/irq-omap-intc.c |