Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b69dce63 authored by Chris Brandt's avatar Chris Brandt Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: Add support for RZ/A2 



The RZ/A2 is similar to the R-Car Gen3 with some small differences.

Signed-off-by: default avatarChris Brandt <chris.brandt@renesas.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7560669

drivers/usb/renesas_usbhs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs.o



renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o rcar2.o rcar3.o rza.o

renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o rcar2.o rcar3.o rza.o rza2.o



ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),)

	renesas_usbhs-y		+= mod_host.o

drivers/usb/renesas_usbhs/common.c

+15 −0
Original line number Diff line number Diff line
@@ -571,6 +571,17 @@ static const struct usbhs_of_data rza1_data = { 
	}

};



static const struct usbhs_of_data rza2_data = {

	.platform_callback = &usbhs_rza2_ops,

	.param = {

		.type = USBHS_TYPE_RZA2,

		.has_cnen = 1,

		.cfifo_byte_addr = 1,

		.pipe_configs = usbhsc_new_pipe,

		.pipe_size = ARRAY_SIZE(usbhsc_new_pipe),

	}

};



/*

 *		platform functions

 */
@@ -619,6 +630,10 @@ static const struct of_device_id usbhs_of_match[] = { 
		.compatible = "renesas,rza1-usbhs",

		.data = &rza1_data,

	},

	{

		.compatible = "renesas,rza2-usbhs",

		.data = &rza2_data,

	},

	{ },

};

MODULE_DEVICE_TABLE(of, usbhs_of_match);

drivers/usb/renesas_usbhs/rza.h

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
#include "common.h"



extern const struct renesas_usbhs_platform_callback usbhs_rza1_ops;

extern const struct renesas_usbhs_platform_callback usbhs_rza2_ops;

drivers/usb/renesas_usbhs/rza2.c

0 → 100644
+72 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Renesas USB driver RZ/A2 initialization and power control

 *

 * Copyright (C) 2019 Chris Brandt

 * Copyright (C) 2019 Renesas Electronics Corporation

 */



#include <linux/delay.h>

#include <linux/io.h>

#include <linux/of_device.h>

#include <linux/phy/phy.h>

#include "common.h"

#include "rza.h"



static int usbhs_rza2_hardware_init(struct platform_device *pdev)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

	struct phy *phy = phy_get(&pdev->dev, "usb");



	if (IS_ERR(phy))

		return PTR_ERR(phy);



	priv->phy = phy;

	return 0;

}



static int usbhs_rza2_hardware_exit(struct platform_device *pdev)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);



	phy_put(priv->phy);

	priv->phy = NULL;



	return 0;

}



static int usbhs_rza2_power_ctrl(struct platform_device *pdev,

				void __iomem *base, int enable)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

	int retval = 0;



	if (!priv->phy)

		return -ENODEV;



	if (enable) {

		retval = phy_init(priv->phy);

		usbhs_bset(priv, SUSPMODE, SUSPM, SUSPM);

		udelay(100);	/* Wait for PLL to become stable */

		if (!retval)

			retval = phy_power_on(priv->phy);

	} else {

		usbhs_bset(priv, SUSPMODE, SUSPM, 0);

		phy_power_off(priv->phy);

		phy_exit(priv->phy);

	}



	return retval;

}



static int usbhs_rza2_get_id(struct platform_device *pdev)

{

	return USBHS_GADGET;

}



const struct renesas_usbhs_platform_callback usbhs_rza2_ops = {

	.hardware_init = usbhs_rza2_hardware_init,

	.hardware_exit = usbhs_rza2_hardware_exit,

	.power_ctrl = usbhs_rza2_power_ctrl,

	.get_id = usbhs_rza2_get_id,

};

include/linux/usb/renesas_usbhs.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ struct renesas_usbhs_driver_param { 
#define USBHS_TYPE_RCAR_GEN3		2

#define USBHS_TYPE_RCAR_GEN3_WITH_PLL	3

#define USBHS_TYPE_RZA1			4

#define USBHS_TYPE_RZA2			5



/*

 * option: