Re: [PATCH v2 1/3] powerpc/fsl_soc.c: remove FSL USB platform code

2010-09-28 Thread Anton Vorontsov
On Tue, Sep 28, 2010 at 11:36:32AM +0200, Anatolij Gustschin wrote:
> This removed code will be replaced by simple of_platform
> driver for creation of FSL USB platform devices which is
> added by next patch of the series.
> 
> Signed-off-by: Anatolij Gustschin 
> Cc: Kumar Gala 
> Cc: Grant Likely 
> ---

This is not bisectable. You have to merge 1/3 and 2/3.

Thanks,

-- 
Anton Vorontsov
email: cbouatmai...@gmail.com
irc://irc.freenode.net/bd2
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev


[PATCH v2 1/3] powerpc/fsl_soc.c: remove FSL USB platform code

2010-09-28 Thread Anatolij Gustschin
This removed code will be replaced by simple of_platform
driver for creation of FSL USB platform devices which is
added by next patch of the series.

Signed-off-by: Anatolij Gustschin 
Cc: Kumar Gala 
Cc: Grant Likely 
---
 arch/powerpc/sysdev/fsl_soc.c |  163 -
 1 files changed, 0 insertions(+), 163 deletions(-)

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index b91f7ac..49a51f1 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -209,169 +209,6 @@ static int __init of_add_fixed_phys(void)
 arch_initcall(of_add_fixed_phys);
 #endif /* CONFIG_FIXED_PHY */
 
-static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
-{
-   if (!phy_type)
-   return FSL_USB2_PHY_NONE;
-   if (!strcasecmp(phy_type, "ulpi"))
-   return FSL_USB2_PHY_ULPI;
-   if (!strcasecmp(phy_type, "utmi"))
-   return FSL_USB2_PHY_UTMI;
-   if (!strcasecmp(phy_type, "utmi_wide"))
-   return FSL_USB2_PHY_UTMI_WIDE;
-   if (!strcasecmp(phy_type, "serial"))
-   return FSL_USB2_PHY_SERIAL;
-
-   return FSL_USB2_PHY_NONE;
-}
-
-static int __init fsl_usb_of_init(void)
-{
-   struct device_node *np;
-   unsigned int i = 0;
-   struct platform_device *usb_dev_mph = NULL, *usb_dev_dr_host = NULL,
-   *usb_dev_dr_client = NULL;
-   int ret;
-
-   for_each_compatible_node(np, NULL, "fsl-usb2-mph") {
-   struct resource r[2];
-   struct fsl_usb2_platform_data usb_data;
-   const unsigned char *prop = NULL;
-
-   memset(&r, 0, sizeof(r));
-   memset(&usb_data, 0, sizeof(usb_data));
-
-   ret = of_address_to_resource(np, 0, &r[0]);
-   if (ret)
-   goto err;
-
-   of_irq_to_resource(np, 0, &r[1]);
-
-   usb_dev_mph =
-   platform_device_register_simple("fsl-ehci", i, r, 2);
-   if (IS_ERR(usb_dev_mph)) {
-   ret = PTR_ERR(usb_dev_mph);
-   goto err;
-   }
-
-   usb_dev_mph->dev.coherent_dma_mask = 0xUL;
-   usb_dev_mph->dev.dma_mask = &usb_dev_mph->dev.coherent_dma_mask;
-
-   usb_data.operating_mode = FSL_USB2_MPH_HOST;
-
-   prop = of_get_property(np, "port0", NULL);
-   if (prop)
-   usb_data.port_enables |= FSL_USB2_PORT0_ENABLED;
-
-   prop = of_get_property(np, "port1", NULL);
-   if (prop)
-   usb_data.port_enables |= FSL_USB2_PORT1_ENABLED;
-
-   prop = of_get_property(np, "phy_type", NULL);
-   usb_data.phy_mode = determine_usb_phy(prop);
-
-   ret =
-   platform_device_add_data(usb_dev_mph, &usb_data,
-sizeof(struct
-   fsl_usb2_platform_data));
-   if (ret)
-   goto unreg_mph;
-   i++;
-   }
-
-   for_each_compatible_node(np, NULL, "fsl-usb2-dr") {
-   struct resource r[2];
-   struct fsl_usb2_platform_data usb_data;
-   const unsigned char *prop = NULL;
-
-   if (!of_device_is_available(np))
-   continue;
-
-   memset(&r, 0, sizeof(r));
-   memset(&usb_data, 0, sizeof(usb_data));
-
-   ret = of_address_to_resource(np, 0, &r[0]);
-   if (ret)
-   goto unreg_mph;
-
-   of_irq_to_resource(np, 0, &r[1]);
-
-   prop = of_get_property(np, "dr_mode", NULL);
-
-   if (!prop || !strcmp(prop, "host")) {
-   usb_data.operating_mode = FSL_USB2_DR_HOST;
-   usb_dev_dr_host = platform_device_register_simple(
-   "fsl-ehci", i, r, 2);
-   if (IS_ERR(usb_dev_dr_host)) {
-   ret = PTR_ERR(usb_dev_dr_host);
-   goto err;
-   }
-   } else if (prop && !strcmp(prop, "peripheral")) {
-   usb_data.operating_mode = FSL_USB2_DR_DEVICE;
-   usb_dev_dr_client = platform_device_register_simple(
-   "fsl-usb2-udc", i, r, 2);
-   if (IS_ERR(usb_dev_dr_client)) {
-   ret = PTR_ERR(usb_dev_dr_client);
-   goto err;
-   }
-   } else if (prop && !strcmp(prop, "otg")) {
-   usb_data.operating_mode = FSL_USB2_DR_OTG;
-   usb_dev_dr_host = platform_device_register_simple(
-   "fsl-ehci", i, r, 2);
-   if