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

Commit 5fed6828 authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen Committed by Felipe Balbi
Browse files

ARM: tegra: Remove USB platform data 



USB-related platform data is not used anymore in the Tegra USB drivers,
so remove all of it.

Signed-off-by: default avatarTuomas Tynkkynen <ttynkkynen@nvidia.com>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d5064279

arch/arm/mach-tegra/tegra.c

+1 −37
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/pda_power.h>

#include <linux/platform_data/tegra_usb.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/sys_soc.h>
@@ -46,40 +45,6 @@ 
#include "fuse.h"

#include "iomap.h"



static struct tegra_ehci_platform_data tegra_ehci1_pdata = {

	.operating_mode = TEGRA_USB_OTG,

	.power_down_on_bus_suspend = 1,

	.vbus_gpio = -1,

};



static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {

	.reset_gpio = -1,

	.clk = "cdev2",

};



static 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,

	.vbus_gpio = -1,

};



static struct tegra_ehci_platform_data tegra_ehci3_pdata = {

	.operating_mode = TEGRA_USB_HOST,

	.power_down_on_bus_suspend = 1,

	.vbus_gpio = -1,

};



static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {

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

		       &tegra_ehci1_pdata),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5004000, "tegra-ehci.1",

		       &tegra_ehci2_pdata),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5008000, "tegra-ehci.2",

		       &tegra_ehci3_pdata),

	{}

};



static void __init tegra_dt_init(void)

{

	struct soc_device_attribute *soc_dev_attr;
@@ -112,8 +77,7 @@ static void __init tegra_dt_init(void) 
	 * devices

	 */

out:

	of_platform_populate(NULL, of_default_bus_match_table,

				tegra20_auxdata_lookup, parent);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);

}



static void __init trimslice_init(void)

include/linux/platform_data/tegra_usb.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Google, Inc.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef _TEGRA_USB_H_

#define _TEGRA_USB_H_



enum tegra_usb_operating_modes {

	TEGRA_USB_DEVICE,

	TEGRA_USB_HOST,

	TEGRA_USB_OTG,

};



struct tegra_ehci_platform_data {

	enum tegra_usb_operating_modes operating_mode;

	/* power down the phy on bus suspend */

	int power_down_on_bus_suspend;

	void *phy_config;

	int vbus_gpio;

};



#endif /* _TEGRA_USB_H_ */

include/linux/usb/tegra_usb_phy.h

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ struct tegra_utmip_config { 
	u8 xcvr_lsrslew;

};



struct tegra_ulpi_config {

	int reset_gpio;

	const char *clk;

};



enum tegra_usb_phy_port_speed {

	TEGRA_USB_PHY_PORT_SPEED_FULL = 0,

	TEGRA_USB_PHY_PORT_SPEED_LOW,