On Wed, Jun 13, 2012 at 11:46:22PM +0200, Sascha Hauer wrote:
> On Wed, Jun 13, 2012 at 08:34:16PM +0800, Richard Zhao wrote:
> > This patch supports only the host-mode functionality so far.
> >
> > Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
> > Signed-off-by: Marek Vasut <marex@xxxxxxx>
> > Cc: Peter Chen <peter.chen@xxxxxxxxxxxxx>
> > Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> > Cc: Felipe Balbi <balbi@xxxxxx>
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > ---
> > .../devicetree/bindings/usb/ci13xxx-imx.txt | 20 +++
> > drivers/usb/chipidea/Makefile | 3 +
> > drivers/usb/chipidea/ci13xxx_imx.c | 189 ++++++++++++++++++++
> > 3 files changed, 212 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
> > create mode 100644 drivers/usb/chipidea/ci13xxx_imx.c
> >
> > diff --git a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
> > new file mode 100644
> > index 0000000..beb75d6
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
> > @@ -0,0 +1,20 @@
> > +* Freescale i.MX ci13xxx usb controllers
> > +
> > +Required properties:
> > +- compatible: Should be "fsl,imx31-usb"
> > +- reg: Should contain registers location and length
> > +- interrupts: Should contain controller interrupt
> > +
> > +Optional properties:
> > +- fsl,usbphy: phandler of usb phy that connects to the only one port
> > +- fsl,hub-reset-gpios: gpio used to reset on-board usb hub
> > +- fsl,vbus-power-gpios: gpio used to set vbus power of the only one port
> > +
> > +Examples:
> > +usb@02184000 { /* USB OTG */
> > + compatible = "fsl,imx6q-usb", "fsl,imx31-usb";
>
> The i.MX27 also has this core. As it's older that's probably the right
> fallback instead of i.MX31.
hmm.., I'll check the history and change it if it's correct.
>
> > + reg = <0x02184000 0x200>;
> > + interrupts = <0 43 0x04>;
> > + fsl,usbphy = <&usbphy1>;
> > + fsl,vbus-power-gpios = <&gpio3 22 0>;
> > +};
> > diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> > index b69900a..5c66d9c 100644
> > --- a/drivers/usb/chipidea/Makefile
> > +++ b/drivers/usb/chipidea/Makefile
> > @@ -14,3 +14,6 @@ ifneq ($(CONFIG_PCI),)
> > obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_pci.o
> > endif
> >
> > +ifneq ($(CONFIG_OF_DEVICE),)
> > + obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_imx.o
> > +endif
> > +
> > +static int __devinit ci13xxx_imx_probe(struct platform_device *pdev)
> > +{
> > + struct ci13xxx_imx_data *data;
> > + struct platform_device *plat_ci, *phy_pdev;
> > + struct device_node *phy_np;
> > + struct resource *res;
> > + struct regulator *reg_vbus;
> > + int ret;
> > +
> > + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> > + if (!data) {
> > + dev_err(&pdev->dev, "Failed to allocate CI13xxx-IMX data!\n");
>
> Same as in the other patch: This message contains no useful information.
>
> > + return -ENOMEM;
> > + }
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + if (!res) {
> > + dev_err(&pdev->dev, "Can't get device resources!\n");
> > + return -ENOENT;
> > + }
> > +
> > + data->clk = devm_clk_get(&pdev->dev, NULL);
> > + if (IS_ERR(data->clk)) {
> > + dev_err(&pdev->dev, "Failed to get clock!\n");
> > + return PTR_ERR(data->clk);
> > + }
> > +
> > + ret = clk_prepare_enable(data->clk);
>
> You forgot to undo this is the error path.
Nice catch.
>
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to prepare or enable clock!\n");
> > + return ret;
> > + }
> > +
> > + phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
> > + if (phy_np) {
>
> Ok, we maybe can do without a phy on some devices, but if we have one...
Some phy maybe passed by usb_set_transceiver. It's handled by chipidea
udc driver.
>
> > + data->phy_np = phy_np;
> > + phy_pdev = of_find_device_by_node(phy_np);
> > + if (phy_pdev) {
>
> ... shouldn't it be an error if we do not find the device?
Same reason as above. We still have chance to pass phy
by usb_set_transceiver.
>
> > + struct usb_phy *phy;
> > + phy = pdev_to_phy(phy_pdev);
> > + if (phy &&
> > + try_module_get(phy_pdev->dev.driver->owner)) {
> > + usb_phy_init(phy);
> > + data->phy = phy;
> > + }
> > + }
> > + }
> > +
> > + /* we only support host now, so enable vbus here */
> > + reg_vbus = devm_regulator_get(&pdev->dev, "vbus");
> > + if (!IS_ERR(reg_vbus)) {
> > + ret = regulator_enable(reg_vbus);
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "Failed to enable vbus regulator!\n");
> > + goto put_np;
> > + }
> > + data->reg_vbus = reg_vbus;
> > + } else
> > + reg_vbus = NULL;
>
> If you have braces in one path of a if/else add them to the other path
> aswell.
I just tried it didn't cause warning of checkpatch. I'll change it.
>
> > +
> > + ci13xxx_imx_platdata.phy = data->phy;
> > +
> > + if (!pdev->dev.dma_mask) {
> > + pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
> > + sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
> > + if (!pdev->dev.dma_mask) {
> > + ret = -ENOMEM;
> > + dev_err(&pdev->dev, "Failed to alloc dma_mask!\n");
> > + goto err;
> > + }
> > + *pdev->dev.dma_mask = DMA_BIT_MASK(32);
> > + dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask);
> > + }
>
> Do you need this? I assume not.
DT didn't set dma_mask when populate devices.
Thanks
Richard
>
> Sascha
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
