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

Commit 9acb1725 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc fixes from Arnd Bergmann:
 "Bug fixes for various ARM platforms.  About half of these are for OMAP
  and submitted before but did not make it into v3.6-rc2."

* tag 'fixes-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: ux500: don't select LEDS_GPIO for snowball
  ARM: imx: build i.MX6 functions only when needed
  ARM: imx: select CPU_FREQ_TABLE when needed
  ARM: imx: fix ksz9021rn_phy_fixup
  ARM: imx: build pm-imx5 code only when PM is enabled
  ARM: omap: allow building omap44xx without SMP
  ARM: dts: imx51-babbage: fix esdhc cd/wp properties
  ARM: imx6: spin the cpu until hardware takes it down
  ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled
  ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'
  ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path
  ARM: Kirkwood: fix Makefile.boot
  ARM: Kirkwood: Fix iconnect leds
  ARM: Orion: Set eth packet size csum offload limit
  ARM: mv78xx0: fix win_cfg_base prototype
  ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*()
  ARM: mmp: fix potential NULL dereference
  ARM: OMAP4: Register the OPP table only for 4430 device
  cpufreq: OMAP: Handle missing frequency table on SMP systems
  ARM: OMAP4: sleep: Save the complete used register stack frame
  ...
parents 26756087 57f0b201

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+4 −4
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ Required properties: 
- compatible : Should be "fsl,<chip>-esdhc"



Optional properties:

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,wp-internal : Indicate to use controller internal write protection

- fsl,cd-controller : Indicate to use controller internal card detection

- fsl,wp-controller : Indicate to use controller internal write protection



Examples:
@@ -19,8 +19,8 @@ esdhc@70004000 { 
	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	fsl,cd-internal;

	fsl,wp-internal;

	fsl,cd-controller;

	fsl,wp-controller;

};



esdhc@70008000 {

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2144,6 +2144,7 @@ source "drivers/cpufreq/Kconfig" 
config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	select CPU_FREQ_TABLE

	help

	  This enables the CPUfreq driver for i.MX CPUs.

arch/arm/boot/dts/am33xx.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -154,5 +154,10 @@ 
			#size-cells = <0>;

			ti,hwmods = "i2c3";

		};



		wdt2: wdt@44e35000 {

			compatible = "ti,omap3-wdt";

			ti,hwmods = "wd_timer2";

		};

	};

};

arch/arm/boot/dts/imx51-babbage.dts

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
		aips@70000000 { /* aips-1 */

			spba@70000000 {

				esdhc@70004000 { /* ESDHC1 */

					fsl,cd-internal;

					fsl,wp-internal;

					fsl,cd-controller;

					fsl,wp-controller;

					status = "okay";

				};

arch/arm/boot/dts/kirkwood-iconnect.dts

+5 −1
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ 
		};

		power-blue {

			label = "power:blue";

			gpios = <&gpio1 11 0>;

			gpios = <&gpio1 10 0>;

			linux,default-trigger = "timer";

		};

		power-red {

			label = "power:red";

			gpios = <&gpio1 11 0>;

		};

		usb1 {

			label = "usb1:blue";

			gpios = <&gpio1 12 0>;