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

Commit b8be3a22 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of... 

Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

Some omap related fixes that have come up with people moving to device
tree only based booting for omap2+.

The series contains a handful of fixes for the igep boards as they were
one of the first omap3 boards to jump over completely to device tree
based booting. So these can be considered regressions compared to
booting igep in legacy mode with board files in v3.12.

Also included are few other device tree vs legacy booting regressions:

- yet more missing omap3 .dtsi entries that have showed up booting
  various boards with device tree only

- n900 eMMC device tree fix

- fixes for beagle USB EHCI

- two fixes to make omap2420 MMC work

As we're moving omap2+ to be device tree only for v3.14, I'd like to
have v3.13 work equally well for legacy based booting and device tree
based booting. So there will be likely few more device tree related
booting patches trickling in.

This series also includes a regression fix for the omap timer posted
mode that may wrongly stay on from the bootloader for some SoCs.

* tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  mmc: omap: Fix I2C dependency and make driver usable with device tree
  mmc: omap: Fix DMA configuration to not rely on device id
  ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
  ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
  ARM: dts: AM33XX IGEP0033: add USB support
  ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
  ARM: dts: AM33XX BASE0033: add pinmux and user led support
  ARM: dts: AM33XX BASE0033: add pinmux and hdmi node to enable display
  ARM: dts: omap3-igep0020: Add pinmuxing for DVI output
  ARM: dts: omap3-igep0020: Add pinmux setup for i2c devices
  ARM: dts: omap3-igep: Update to use the TI AM/DM37x processor
  ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO
  ARM: dts: omap3-igep: Fix bus-width for mmc1
  ARM: OMAP2+: dss-common: change IGEP's DVI DDC i2c bus
  ARM: OMAP2+: Disable POSTED mode for errata i103 and i767
  ARM: OMAP2+: Fix eMMC on n900 with device tree
  ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
  ARM: OMAP2+: Fix more missing data for omap3.dtsi file

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a3255524 9cb238c0

Documentation/devicetree/bindings/mmc/ti-omap.txt

0 → 100644
+54 −0
Original line number Diff line number Diff line 
* TI MMC host controller for OMAP1 and 2420



The MMC Host Controller on TI OMAP1 and 2420 family provides

an interface for MMC, SD, and SDIO types of memory cards.



This file documents differences between the core properties described

by mmc.txt and the properties used by the omap mmc driver.



Note that this driver will not work with omap2430 or later omaps,

please see the omap hsmmc driver for the current omaps.



Required properties:

- compatible: Must be "ti,omap2420-mmc", for OMAP2420 controllers

- ti,hwmods: For 2420, must be "msdi<n>", where n is controller

  instance starting 1



Examples:



	msdi1: mmc@4809c000 {

		compatible = "ti,omap2420-mmc";

		ti,hwmods = "msdi1";

		reg = <0x4809c000 0x80>;

		interrupts = <83>;

		dmas = <&sdma 61 &sdma 62>;

		dma-names = "tx", "rx";

	};



* TI MMC host controller for OMAP1 and 2420



The MMC Host Controller on TI OMAP1 and 2420 family provides

an interface for MMC, SD, and SDIO types of memory cards.



This file documents differences between the core properties described

by mmc.txt and the properties used by the omap mmc driver.



Note that this driver will not work with omap2430 or later omaps,

please see the omap hsmmc driver for the current omaps.



Required properties:

- compatible: Must be "ti,omap2420-mmc", for OMAP2420 controllers

- ti,hwmods: For 2420, must be "msdi<n>", where n is controller

  instance starting 1



Examples:



	msdi1: mmc@4809c000 {

		compatible = "ti,omap2420-mmc";

		ti,hwmods = "msdi1";

		reg = <0x4809c000 0x80>;

		interrupts = <83>;

		dmas = <&sdma 61 &sdma 62>;

		dma-names = "tx", "rx";

	};

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

+79 −0
Original line number Diff line number Diff line
@@ -13,4 +13,83 @@ 
/ {

	model = "IGEP COM AM335x on AQUILA Expansion";

	compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx";



	hdmi {

		compatible = "ti,tilcdc,slave";

		i2c = <&i2c0>;

		pinctrl-names = "default", "off";

		pinctrl-0 = <&nxp_hdmi_pins>;

		pinctrl-1 = <&nxp_hdmi_off_pins>;

		status = "okay";

	};



	leds_base {

		pinctrl-names = "default";

		pinctrl-0 = <&leds_base_pins>;



		compatible = "gpio-leds";



		led@0 {

			label = "base:red:user";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;	/* gpio1_21 */

			default-state = "off";

		};



		led@1 {

			label = "base:green:user";

			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;	/* gpio2_0 */

			default-state = "off";

		};

	};

};



&am33xx_pinmux {

	nxp_hdmi_pins: pinmux_nxp_hdmi_pins {

		pinctrl-single,pins = <

			0x1b0 (PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

			0xa0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data0 */

			0xa4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data1 */

			0xa8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data2 */

			0xac (PIN_OUTPUT | MUX_MODE0)	/* lcd_data3 */

			0xb0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data4 */

			0xb4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data5 */

			0xb8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data6 */

			0xbc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data7 */

			0xc0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data8 */

			0xc4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data9 */

			0xc8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data10 */

			0xcc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data11 */

			0xd0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data12 */

			0xd4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data13 */

			0xd8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data14 */

			0xdc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data15 */

			0xe0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_vsync */

			0xe4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_hsync */

			0xe8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_pclk */

			0xec (PIN_OUTPUT | MUX_MODE0)	/* lcd_ac_bias_en */

		>;

	};

	nxp_hdmi_off_pins: pinmux_nxp_hdmi_off_pins {

		pinctrl-single,pins = <

			0x1b0 (PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

		>;

	};



	leds_base_pins: pinmux_leds_base_pins {

		pinctrl-single,pins = <

			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */

			0x88 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_csn3.gpio2_0 */

		>;

	};

};



&lcdc {

	status = "okay";

};



&i2c0 {

	eeprom: eeprom@50 {

		compatible = "at,24c256";

		reg = <0x50>;

	};

};

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

+29 −0
Original line number Diff line number Diff line
@@ -199,6 +199,35 @@ 
	pinctrl-0 = <&uart0_pins>;

};



&usb {

	status = "okay";



	control@44e10000 {

		status = "okay";

	};



	usb-phy@47401300 {

		status = "okay";

	};



	usb-phy@47401b00 {

		status = "okay";

	};



	usb@47401000 {

		status = "okay";

	};



	usb@47401800 {

		status = "okay";

		dr_mode = "host";

	};



	dma-controller@07402000  {

		status = "okay";

	};

};



#include "tps65910.dtsi"



&tps {

arch/arm/boot/dts/omap3-beagle-xm.dts

+7 −0
Original line number Diff line number Diff line
@@ -215,3 +215,10 @@ 
&usbhsehci {

	phys = <0 &hsusb2_phy>;

};



&vaux2 {

	regulator-name = "usb_1v8";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-always-on;

};

arch/arm/boot/dts/omap3-beagle.dts

+7 −0
Original line number Diff line number Diff line
@@ -178,3 +178,10 @@ 
	mode = <3>;

	power = <50>;

};



&vaux2 {

	regulator-name = "vdd_ehci";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-always-on;

};