Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7307c00f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents f8f466c8 55ccb1a8

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1676,7 +1676,6 @@ config HZ 
	int

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default 100

arch/arm/boot/dts/am33xx.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -385,5 +385,19 @@ 
				mac-address = [ 00 00 00 00 00 00 ];

			};

		};



		ocmcram: ocmcram@40300000 {

			compatible = "ti,am3352-ocmcram";

			reg = <0x40300000 0x10000>;

			ti,hwmods = "ocmcram";

			ti,no_idle_on_suspend;

		};



		wkup_m3: wkup_m3@44d00000 {

			compatible = "ti,am3353-wkup-m3";

			reg = <0x44d00000 0x4000	/* M3 UMEM */

			       0x44d80000 0x2000>;	/* M3 DMEM */

			ti,hwmods = "wkup_m3";

		};

	};

};

arch/arm/mach-omap2/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ 
	 omap_device.o sram.o



omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o \

hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \

					  clkt_dpll.o clkt_clksel.o
@@ -56,6 +56,7 @@ AFLAGS_sram34xx.o :=-Wa,-march=armv7-a 
# Restart code (OMAP4/5 currently in omap4-common.c)

obj-$(CONFIG_SOC_OMAP2420)		+= omap2-restart.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap2-restart.o

obj-$(CONFIG_SOC_AM33XX)		+= am33xx-restart.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap3-restart.o



# Pin multiplexing

arch/arm/mach-omap2/am33xx-restart.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * am33xx-restart.c - Code common to all AM33xx machines.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/kernel.h>



#include "common.h"

#include "prm-regbits-33xx.h"

#include "prm33xx.h"



/**

 * am3xx_restart - trigger a software restart of the SoC

 * @mode: the "reboot mode", see arch/arm/kernel/{setup,process}.c

 * @cmd: passed from the userspace program rebooting the system (if provided)

 *

 * Resets the SoC.  For @cmd, see the 'reboot' syscall in

 * kernel/sys.c.  No return value.

 */

void am33xx_restart(char mode, const char *cmd)

{

	/* TODO: Handle mode and cmd if necessary */



	am33xx_prm_rmw_reg_bits(AM33XX_GLOBAL_WARM_SW_RST_MASK,

				AM33XX_GLOBAL_WARM_SW_RST_MASK,

				AM33XX_PRM_DEVICE_MOD,

				AM33XX_PRM_RSTCTRL_OFFSET);



	/* OCP barrier */

	(void)am33xx_prm_read_reg(AM33XX_PRM_DEVICE_MOD,

				  AM33XX_PRM_RSTCTRL_OFFSET);

}

arch/arm/mach-omap2/am35xx-emac.c

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, 
{

	struct platform_device *pdev;



	pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len,

				 false);

	pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len);

	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",

		     oh->class->name, oh->name);