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

Commit a4a20fd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Nothing very controversial in here.  Most of the fixes are for OMAP
  this time around, with some orion/kirkwood and a tegra patch mixed in."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: Orion: Fix Virtual/Physical mixup with watchdog
  ARM: Kirkwood: clk_register_gate_fn: add fn assignment
  ARM: Orion5x - Restore parts of io.h, with rework
  ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
  ARM: OMAP2+: mux: fix sparse warning
  ARM: OMAP2+: CM: increase the module disable timeout
  ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
  ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
  ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
  ARM: OMAP: Fix Beagleboard DVI reset gpio
  arm/dts: OMAP2: Fix interrupt controller binding
  ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
  ARM: OMAP2+: Fix MUSB ifdefs for platform init code
  ARM: tegra: make tegra_cpu_reset_handler_enable() __init
  ARM: OMAP: PM: Lock clocks list while generating summary
  ARM: iconnect: Remove include of removed linux/spi/orion_spi.h
parents 2ecedc47 0fa1f060

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -589,6 +589,7 @@ config ARCH_ORION5X 
	select PCI

	select PCI

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select NEED_MACH_IO_H

	select PLAT_ORION

	select PLAT_ORION

	help

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Support for the following Marvell Orion 5x series SoCs:

arch/arm/boot/dts/omap2.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ 
			compatible = "ti,omap2-intc";

			compatible = "ti,omap2-intc";

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <1>;

			ti,intc-size = <96>;

			reg = <0x480FE000 0x1000>;

		};

		};





		uart1: serial@4806a000 {

		uart1: serial@4806a000 {

arch/arm/mach-kirkwood/board-iconnect.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -20,9 +20,6 @@ 
#include <linux/mv643xx_eth.h>

#include <linux/mv643xx_eth.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/leds.h>

#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <linux/spi/orion_spi.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/gpio_keys.h>

arch/arm/mach-kirkwood/common.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,7 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, 
	gate_fn->gate.flags = clk_gate_flags;

	gate_fn->gate.flags = clk_gate_flags;

	gate_fn->gate.lock = lock;

	gate_fn->gate.lock = lock;

	gate_fn->gate.hw.init = &init;

	gate_fn->gate.hw.init = &init;

	gate_fn->fn = fn;





	/* ops is the gate ops, but with our disable function */

	/* ops is the gate ops, but with our disable function */

	if (clk_gate_fn_ops.disable != clk_gate_fn_disable) {

	if (clk_gate_fn_ops.disable != clk_gate_fn_disable) {

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define IRQ_MASK_HIGH_OFF	0x0014

#define IRQ_MASK_HIGH_OFF	0x0014





#define TIMER_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0300)

#define TIMER_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0300)

#define TIMER_PHYS_BASE		(BRIDGE_PHYS_BASE | 0x0300)





#define L2_CONFIG_REG		(BRIDGE_VIRT_BASE | 0x0128)

#define L2_CONFIG_REG		(BRIDGE_VIRT_BASE | 0x0128)

#define L2_WRITETHROUGH		0x00000010

#define L2_WRITETHROUGH		0x00000010