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

Commit 2b590189 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.20/fixes-not-urgent-pt1' of... 

Merge tag 'omap-for-v3.20/fixes-not-urgent-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap non-urgent fixes for v3.20" from Tony Lindgren:

Non-urgent fixes for omap variant dm816x that has been in a sorry
broken half merged state for a few years now. This gets us to the
point where we can boot it properly once the related SoC data is
added. Note that we've already made dm816x device tree only by
removing the known broken board file.

* tag 'omap-for-v3.20/fixes-not-urgent-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Disable omap3 PM init for ti81xx
  ARM: OMAP2+: Fix reboot for 81xx
  ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
  ARM: OMAP2+: Fix ti81xx class type
  ARM: OMAP2+: Fix ti81xx devtype
  ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8614f9f7 13efcb18

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,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_TI81XX)		+= ti81xx-restart.o

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

obj-$(CONFIG_SOC_AM43XX)		+= omap4-restart.o

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

arch/arm/mach-omap2/clock.c

+3 −0
Original line number Diff line number Diff line
@@ -620,6 +620,9 @@ void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks) 


	for (i = 0; i < num_clocks; i++) {

		init_clk = clk_get(NULL, clk_names[i]);

		if (WARN(IS_ERR(init_clk), "could not find init clock %s\n",

				clk_names[i]))

			continue;

		clk_prepare_enable(init_clk);

	}

}

arch/arm/mach-omap2/common.h

+10 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ void omap3630_init_early(void); 
void omap3_init_early(void);	/* Do not use this one */

void am33xx_init_early(void);

void am35xx_init_early(void);

void ti81xx_init_early(void);

void ti814x_init_early(void);

void ti816x_init_early(void);

void am33xx_init_early(void);

void am43xx_init_early(void);

void am43xx_init_late(void);
@@ -163,6 +164,14 @@ static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd) 
}

#endif



#ifdef CONFIG_SOC_TI81XX

void ti81xx_restart(enum reboot_mode mode, const char *cmd);

#else

static inline void ti81xx_restart(enum reboot_mode mode, const char *cmd)

{

}

#endif



#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \

	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)

void omap44xx_restart(enum reboot_mode mode, const char *cmd);

arch/arm/mach-omap2/control.h

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define OMAP343X_CONTROL_GENERAL_WKUP	0xa60



/* TI81XX spefic control submodules */

#define TI81XX_CONTROL_DEVBOOT		0x040

#define TI81XX_CONTROL_DEVCONF		0x600



/* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */
@@ -246,6 +247,9 @@ 
#define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250

#define OMAP3_PADCONF_SAD2D_IDLEACK    0x254



/* TI81XX CONTROL_DEVBOOT register offsets */

#define TI81XX_CONTROL_STATUS		(TI81XX_CONTROL_DEVBOOT + 0x000)



/* TI81XX CONTROL_DEVCONF register offsets */

#define TI81XX_CONTROL_DEVICE_ID	(TI81XX_CONTROL_DEVCONF + 0x000)

arch/arm/mach-omap2/id.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ int omap_type(void) 


	if (cpu_is_omap24xx()) {

		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);

	} else if (cpu_is_ti81xx()) {

		val = omap_ctrl_readl(TI81XX_CONTROL_STATUS);

	} else if (soc_is_am33xx() || soc_is_am43xx()) {

		val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);

	} else if (cpu_is_omap34xx()) {