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

Commit 0e4b0743 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Mostly bugfixes and a few small code removals.  Worth pointing out is:

   - A handful of more fixes to get DT enablement working properly on
     OMAP, finding new breakage of things that don't work quite right
     yet without the traditional board files.  I expect a bit more of
     this to come in this release as people test on their hardware.
   - Implementation of power_down_finish() on vexpress, to make kexec
     work and to stop the MCPM core to produce a warning (the warning
     was new to 3.13-rc1).
   - A handful of minor fixes for various platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: bcm2835: add missing #xxx-cells to I2C nodes
  ARM: dts: Add max77686 RTC interrupt to cros5250-common
  ARM: vexpress/TC2: Implement MCPM power_down_finish()
  ARM: tegra: Provide dummy powergate implementation
  ARM: omap: fix warning with LPAE build
  ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init
  ARM: OMAP2+: Remove legacy mux code for display.c
  ARM: OMAP2+: Fix undefined reference to set_cntfreq
  gpio: twl4030: Fix passing of pdata in the device tree case
  gpio: twl4030: Fix regression for twl gpio output
  ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain
  ARM: dts: imx6qdl: disable spdif "rxtx5" clock option
  ARM: dts: Fix omap2 specific dtsi files by adding the missing entries
  ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x
  i2c: omap: Fix missing device tree flags for omap2
parents 3af4977e a31ab44e

Documentation/devicetree/bindings/i2c/i2c-omap.txt

+2 −1
Original line number Diff line number Diff line 
I2C for OMAP platforms



Required properties :

- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"

- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"

  or "ti,omap4-i2c"

- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)

- #address-cells = <1>;

- #size-cells = <0>;

arch/arm/boot/dts/bcm2835.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ 
			reg = <0x7e205000 0x1000>;

			interrupts = <2 21>;

			clocks = <&clk_i2c>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};
@@ -93,6 +95,8 @@ 
			reg = <0x7e804000 0x1000>;

			interrupts = <2 21>;

			clocks = <&clk_i2c>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};

arch/arm/boot/dts/cros5250-common.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ 
		i2c2_bus: i2c2-bus {

			samsung,pin-pud = <0>;

		};



		max77686_irq: max77686-irq {

			samsung,pins = "gpx3-2";

			samsung,pin-function = <0>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

		};

	};



	i2c@12C60000 {
@@ -35,6 +42,11 @@ 


		max77686@09 {

			compatible = "maxim,max77686";

			interrupt-parent = <&gpx3>;

			interrupts = <2 0>;

			pinctrl-names = "default";

			pinctrl-0 = <&max77686_irq>;

			wakeup-source;

			reg = <0x09>;



			voltage-regulators {

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
					clocks = <&clks 197>, <&clks 3>,

						 <&clks 197>, <&clks 107>,

						 <&clks 0>,   <&clks 118>,

						 <&clks 62>,  <&clks 139>,

						 <&clks 0>,  <&clks 139>,

						 <&clks 0>;

					clock-names = "core",  "rxtx0",

						      "rxtx1", "rxtx2",

arch/arm/boot/dts/omap-zoom-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	 * they probably share the same GPIO IRQ

	 * REVISIT: Add timing support from slls644g.pdf

	 */

	8250@3,0 {

	uart@3,0 {

		compatible = "ns16550a";

		reg = <3 0 0x100>;

		bank-width = <2>;