Commit fef36a7a authored Jul 26, 2013 by Linus Torvalds

arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "This is a largeish batch of fixes, mostly because I missed -rc2 due to
  travel/vacation.  So in number these are a bit more than ideal unless
  you amortize them over two -rcs.

  Quick breakdown:
   - Defconfig updates
     - Making multi_v7_defconfig useful on more hardware to encourage
       single-image usage
     - Davinci and nomadik updates due to new code merged this merge
       window
   - Fixes for UART on Samsung platforms, both PM and clock-related
   - A handful of warning fixes from defconfig builds, including for
     max8925 backlight and pxamci (both with appropriate acks)
   - Exynos5440 fixes for LPAE configuration, PM
   - ...plus a bunch of other smaller changes all over the place

  I expect to switch to regressions-or-severe-bugs-only fixes from here
  on out"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  mfd: max8925: fix dt code for backlight
  ARM: omap5: Only select errata 798181 if SMP
  ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
  ARM: EXYNOS: Fix low level debug support
  ARM: SAMSUNG: Save/restore only selected uart's registers
  ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
  ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
  ARM: multi_v7_defconfig: Select USB chipidea driver
  ARM: pxa: propagate errors from regulator_enable() to pxamci
  ARM: zynq: fix compilation warning
  ARM: keystone: fix compilation warning
  ARM: highbank: Only touch common coherency control register fields
  ARM: footbridge: fix overlapping PCI mappings
  dmaengine: shdma: fix a build failure on platforms with no DMA support
  ARM: STi: Set correct ARM ERRATAs.
  ARM: dts: STi: Fix pinconf setup for STiH416 serial2
  ARM: nomadik: configure for NO_HZ and HRTIMERS
  ARM: nomadik: update defconfig base
  ARM: nomadik: Update MMC defconfigs
  ARM: davinci: defconfig: enable EDMA driver
  ...

parents db8cbfad 515c0967

Documentation/devicetree/bindings/clock/imx27-clock.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,7 @@ clocks and IDs.
	fpm 83		fpm 83
	mpll_osc_sel 84		mpll_osc_sel 84
	mpll_sel 85		mpll_sel 85
			spll_gate 86

	Examples:		Examples:

arch/arm/Kconfig

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1600,8 +1600,7 @@ config LOCAL_TIMERS
	config ARCH_NR_GPIO		config ARCH_NR_GPIO
	int		int
	default 1024 if ARCH_SHMOBILE \|\| ARCH_TEGRA		default 1024 if ARCH_SHMOBILE \|\| ARCH_TEGRA
	default 512 if SOC_OMAP5		default 512 if ARCH_EXYNOS \|\| ARCH_KEYSTONE \|\| SOC_OMAP5
	default 512 if ARCH_KEYSTONE
	default 392 if ARCH_U8500		default 392 if ARCH_U8500
	default 352 if ARCH_VT8500		default 352 if ARCH_VT8500
	default 288 if ARCH_SUNXI		default 288 if ARCH_SUNXI

arch/arm/boot/dts/imx28-apx4devkit.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -147,7 +147,7 @@
	reg = <0x0a>;		reg = <0x0a>;
	VDDA-supply = <&reg_3p3v>;		VDDA-supply = <&reg_3p3v>;
	VDDIO-supply = <&reg_3p3v>;		VDDIO-supply = <&reg_3p3v>;
			clocks = <&saif0>;
	};		};

	pcf8563: rtc@51 {		pcf8563: rtc@51 {

arch/arm/boot/dts/imx28-evk.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -195,7 +195,7 @@
	reg = <0x0a>;		reg = <0x0a>;
	VDDA-supply = <&reg_3p3v>;		VDDA-supply = <&reg_3p3v>;
	VDDIO-supply = <&reg_3p3v>;		VDDIO-supply = <&reg_3p3v>;
			clocks = <&saif0>;
	};		};

	at24@51 {		at24@51 {

arch/arm/boot/dts/imx28-m28evk.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -184,7 +184,7 @@
	reg = <0x0a>;		reg = <0x0a>;
	VDDA-supply = <&reg_3p3v>;		VDDA-supply = <&reg_3p3v>;
	VDDIO-supply = <&reg_3p3v>;		VDDIO-supply = <&reg_3p3v>;
			clocks = <&saif0>;
	};		};

	eeprom: eeprom@51 {		eeprom: eeprom@51 {