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

Commit 4025fa97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-non-critical-for-linus' of... 

Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC non-critical fixes from Olof Johansson:
 "Here's a small collection of fixes accrued during the last release
  that weren't considered severe enough to merge during the -rc series.

  A few of these are around resurrecting TI81xx support that's been
  broken for quite a while, the rest are smaller fixes -- most for PXA
  but a few across the board.

  There are also some updates to MAINTAINERS here, in particular for
  Broadcom platforms"

* tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  MAINTAINERS: fix git repositories for Broadcom SoCs
  ARM: pxa: fix broken isa interrupts for zeus and viper
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
  ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
  ARM: AM43xx: hwmod: set DSS submodule parent hwmods
  ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
  MAINTAINERS: add maintainer for OMAP hwmod data
  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
  MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
  MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
  MAINTAINERS: update Broadcom Cygnus SoC git tree
  MAINTAINERS: move BCM63xx ARM-based SoCs git tree
  hx4700: regulator: declare full constraints
  ARM: pxa: add regulator_has_full_constraints to spitz board file
  ARM: pxa: add regulator_has_full_constraints to poodle board file
  ...
parents c397f8fa 11fe05de

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -2144,7 +2144,7 @@ F: arch/arm/boot/dts/bcm470* 
BROADCOM BCM63XX ARM ARCHITECTURE

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	linux-arm-kernel@lists.infradead.org

T:	git git://git.github.com/brcm/linux.git

T:	git git://github.com/broadcom/arm-bcm63xx.git

S:	Maintained

F:	arch/arm/mach-bcm/bcm63xx.c

F:	arch/arm/include/debug/bcm63xx.S
@@ -2161,6 +2161,7 @@ M: Brian Norris <computersforpeace@gmail.com> 
M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

F:	arch/arm/mach-bcm/*brcmstb*

F:	arch/arm/boot/dts/bcm7*.dts*
@@ -2170,6 +2171,7 @@ BROADCOM BMIPS MIPS ARCHITECTURE 
M:	Kevin Cernekee <cernekee@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	linux-mips@linux-mips.org

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

F:	arch/mips/bmips/*

F:	arch/mips/include/asm/mach-bmips/*
@@ -2212,7 +2214,7 @@ M: Ray Jui <rjui@broadcom.com> 
M:	Scott Branden <sbranden@broadcom.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://git.github.com/brcm/linux.git

T:	git git://github.com/broadcom/cygnus-linux.git

S:	Maintained

N:	iproc

N:	cygnus
@@ -7044,6 +7046,12 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod*data*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

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
@@ -118,7 +118,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);
@@ -171,6 +172,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)