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

Commit 64041417 authored Sep 09, 2013 by Linus Torvalds

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

Pull ARM SoC late changes from Kevin Hilman:
 "These are changes that arrived a little late before the merge window,
  or had dependencies on previous branches.

  Highlights:
   - ux500: misc.  cleanup, fixup I2C devices
   - exynos: DT updates for RTC; PM updates
   - at91: DT updates for NAND; new platforms added to generic defconfig
   - sunxi: DT updates: cubieboard2, pinctrl driver, gated clocks
   - highbank: LPAE fixes, select necessary ARM errata
   - omap: PM fixes and improvements; OMAP5 mailbox support
   - omap: basic support for new DRA7xx SoCs"

* tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
  ARM: dts: vexpress: Add CCI node to TC2 device-tree
  ARM: EXYNOS: Skip C1 cpuidle state for exynos5440
  ARM: EXYNOS: always enable PM domains support for EXYNOS4X12
  ARM: highbank: clean-up some unused includes
  ARM: sun7i: Enable the A20 clocks in the DTSI
  ARM: sun6i: Enable clock support in the DTSI
  ARM: sun5i: dt: Use the A10s gates in the DTSI
  ARM: at91: at91_dt_defconfig: enable rm9200 support
  ARM: dts: add ADC device tree node for exynos5420/5250
  ARM: dts: Add RTC DT node to Exynos5420 SoC
  ARM: dts: Update the "status" property of RTC DT node for Exynos5250 SoC
  ARM: dts: Fix the RTC DT node name for Exynos5250
  irqchip: mmp: avoid to include irqs head file
  ARM: mmp: avoid to include head file in mach-mmp
  irqchip: mmp: support irqchip
  irqchip: move mmp irq driver
  ARM: OMAP: AM33xx: clock: Add RNG clock data
  ARM: OMAP: TI81XX: add always-on powerdomain for TI81XX
  ARM: OMAP4: clock: Lock PLLs in the right sequence
  ARM: OMAP: AM33XX: hwmod: Add hwmod data for debugSS
  ...

parents fa91515c a2bdc32a

arch/arm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -557,6 +557,7 @@ config ARCH_MMP
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select GPIO_PXA		select GPIO_PXA
	select IRQ_DOMAIN		select IRQ_DOMAIN
			select MULTI_IRQ_HANDLER
	select NEED_MACH_GPIO_H		select NEED_MACH_GPIO_H
	select PINCTRL		select PINCTRL
	select PLAT_PXA		select PLAT_PXA

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -231,6 +231,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
	sun5i-a10s-olinuxino-micro.dtb \		sun5i-a10s-olinuxino-micro.dtb \
	sun5i-a13-olinuxino.dtb \		sun5i-a13-olinuxino.dtb \
	sun6i-a31-colombus.dtb \		sun6i-a31-colombus.dtb \
			sun7i-a20-cubieboard2.dtb \
	sun7i-a20-olinuxino-micro.dtb		sun7i-a20-olinuxino-micro.dtb
	dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \		dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
	tegra20-iris-512.dtb \		tegra20-iris-512.dtb \

arch/arm/boot/dts/exynos5.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@
	interrupts = <0 54 0>;		interrupts = <0 54 0>;
	};		};

	rtc {		rtc@101E0000 {
	compatible = "samsung,s3c6410-rtc";		compatible = "samsung,s3c6410-rtc";
	reg = <0x101E0000 0x100>;		reg = <0x101E0000 0x100>;
	interrupts = <0 43 0>, <0 44 0>;		interrupts = <0 43 0>, <0 44 0>;

arch/arm/boot/dts/exynos5250-arndale.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -538,10 +538,6 @@
	};		};
	};		};

	rtc {
	status = "okay";
	};

	usb_hub_bus {		usb_hub_bus {
	compatible = "simple-bus";		compatible = "simple-bus";
	#address-cells = <1>;		#address-cells = <1>;

arch/arm/boot/dts/exynos5250-snow.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -171,10 +171,6 @@
	};		};
	};		};

	rtc {
	status = "okay";
	};

	/*		/*
	* On Snow we've got SIP WiFi and so can keep drive strengths low to		* On Snow we've got SIP WiFi and so can keep drive strengths low to
	* reduce EMI.		* reduce EMI.