Re: [PATCH 1/3 v2] USB: ohci-exynos: Add support for device tree

2012-07-13 Thread Jingoo Han 
On Thursday, July 12, 2012 2:55 PM, Vivek Gautam wrote:
> 
> This patch adds support to parse probe data for
> ohci driver for exynos using device tree.
> 
> Signed-off-by: Thomas Abraham 
> Signed-off-by: Abhilash Kesavan 
> Signed-off-by: Vivek Gautam 
> 
> diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
> index 2909621..c4ad60f 100644
> --- a/drivers/usb/host/ohci-exynos.c
> +++ b/drivers/usb/host/ohci-exynos.c
> @@ -12,6 +12,7 @@
>   */
> 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = {
>   .start_port_reset   = ohci_start_port_reset,
>  };
> 
> +static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
> +
>  static int __devinit exynos_ohci_probe(struct platform_device *pdev)
>  {
>   struct exynos4_ohci_platdata *pdata;
> @@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct 
> platform_device *pdev)
>   return -EINVAL;
>   }
> 
> + /*
> +  * Right now device-tree probed devices don't get dma_mask set.
> +  * Since shared usb code relies on it, set it here for now.
> +  * Once we move to full device tree support this will vanish off.
> +  */
> + if (!pdev->dev.dma_mask)
> + pdev->dev.dma_mask = _exynos_dma_mask;
> + if (!pdev->dev.coherent_dma_mask)
> + pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
> +
>   exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);

This makes conflict on 'usb-next' branch.
Please re-base the patch on 'usb-next' branch.

>   if (!exynos_ohci)
>   return -ENOMEM;
> @@ -258,6 +271,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
>   .resume = exynos_ohci_resume,
>  };
> 
> +#ifdef CONFIG_OF
> +static const struct of_device_id exynos_ohci_match[] = {
> + { .compatible = "samsung,exynos-ohci" },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, exynos_ohci_match);
> +#endif
> +
>  static struct platform_driver exynos_ohci_driver = {
>   .probe  = exynos_ohci_probe,
>   .remove = __devexit_p(exynos_ohci_remove),
> @@ -266,6 +287,7 @@ static struct platform_driver exynos_ohci_driver = {
>   .name   = "exynos-ohci",
>   .owner  = THIS_MODULE,
>   .pm = _ohci_pm_ops,
> + .of_match_table = of_match_ptr(exynos_ohci_match),
>   }
>  };
> 
> --
> 1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/3 v2] USB: ohci-exynos: Add support for device tree

2012-07-13 Thread Jingoo Han 
On Thursday, July 12, 2012 2:55 PM, Vivek Gautam wrote:
 
 This patch adds support to parse probe data for
 ohci driver for exynos using device tree.
 
 Signed-off-by: Thomas Abraham thomas.abra...@linaro.org
 Signed-off-by: Abhilash Kesavan a.kesa...@samsung.com
 Signed-off-by: Vivek Gautam gautam.vi...@samsung.com
 
 diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
 index 2909621..c4ad60f 100644
 --- a/drivers/usb/host/ohci-exynos.c
 +++ b/drivers/usb/host/ohci-exynos.c
 @@ -12,6 +12,7 @@
   */
 
  #include linux/clk.h
 +#include linux/of.h
  #include linux/platform_device.h
  #include mach/ohci.h
  #include plat/usb-phy.h
 @@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = {
   .start_port_reset   = ohci_start_port_reset,
  };
 
 +static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
 +
  static int __devinit exynos_ohci_probe(struct platform_device *pdev)
  {
   struct exynos4_ohci_platdata *pdata;
 @@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct 
 platform_device *pdev)
   return -EINVAL;
   }
 
 + /*
 +  * Right now device-tree probed devices don't get dma_mask set.
 +  * Since shared usb code relies on it, set it here for now.
 +  * Once we move to full device tree support this will vanish off.
 +  */
 + if (!pdev-dev.dma_mask)
 + pdev-dev.dma_mask = ohci_exynos_dma_mask;
 + if (!pdev-dev.coherent_dma_mask)
 + pdev-dev.coherent_dma_mask = DMA_BIT_MASK(32);
 +
   exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);

This makes conflict on 'usb-next' branch.
Please re-base the patch on 'usb-next' branch.

   if (!exynos_ohci)
   return -ENOMEM;
 @@ -258,6 +271,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
   .resume = exynos_ohci_resume,
  };
 
 +#ifdef CONFIG_OF
 +static const struct of_device_id exynos_ohci_match[] = {
 + { .compatible = samsung,exynos-ohci },
 + {},
 +};
 +MODULE_DEVICE_TABLE(of, exynos_ohci_match);
 +#endif
 +
  static struct platform_driver exynos_ohci_driver = {
   .probe  = exynos_ohci_probe,
   .remove = __devexit_p(exynos_ohci_remove),
 @@ -266,6 +287,7 @@ static struct platform_driver exynos_ohci_driver = {
   .name   = exynos-ohci,
   .owner  = THIS_MODULE,
   .pm = exynos_ohci_pm_ops,
 + .of_match_table = of_match_ptr(exynos_ohci_match),
   }
  };
 
 --
 1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/3 v2] USB: ohci-exynos: Add support for device tree

2012-07-11 Thread Vivek Gautam 
This patch adds support to parse probe data for
ohci driver for exynos using device tree.

Signed-off-by: Thomas Abraham 
Signed-off-by: Abhilash Kesavan 
Signed-off-by: Vivek Gautam 

diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 2909621..c4ad60f 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -12,6 +12,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = {
.start_port_reset   = ohci_start_port_reset,
 };
 
+static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
+
 static int __devinit exynos_ohci_probe(struct platform_device *pdev)
 {
struct exynos4_ohci_platdata *pdata;
@@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct 
platform_device *pdev)
return -EINVAL;
}
 
+   /*
+* Right now device-tree probed devices don't get dma_mask set.
+* Since shared usb code relies on it, set it here for now.
+* Once we move to full device tree support this will vanish off.
+*/
+   if (!pdev->dev.dma_mask)
+   pdev->dev.dma_mask = _exynos_dma_mask;
+   if (!pdev->dev.coherent_dma_mask)
+   pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);
if (!exynos_ohci)
return -ENOMEM;
@@ -258,6 +271,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
.resume = exynos_ohci_resume,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id exynos_ohci_match[] = {
+   { .compatible = "samsung,exynos-ohci" },
+   {},
+};
+MODULE_DEVICE_TABLE(of, exynos_ohci_match);
+#endif
+
 static struct platform_driver exynos_ohci_driver = {
.probe  = exynos_ohci_probe,
.remove = __devexit_p(exynos_ohci_remove),
@@ -266,6 +287,7 @@ static struct platform_driver exynos_ohci_driver = {
.name   = "exynos-ohci",
.owner  = THIS_MODULE,
.pm = _ohci_pm_ops,
+   .of_match_table = of_match_ptr(exynos_ohci_match),
}
 };
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/3 v2] USB: ohci-exynos: Add support for device tree

2012-07-11 Thread Vivek Gautam 
This patch adds support to parse probe data for
ohci driver for exynos using device tree.

Signed-off-by: Thomas Abraham thomas.abra...@linaro.org
Signed-off-by: Abhilash Kesavan a.kesa...@samsung.com
Signed-off-by: Vivek Gautam gautam.vi...@samsung.com

diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 2909621..c4ad60f 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -12,6 +12,7 @@
  */
 
 #include linux/clk.h
+#include linux/of.h
 #include linux/platform_device.h
 #include mach/ohci.h
 #include plat/usb-phy.h
@@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = {
.start_port_reset   = ohci_start_port_reset,
 };
 
+static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
+
 static int __devinit exynos_ohci_probe(struct platform_device *pdev)
 {
struct exynos4_ohci_platdata *pdata;
@@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct 
platform_device *pdev)
return -EINVAL;
}
 
+   /*
+* Right now device-tree probed devices don't get dma_mask set.
+* Since shared usb code relies on it, set it here for now.
+* Once we move to full device tree support this will vanish off.
+*/
+   if (!pdev-dev.dma_mask)
+   pdev-dev.dma_mask = ohci_exynos_dma_mask;
+   if (!pdev-dev.coherent_dma_mask)
+   pdev-dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);
if (!exynos_ohci)
return -ENOMEM;
@@ -258,6 +271,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
.resume = exynos_ohci_resume,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id exynos_ohci_match[] = {
+   { .compatible = samsung,exynos-ohci },
+   {},
+};
+MODULE_DEVICE_TABLE(of, exynos_ohci_match);
+#endif
+
 static struct platform_driver exynos_ohci_driver = {
.probe  = exynos_ohci_probe,
.remove = __devexit_p(exynos_ohci_remove),
@@ -266,6 +287,7 @@ static struct platform_driver exynos_ohci_driver = {
.name   = exynos-ohci,
.owner  = THIS_MODULE,
.pm = exynos_ohci_pm_ops,
+   .of_match_table = of_match_ptr(exynos_ohci_match),
}
 };
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/