From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 May 2013 15:56:55 +0000 (-0700)
Subject: Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=4d26aa305414dbb33b3c32fb205b68004cda8ffc

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

Pull ARM SoC non-critical fixes from Olof Johansson:
 "Here is a collection of fixes (and some intermixed cleanups) that were
  considered less important and thus not included in the later parts of
  the 3.9-rc cycle.

  It's a bit all over the map, contents wise.  A series of ux500 fixes
  and cleanups, a bunch of various fixes for OMAP and tegra, and some
  for Freescale i.MX and even Qualcomm MSM.

  Note that there's also a patch on this branch to globally turn off
  -Wmaybe-uninitialized when building with -Os.  It's been posted
  several times by Arnd and no dissent was raised, but nobody seemed
  interested to pick it up.  So here it is, as the topmost patch."

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
  Turn off -Wmaybe-uninitialized when building with -Os
  ARM: orion5x: include linux/cpu.h
  ARM: tegra: call cpu_do_idle from C code
  ARM: u300: fix ages old copy/paste bug
  ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7
  ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled
  ARM: tegra: fix relocation truncated error when THUMB2_KERNEL enabled
  ARM: tegra: fix build error when THUMB2_KERNEL enabled
  ARM: msm: Fix uncompess.h tx underrun check
  ARM: vexpress: Remove A9 PMU compatible values for non-A9 platforms
  ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
  ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
  ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
  ARM: mach-imx: mach-imx6q: Fix sparse warnings
  ARM: mach-imx: src: Include "common.h
  ARM: mach-imx: gpc: Include "common.h"
  ARM: mach-imx: avic: Staticize *avic_base
  ARM: mach-imx: tzic: Staticize *tzic_base
  ARM: mach-imx: clk: Include "clk.h"
  ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
  ...
---

4d26aa305414dbb33b3c32fb205b68004cda8ffc
diff --cc arch/arm/boot/dts/dbx5x0.dtsi
index aaa63d0a8096,3e0aa13487b3..b6bc4ff17f26
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@@ -191,8 -191,8 +191,8 @@@
  
  		prcmu: prcmu@80157000 {
  			compatible = "stericsson,db8500-prcmu";
- 			reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
 -			reg = <0x80157000 0x2000>;
 -			reg-names = "prcmu";
++			reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
 +			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
  			interrupts = <0 47 0x4>;
  			#address-cells = <1>;
  			#size-cells = <1>;
diff --cc arch/arm/mach-ux500/board-mop500-regulators.h
index 9bece38fe933,0c79d902f904..039f5132c370
--- a/arch/arm/mach-ux500/board-mop500-regulators.h
+++ b/arch/arm/mach-ux500/board-mop500-regulators.h
@@@ -14,11 -14,11 +14,12 @@@
  #include <linux/regulator/machine.h>
  #include <linux/regulator/ab8500.h>
  
 -extern struct ab8500_regulator_reg_init
 -ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS];
 -extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];
 +extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
 +extern struct ab8500_regulator_platform_data ab8505_regulator_plat_data;
  extern struct regulator_init_data tps61052_regulator;
  extern struct regulator_init_data gpio_en_3v3_regulator;
+ extern struct regulator_init_data sdi0_reg_init_data;
  
 +void mop500_regulator_init(void);
 +
  #endif