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

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

Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of... 

Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes

* 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Fix device tree AUXDATA for USB/EHCI
parents 714daf73 8c3ec841

arch/arm/mach-tegra/board-dt-tegra20.c

+3 −3
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",

		       &tegra_ehci1_device.dev.platform_data),

		       &tegra_ehci1_pdata),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",

		       &tegra_ehci2_device.dev.platform_data),

		       &tegra_ehci2_pdata),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",

		       &tegra_ehci3_device.dev.platform_data),

		       &tegra_ehci3_pdata),

	{}

};

arch/arm/mach-tegra/devices.c

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/fsl_devices.h>

#include <linux/serial_8250.h>

#include <linux/i2c-tegra.h>

#include <linux/platform_data/tegra_usb.h>

#include <asm/pmu.h>

#include <mach/irqs.h>

#include <mach/iomap.h>
@@ -446,18 +445,18 @@ static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = { 
	.clk = "cdev2",

};



static struct tegra_ehci_platform_data tegra_ehci1_pdata = {

struct tegra_ehci_platform_data tegra_ehci1_pdata = {

	.operating_mode = TEGRA_USB_OTG,

	.power_down_on_bus_suspend = 1,

};



static struct tegra_ehci_platform_data tegra_ehci2_pdata = {

struct tegra_ehci_platform_data tegra_ehci2_pdata = {

	.phy_config = &tegra_ehci2_ulpi_phy_config,

	.operating_mode = TEGRA_USB_HOST,

	.power_down_on_bus_suspend = 1,

};



static struct tegra_ehci_platform_data tegra_ehci3_pdata = {

struct tegra_ehci_platform_data tegra_ehci3_pdata = {

	.operating_mode = TEGRA_USB_HOST,

	.power_down_on_bus_suspend = 1,

};

arch/arm/mach-tegra/devices.h

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
#define __MACH_TEGRA_DEVICES_H



#include <linux/platform_device.h>

#include <linux/platform_data/tegra_usb.h>



extern struct tegra_ehci_platform_data tegra_ehci1_pdata;

extern struct tegra_ehci_platform_data tegra_ehci2_pdata;

extern struct tegra_ehci_platform_data tegra_ehci3_pdata;



extern struct platform_device tegra_gpio_device;

extern struct platform_device tegra_pinmux_device;