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

Commit 4d26aa30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/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
  ...
parents 600fe975 e74fc973

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ endif # $(dot-config) 
all: vmlinux



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

KBUILD_CFLAGS	+= -O2

endif

arch/arm/boot/dts/dbx5x0.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ 


		prcmu: prcmu@80157000 {

			compatible = "stericsson,db8500-prcmu";

			reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;

			reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;

			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";

			interrupts = <0 47 0x4>;

			#address-cells = <1>;
@@ -674,10 +674,13 @@ 
			compatible = "regulator-gpio";



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2600000>;

			regulator-max-microvolt = <2900000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;

arch/arm/boot/dts/href.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
			mmc-cap-sd-highspeed;

			mmc-cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux3_reg>;

			vqmmc-supply = <&vmmci>;



			cd-gpios  = <&tc3589x_gpio 3 0x4>;

arch/arm/boot/dts/hrefprev60.dts

+9 −1
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ 
	};



	soc-u9500 {

		prcmu@80157000 {

			ab8500@5 {

				ab8500-gpio {

					compatible = "stericsson,ab8500-gpio";

				};

			};

		};



		i2c@80004000 {

			tps61052@33 {

				compatible = "tps61052";
@@ -40,7 +48,7 @@ 


		vmmci: regulator-gpio {

			gpios = <&tc3589x_gpio 18 0x4>;

			gpio-enable = <&tc3589x_gpio 17 0x4>;

			enable-gpio = <&tc3589x_gpio 17 0x4>;



			status = "okay";

		};

arch/arm/boot/dts/snowball.dts

+4 −0
Original line number Diff line number Diff line
@@ -299,6 +299,10 @@ 
			};



			ab8500 {

				ab8500-gpio {

					compatible = "stericsson,ab8500-gpio";

				};



				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";