Commit 05114192 authored by JC Kuo's avatar JC Kuo Committed by Thierry Reding
Browse files

phy: tegra: xusb: Protect Tegra186 soc with config 



As xusb-tegra186.c will be reused for Tegra194, it would be good to
protect Tegra186 soc data with CONFIG_ARCH_TEGRA_186_SOC. This commit
also reshuffles Tegra186 soc data single CONFIG_ARCH_TEGRA_186_SOC
will be sufficient.

Signed-off-by: default avatarJC Kuo <jckuo@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 49d46e3c

drivers/phy/tegra/xusb-tegra186.c

+36 −34
Original line number Diff line number Diff line
@@ -595,19 +595,6 @@ static const char * const tegra186_usb2_functions[] = { 
	"xusb",

};



static const struct tegra_xusb_lane_soc tegra186_usb2_lanes[] = {

	TEGRA186_LANE("usb2-0", 0,  0, 0, usb2),

	TEGRA186_LANE("usb2-1", 0,  0, 0, usb2),

	TEGRA186_LANE("usb2-2", 0,  0, 0, usb2),

};



static const struct tegra_xusb_pad_soc tegra186_usb2_pad = {

	.name = "usb2",

	.num_lanes = ARRAY_SIZE(tegra186_usb2_lanes),

	.lanes = tegra186_usb2_lanes,

	.ops = &tegra186_usb2_pad_ops,

};



static int tegra186_usb2_port_enable(struct tegra_xusb_port *port)

{

	return 0;
@@ -857,27 +844,6 @@ static const char * const tegra186_usb3_functions[] = { 
	"xusb",

};



static const struct tegra_xusb_lane_soc tegra186_usb3_lanes[] = {

	TEGRA186_LANE("usb3-0", 0,  0, 0, usb3),

	TEGRA186_LANE("usb3-1", 0,  0, 0, usb3),

	TEGRA186_LANE("usb3-2", 0,  0, 0, usb3),

};



static const struct tegra_xusb_pad_soc tegra186_usb3_pad = {

	.name = "usb3",

	.num_lanes = ARRAY_SIZE(tegra186_usb3_lanes),

	.lanes = tegra186_usb3_lanes,

	.ops = &tegra186_usb3_pad_ops,

};



static const struct tegra_xusb_pad_soc * const tegra186_pads[] = {

	&tegra186_usb2_pad,

	&tegra186_usb3_pad,

#if 0 /* TODO implement */

	&tegra186_hsic_pad,

#endif

};



static int

tegra186_xusb_read_fuse_calibration(struct tegra186_xusb_padctl *padctl)

{
@@ -955,6 +921,7 @@ static const struct tegra_xusb_padctl_ops tegra186_xusb_padctl_ops = { 
	.vbus_override = tegra186_xusb_padctl_vbus_override,

};



#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)

static const char * const tegra186_xusb_padctl_supply_names[] = {

	"avdd-pll-erefeut",

	"avdd-usb",
@@ -962,6 +929,40 @@ static const char * const tegra186_xusb_padctl_supply_names[] = { 
	"vddio-hsic",

};



static const struct tegra_xusb_lane_soc tegra186_usb2_lanes[] = {

	TEGRA186_LANE("usb2-0", 0,  0, 0, usb2),

	TEGRA186_LANE("usb2-1", 0,  0, 0, usb2),

	TEGRA186_LANE("usb2-2", 0,  0, 0, usb2),

};



static const struct tegra_xusb_pad_soc tegra186_usb2_pad = {

	.name = "usb2",

	.num_lanes = ARRAY_SIZE(tegra186_usb2_lanes),

	.lanes = tegra186_usb2_lanes,

	.ops = &tegra186_usb2_pad_ops,

};



static const struct tegra_xusb_lane_soc tegra186_usb3_lanes[] = {

	TEGRA186_LANE("usb3-0", 0,  0, 0, usb3),

	TEGRA186_LANE("usb3-1", 0,  0, 0, usb3),

	TEGRA186_LANE("usb3-2", 0,  0, 0, usb3),

};



static const struct tegra_xusb_pad_soc tegra186_usb3_pad = {

	.name = "usb3",

	.num_lanes = ARRAY_SIZE(tegra186_usb3_lanes),

	.lanes = tegra186_usb3_lanes,

	.ops = &tegra186_usb3_pad_ops,

};



static const struct tegra_xusb_pad_soc * const tegra186_pads[] = {

	&tegra186_usb2_pad,

	&tegra186_usb3_pad,

#if 0 /* TODO implement */

	&tegra186_hsic_pad,

#endif

};



const struct tegra_xusb_padctl_soc tegra186_xusb_padctl_soc = {

	.num_pads = ARRAY_SIZE(tegra186_pads),

	.pads = tegra186_pads,
@@ -986,6 +987,7 @@ const struct tegra_xusb_padctl_soc tegra186_xusb_padctl_soc = { 
	.num_supplies = ARRAY_SIZE(tegra186_xusb_padctl_supply_names),

};

EXPORT_SYMBOL_GPL(tegra186_xusb_padctl_soc);

#endif



MODULE_AUTHOR("JC Kuo <jckuo@nvidia.com>");

MODULE_DESCRIPTION("NVIDIA Tegra186 XUSB Pad Controller driver");