Commit 35db05bb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'omap/usb' into next/dt2 



Merging in dependencies for the omap/dt branch.

* omap/usb: (21 commits)
  ARM: dts: omap3-beagle: Add USB Host support
  ARM: dts: OMAP3: Add HS USB Host IP nodes
  ARM: dts: OMAP4: Add HS USB Host IP nodes
  ARM: OMAP: zoom: Adapt to ehci-omap changes
  ARM: OMAP3: overo: Adapt to ehci-omap changes
  ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes
  ARM: OMAP3: omap3stalker: Adapt to ehci-omap changes
  ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes
  ARM: OMAP3: omap3evm: Adapt to ehci-omap changes
  ARM: OMAP3: igep0020: Adapt to ehci-omap changes
  ARM: OMAP: devkit8000: Adapt to ehci-omap changes
  ARM: OMAP3: cm-t3517: Adapt to ehci-omap changes
  ARM: OMAP3: cm-t35: Adapt to ehci-omap changes
  ARM: OMAP: AM3517evm: Adapt to ehci-omap changes
  ARM: OMAP: AM3517crane: Adapt to ehci-omap changes
  ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes
  ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes
  ARM: OMAP3: Beagle: Adapt to ehci-omap changes
  ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes
  ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 56fecc7d 2e5f78ae

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

+71 −0
Original line number Diff line number Diff line
@@ -38,6 +38,57 @@ 
		};

	};



	/* HS USB Port 2 RESET */

	hsusb2_reset: hsusb2_reset_reg {

		compatible = "regulator-fixed";

		regulator-name = "hsusb2_reset";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio5 19 0>;	/* gpio_147 */

		startup-delay-us = <70000>;

		enable-active-high;

	};



	/* HS USB Port 2 Power */

	hsusb2_power: hsusb2_power_reg {

		compatible = "regulator-fixed";

		regulator-name = "hsusb2_vbus";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&twl_gpio 18 0>;	/* GPIO LEDA */

		startup-delay-us = <70000>;

	};



	/* HS USB Host PHY on PORT 2 */

	hsusb2_phy: hsusb2_phy {

		compatible = "usb-nop-xceiv";

		reset-supply = <&hsusb2_reset>;

		vcc-supply = <&hsusb2_power>;

	};

};



&omap3_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusbb2_pins

	>;



	hsusbb2_pins: pinmux_hsusbb2_pins {

		pinctrl-single,pins = <

			0x5c0 0x3  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */

			0x5c2 0x3  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */

			0x5c4 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */

			0x5c6 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */

			0x5c8 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */

			0x5cA 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */

			0x1a4 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */

			0x1a6 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */

			0x1a8 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */

			0x1aa 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */

			0x1ac 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */

			0x1ae 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */

		>;

	};

};



&i2c1 {
@@ -65,3 +116,23 @@ 
&mmc3 {

	status = "disabled";

};



&usbhshost {

	port2-mode = "ehci-phy";

};



&usbhsehci {

	phys = <0 &hsusb2_phy>;

};



&twl_gpio {

	ti,use-leds;

	/* pullups: BIT(1) */

	ti,pullups = <0x000002>;

	/*

	 * pulldowns:

	 * BIT(2), BIT(6), BIT(7), BIT(8), BIT(13)

	 * BIT(15), BIT(16), BIT(17)

	 */

	ti,pulldowns = <0x03a1c4>;

};

arch/arm/boot/dts/omap3.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -397,5 +397,36 @@ 
			ti,timer-alwon;

			ti,timer-secure;

		};



		usbhstll: usbhstll@48062000 {

			compatible = "ti,usbhs-tll";

			reg = <0x48062000 0x1000>;

			interrupts = <78>;

			ti,hwmods = "usb_tll_hs";

		};



		usbhshost: usbhshost@48064000 {

			compatible = "ti,usbhs-host";

			reg = <0x48064000 0x400>;

			ti,hwmods = "usb_host_hs";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			usbhsohci: ohci@48064400 {

				compatible = "ti,ohci-omap3", "usb-ohci";

				reg = <0x48064400 0x400>;

				interrupt-parent = <&intc>;

				interrupts = <76>;

			};



			usbhsehci: ehci@48064800 {

				compatible = "ti,ehci-omap", "usb-ehci";

				reg = <0x48064800 0x400>;

				interrupt-parent = <&intc>;

				interrupts = <77>;

			};

		};



	};

};

arch/arm/boot/dts/omap4.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -529,5 +529,35 @@ 
			ti,hwmods = "timer11";

			ti,timer-pwm;

		};



		usbhstll: usbhstll@4a062000 {

			compatible = "ti,usbhs-tll";

			reg = <0x4a062000 0x1000>;

			interrupts = <0 78 0x4>;

			ti,hwmods = "usb_tll_hs";

		};



		usbhshost: usbhshost@4a064000 {

			compatible = "ti,usbhs-host";

			reg = <0x4a064000 0x800>;

			ti,hwmods = "usb_host_hs";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			usbhsohci: ohci@4a064800 {

				compatible = "ti,ohci-omap3", "usb-ohci";

				reg = <0x4a064800 0x400>;

				interrupt-parent = <&gic>;

				interrupts = <0 76 0x4>;

			};



			usbhsehci: ehci@4a064c00 {

				compatible = "ti,ehci-omap", "usb-ehci";

				reg = <0x4a064c00 0x400>;

				interrupt-parent = <&gic>;

				interrupts = <0 77 0x4>;

			};

		};

	};

};

arch/arm/mach-omap2/board-3430sdp.c

+15 −6
Original line number Diff line number Diff line
@@ -445,16 +445,23 @@ static void enable_board_wakeup_source(void) 
		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 1,

		.reset_gpio = 57,

		.vcc_gpio = -EINVAL,

	},

	{

		.port = 2,

		.reset_gpio = 61,

		.vcc_gpio = -EINVAL,

	},

};



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,



	.phy_reset  = true,

	.reset_gpio_port[0]  = 57,

	.reset_gpio_port[1]  = 61,

	.reset_gpio_port[2]  = -EINVAL

};



#ifdef CONFIG_OMAP_MUX
@@ -606,6 +613,8 @@ static void __init omap_3430sdp_init(void) 
	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

	sdp3430_display_init();

	enable_board_wakeup_source();



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);

}

arch/arm/mach-omap2/board-3630sdp.c

+15 −6
Original line number Diff line number Diff line
@@ -53,16 +53,23 @@ static void enable_board_wakeup_source(void) 
		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 1,

		.reset_gpio = 126,

		.vcc_gpio = -EINVAL,

	},

	{

		.port = 2,

		.reset_gpio = 61,

		.vcc_gpio = -EINVAL,

	},

};



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,



	.phy_reset  = true,

	.reset_gpio_port[0]  = 126,

	.reset_gpio_port[1]  = 61,

	.reset_gpio_port[2]  = -EINVAL

};



#ifdef CONFIG_OMAP_MUX
@@ -199,6 +206,8 @@ static void __init omap_sdp_init(void) 
	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);

	enable_board_wakeup_source();



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE