Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late OMAP changes from Olof Johansson: "This branch contains changes for OMAP that came in late during the release staging, close to when the merge window opened. It contains, among other things: - OMAP PM fixes and some patches for audio device integration - OMAP clock fixes related to common clock conversion - A set of patches cleaning up WFI entry and blocking. - A set of fixes and IP block support for PM on TI AM33xx SoCs (Beaglebone, etc) - A set of smaller fixes and cleanups around AM33xx restart and revision detection, as well as removal of some dead code (CONFIG_32K_TIMER_HZ)" * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits) ARM: omap2: include linux/errno.h in hwmod_reset ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default ARM: OMAP4: hwmod data: Enable AESS hwmod device ARM: OMAP4: hwmod data: Update AESS data with memory bank area ARM: OMAP4+: AESS: enable internal auto-gating during initial setup ASoC: TI AESS: add autogating-enable function, callable from architecture code ARM: OMAP2+: hwmod: add enable_preprogram hook ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init() ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3 ARM: OMAP2+: AM33XX: Update the hardreset API ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files ...
Showing
- arch/arm/Kconfig 0 additions, 1 deletionarch/arm/Kconfig
- arch/arm/boot/dts/am33xx.dtsi 14 additions, 0 deletionsarch/arm/boot/dts/am33xx.dtsi
- arch/arm/mach-omap2/Makefile 2 additions, 1 deletionarch/arm/mach-omap2/Makefile
- arch/arm/mach-omap2/am33xx-restart.c 34 additions, 0 deletionsarch/arm/mach-omap2/am33xx-restart.c
- arch/arm/mach-omap2/am35xx-emac.c 1 addition, 2 deletionsarch/arm/mach-omap2/am35xx-emac.c
- arch/arm/mach-omap2/board-generic.c 1 addition, 0 deletionsarch/arm/mach-omap2/board-generic.c
- arch/arm/mach-omap2/cclock33xx_data.c 6 additions, 4 deletionsarch/arm/mach-omap2/cclock33xx_data.c
- arch/arm/mach-omap2/cclock3xxx_data.c 9 additions, 1 deletionarch/arm/mach-omap2/cclock3xxx_data.c
- arch/arm/mach-omap2/cclock44xx_data.c 12 additions, 1 deletionarch/arm/mach-omap2/cclock44xx_data.c
- arch/arm/mach-omap2/clock.h 11 additions, 0 deletionsarch/arm/mach-omap2/clock.h
- arch/arm/mach-omap2/cm33xx.c 0 additions, 3 deletionsarch/arm/mach-omap2/cm33xx.c
- arch/arm/mach-omap2/cm33xx.h 3 additions, 6 deletionsarch/arm/mach-omap2/cm33xx.h
- arch/arm/mach-omap2/common.h 8 additions, 0 deletionsarch/arm/mach-omap2/common.h
- arch/arm/mach-omap2/devices.c 1 addition, 1 deletionarch/arm/mach-omap2/devices.c
- arch/arm/mach-omap2/dpll3xxx.c 3 additions, 2 deletionsarch/arm/mach-omap2/dpll3xxx.c
- arch/arm/mach-omap2/id.c 12 additions, 2 deletionsarch/arm/mach-omap2/id.c
- arch/arm/mach-omap2/omap_hwmod.c 19 additions, 4 deletionsarch/arm/mach-omap2/omap_hwmod.c
- arch/arm/mach-omap2/omap_hwmod.h 8 additions, 0 deletionsarch/arm/mach-omap2/omap_hwmod.h
- arch/arm/mach-omap2/omap_hwmod_33xx_data.c 278 additions, 165 deletionsarch/arm/mach-omap2/omap_hwmod_33xx_data.c
- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 6 additions, 1 deletionarch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Loading
Please register or sign in to comment