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

Commit f126776a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.15/fixes-v2-signed' of... 

Merge tag 'omap-for-v3.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps, mostly to fix some GPMC, DSS and USB issues for
device tree based booting. And turns out BeagleBoard xM A/B
needs it's own minimal dts in addition to the related u-boot
changes. Also few minor documentation and typo fixes are merged
to get them out of the way.

* tag 'omap-for-v3.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Fix GPMC remap for devices using an offset
  ARM: OMAP2+: Fix oops for GPMC free
  ARM: dts: Add support for the BeagleBoard xM A/B
  ARM: dts: Grammar /that will/it will/
  ARM: dts: Grammar /is uses/ is used/
  ARM: OMAP2+: Fix config name for USB3 PHY
  ARM: dts: am335x: update USB DT references
  ARM: dts: OMAP2+: remove uses of obsolete gpmc,device-nand
  ARM: AM335X: EVM: fix pinmux documentation in devicetree
  ARM: OMAP2+: N900: remove omapdss init for DT boot
  ARM: dts: dra7xx-clocks: Correct mcasp2_ahclkx_mux bit-shift
  ARM: dts: omap5: Add clocks to USB3 PHY node
  ARM: OMAP2+: hwmod: fix missing braces in _init()
  ARM: AM43xx: fix dpll init in bypass mode
  ARM: OMAP3: hwmod data: Correct clock domains for USB modules
  ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 072c8b3f fb677ef7

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-beagle-xm-ab.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-ldp.dtb \

arch/arm/boot/dts/am335x-bone-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
&usb {

	status = "okay";



	control@44e10000 {

	control@44e10620 {

		status = "okay";

	};
@@ -204,7 +204,7 @@ 
		dr_mode = "host";

	};



	dma-controller@07402000  {

	dma-controller@47402000  {

		status = "okay";

	};

};

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

+4 −4
Original line number Diff line number Diff line
@@ -301,8 +301,8 @@ 


	am335x_evm_audio_pins: am335x_evm_audio_pins {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rx_dv.mcasp1_aclkx */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_txd3.mcasp1_fsx */

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */

			0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */

		>;
@@ -331,7 +331,7 @@ 
&usb {

	status = "okay";



	control@44e10000 {

	control@44e10620 {

		status = "okay";

	};
@@ -352,7 +352,7 @@ 
		dr_mode = "host";

	};



	dma-controller@07402000  {

	dma-controller@47402000  {

		status = "okay";

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ 
&usb {

	status = "okay";



	control@44e10000 {

	control@44e10620 {

		status = "okay";

	};
@@ -385,7 +385,7 @@ 
		dr_mode = "host";

	};



	dma-controller@07402000  {

	dma-controller@47402000  {

		status = "okay";

	};

};

arch/arm/boot/dts/am335x-igep0033.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ 
		reg = <0 0 0>; /* CS0, offset 0 */

		nand-bus-width = <8>;

		ti,nand-ecc-opt = "bch8";

		gpmc,device-nand = "true";

		gpmc,device-width = <1>;

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;
@@ -202,7 +201,7 @@ 
&usb {

	status = "okay";



	control@44e10000 {

	control@44e10620 {

		status = "okay";

	};
@@ -223,7 +222,7 @@ 
		dr_mode = "host";

	};



	dma-controller@07402000  {

	dma-controller@47402000  {

		status = "okay";

	};

};