Commit c18e8fa5 authored by Wolfram Sang's avatar Wolfram Sang Committed by Sascha Hauer

pcm037/pcm043/pca100: fix ULPI-related build warnings

Like this one (if CONFIG_USB_ULPI is not set):

arch/arm/mach-mx3/mach-pcm043.c:312: warning: 'otg_pdata' defined but not used
arch/arm/mach-mx3/mach-pcm043.c:317: warning: 'usbh1_pdata' defined but not used
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 21b07344
...@@ -253,6 +253,7 @@ static struct imxmmc_platform_data sdhc_pdata = { ...@@ -253,6 +253,7 @@ static struct imxmmc_platform_data sdhc_pdata = {
.exit = pca100_sdhc2_exit, .exit = pca100_sdhc2_exit,
}; };
#if defined(CONFIG_USB_ULPI)
static int otg_phy_init(struct platform_device *pdev) static int otg_phy_init(struct platform_device *pdev)
{ {
gpio_set_value(OTG_PHY_CS_GPIO, 0); gpio_set_value(OTG_PHY_CS_GPIO, 0);
...@@ -276,6 +277,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { ...@@ -276,6 +277,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
.portsc = MXC_EHCI_MODE_ULPI, .portsc = MXC_EHCI_MODE_ULPI,
.flags = MXC_EHCI_INTERFACE_DIFF_UNI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
}; };
#endif
static struct fsl_usb2_platform_data otg_device_pdata = { static struct fsl_usb2_platform_data otg_device_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE, .operating_mode = FSL_USB2_DR_DEVICE,
......
...@@ -545,6 +545,7 @@ static struct platform_device pcm970_sja1000 = { ...@@ -545,6 +545,7 @@ static struct platform_device pcm970_sja1000 = {
.num_resources = ARRAY_SIZE(pcm970_sja1000_resources), .num_resources = ARRAY_SIZE(pcm970_sja1000_resources),
}; };
#if defined(CONFIG_USB_ULPI)
static struct mxc_usbh_platform_data otg_pdata = { static struct mxc_usbh_platform_data otg_pdata = {
.portsc = MXC_EHCI_MODE_ULPI, .portsc = MXC_EHCI_MODE_ULPI,
.flags = MXC_EHCI_INTERFACE_DIFF_UNI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
...@@ -554,6 +555,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { ...@@ -554,6 +555,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
.portsc = MXC_EHCI_MODE_ULPI, .portsc = MXC_EHCI_MODE_ULPI,
.flags = MXC_EHCI_INTERFACE_DIFF_UNI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
}; };
#endif
static struct fsl_usb2_platform_data otg_device_pdata = { static struct fsl_usb2_platform_data otg_device_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE, .operating_mode = FSL_USB2_DR_DEVICE,
......
...@@ -309,6 +309,7 @@ static struct mxc_nand_platform_data pcm037_nand_board_info = { ...@@ -309,6 +309,7 @@ static struct mxc_nand_platform_data pcm037_nand_board_info = {
.hw_ecc = 1, .hw_ecc = 1,
}; };
#if defined(CONFIG_USB_ULPI)
static struct mxc_usbh_platform_data otg_pdata = { static struct mxc_usbh_platform_data otg_pdata = {
.portsc = MXC_EHCI_MODE_UTMI, .portsc = MXC_EHCI_MODE_UTMI,
.flags = MXC_EHCI_INTERFACE_DIFF_UNI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
...@@ -319,6 +320,7 @@ static struct mxc_usbh_platform_data usbh1_pdata = { ...@@ -319,6 +320,7 @@ static struct mxc_usbh_platform_data usbh1_pdata = {
.flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |
MXC_EHCI_IPPUE_DOWN, MXC_EHCI_IPPUE_DOWN,
}; };
#endif
static struct fsl_usb2_platform_data otg_device_pdata = { static struct fsl_usb2_platform_data otg_device_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE, .operating_mode = FSL_USB2_DR_DEVICE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment