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

Commit 330641ce authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge commit 'fixes' into next/cleanup 



Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.

* commit 'fixes': (39 commits)
  arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
  arm: socfpga: Enable ARM_TWD for socfpga
  ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
  ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
  ARM: multi_v7_defconfig: enable network for BeagleBone Black
  ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
  ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
  ARM: dts: omap3-beagle: Add omap-twl4030 audio support
  ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
  ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
  ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
  ARM: at91: add usart3 alias to dtsi
  ARM: at91: sama5d3: reduce TWI internal clock frequency
  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
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 63167569 a5c6e87a

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/armada-370-db.dts

+14 −14
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
					spi-max-frequency = <50000000>;

				};

			};

		};



		pcie-controller {

			status = "okay";
@@ -118,4 +119,3 @@ 
		};

	};

};
 
};

arch/arm/boot/dts/armada-370-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 


			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>, <0x21810 0x1c>;

				reg = <0x20200 0xb0>, <0x21010 0x1c>;

			};



			serial@12000 {