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

Commit 8dfbc0ab authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v4.2/fixes-rc1' of... 

Merge tag 'omap-for-v4.2/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v4.2-rc1" from Tony Lindgren:

Minor fixes for omaps against v4.2-rc1. Mostly just minor dts changes
except for a GPMC fix to not use names for probing devices. Also a
one liner clean-up to remove unecessary return from a void function.

The summary for the changes being:

- Fix probe for GPMC devices by reoving limitations based on device
  name

- Remove unnecessary return from a void function

- Revert beaglebone RTC sleep fix, we now have a better fix merged

- Add am4372 EMIF node to fix a warning

- Add am57xx-beagle-x15 power supply to fix USB2 if USB1 is disabled

- Disable rfbi for am4372 as it does not have a driver

* tag 'omap-for-v4.2/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am4372.dtsi: disable rfbi
  ARM: dts: am57xx-beagle-x15: Provide supply for usb2_phy2
  ARM: dts: am4372: Add emif node
  Revert "ARM: dts: am335x-boneblack: disable RTC-only sleep"
  ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_show_dma_caps
  memory: omap-gpmc: Fix parsing of devices
parents d024bae2 ae745302

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it. 
Required properties:

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>

  is the IP revision of the specific EMIF instance.

		  For am437x should be ti,emif-am4372.



- phy-type	: <u32> indicating the DDR phy type. Following are the

  allowed values

arch/arm/boot/dts/am335x-boneblack.dts

+4 −0
Original line number Diff line number Diff line
@@ -80,3 +80,7 @@ 
		status = "okay";

	};

};



&rtc {

	system-power-controller;

};

arch/arm/boot/dts/am4372.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ 
			};

		};



		emif: emif@4c000000 {

			compatible = "ti,emif-am4372";

			reg = <0x4c000000 0x1000000>;

			ti,hwmods = "emif";

		};



		edma: edma@49000000 {

			compatible = "ti,edma3";

			ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
@@ -941,6 +947,7 @@ 
				ti,hwmods = "dss_rfbi";

				clocks = <&disp_clk>;

				clock-names = "fck";

				status = "disabled";

			};

		};

arch/arm/boot/dts/am57xx-beagle-x15.dts

+4 −0
Original line number Diff line number Diff line
@@ -605,6 +605,10 @@ 
	phy-supply = <&ldousb_reg>;

};



&usb2_phy2 {

	phy-supply = <&ldousb_reg>;

};



&usb1 {

	dr_mode = "host";

	pinctrl-names = "default";

arch/arm/mach-omap2/dma.c

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ static void omap2_show_dma_caps(void) 
	u8 revision = dma_read(REVISION, 0) & 0xff;

	printk(KERN_INFO "OMAP DMA hardware revision %d.%d\n",

				revision >> 4, revision & 0xf);

	return;

}



static unsigned configure_dma_errata(void)