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

Commit 71e45bd2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux into next/soc 

From Jason Cooper:
mvebu drivers for v3.9
 - use rtc-mv in mvebu armv7 SoCs
 - add pci-e hotplug for kirkwood

Depends on:
 - tags/mvebu_fixes_for_v3.8-rc6

* tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux:
  cpuidle: kirkwood: Move out of mach directory
  rtc: Add support of rtc-mv for MVEBU SoCs
  ARM: Kirkwood: Support basic hotplug for PCI-E
  arm: mvebu: i2c come back in defconfig
  arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
  Dove: activate GPIO interrupts in DT
parents 469da620 9cfc94eb

arch/arm/boot/dts/dove.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
			reg = <0xd0400 0x20>;

			ngpios = <32>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <12>, <13>, <14>, <60>;

		};
@@ -103,6 +104,7 @@ 
			reg = <0xd0420 0x20>;

			ngpios = <32>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <61>;

		};

arch/arm/configs/kirkwood_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_AEABI=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE_KIRKWOOD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/mvebu_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ CONFIG_MVNETA=y 
CONFIG_MARVELL_PHY=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_MV64XXX=y

CONFIG_SERIAL_8250_DW=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

arch/arm/mach-kirkwood/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o 
obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o

obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o



obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o

obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o

obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o

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

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ static void __init kirkwood_dt_init(void) 
	/* Setup root of clk tree */

	kirkwood_of_clk_init();



	kirkwood_cpuidle_init();



#ifdef CONFIG_KEXEC

	kexec_reinit = kirkwood_enable_pcie;

#endif