LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sunxi: usbc: Add support for usb0 to the common usbc code 

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2015-01-07 15:26:06 +01:00
parent 0eccec4ef1
commit 4458b7a6e1
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/cpu/armv7/sunxi/usbc.c
View File

@ -35,6 +35,16 @@ static struct sunxi_usbc_hcd {
int irq; int irq;
int id; int id;
} sunxi_usbc_hcd[] = { } sunxi_usbc_hcd[] = {
{
.usb_rst_mask = CCM_USB_CTRL_PHY0_RST | CCM_USB_CTRL_PHY0_CLK,
.ahb_clk_mask = 1 << AHB_GATE_OFFSET_USB0,
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I
.irq = 71,
#else
.irq = 38,
#endif
.id = 0,
},
{ {
.usb_rst_mask = CCM_USB_CTRL_PHY1_RST | CCM_USB_CTRL_PHY1_CLK, .usb_rst_mask = CCM_USB_CTRL_PHY1_RST | CCM_USB_CTRL_PHY1_CLK,
.ahb_clk_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0, .ahb_clk_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0,
@ -78,6 +88,7 @@ void *sunxi_usbc_get_io_base(int index)
static int get_vbus_gpio(int index) static int get_vbus_gpio(int index)
{ {
switch (index) { switch (index) {
case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_PIN);
case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN); case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN);
case 2: return sunxi_name_to_gpio(CONFIG_USB2_VBUS_PIN); case 2: return sunxi_name_to_gpio(CONFIG_USB2_VBUS_PIN);
} }
@ -117,6 +128,10 @@ static void sunxi_usb_phy_init(struct sunxi_usbc_hcd *sunxi_usbc)
* translated from Chinese, you have been warned! * translated from Chinese, you have been warned!
*/ */
/* Regulation 45 ohms */
if (sunxi_usbc->id == 0)
usb_phy_write(sunxi_usbc, 0x0c, 0x01, 1);
/* adjust PHY's magnitude and rate */ /* adjust PHY's magnitude and rate */
usb_phy_write(sunxi_usbc, 0x20, 0x14, 5); usb_phy_write(sunxi_usbc, 0x20, 0x14, 5);
@ -151,7 +166,7 @@ static void sunxi_usb_passby(struct sunxi_usbc_hcd *sunxi_usbc, int enable)
int sunxi_usbc_request_resources(int index) int sunxi_usbc_request_resources(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
sunxi_usbc->gpio_vbus = get_vbus_gpio(index); sunxi_usbc->gpio_vbus = get_vbus_gpio(index);
if (sunxi_usbc->gpio_vbus != -1) if (sunxi_usbc->gpio_vbus != -1)
@ -162,7 +177,7 @@ int sunxi_usbc_request_resources(int index)
int sunxi_usbc_free_resources(int index) int sunxi_usbc_free_resources(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
if (sunxi_usbc->gpio_vbus != -1) if (sunxi_usbc->gpio_vbus != -1)
return gpio_free(sunxi_usbc->gpio_vbus); return gpio_free(sunxi_usbc->gpio_vbus);
@ -172,7 +187,7 @@ int sunxi_usbc_free_resources(int index)
void sunxi_usbc_enable(int index) void sunxi_usbc_enable(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
/* enable common PHY only once */ /* enable common PHY only once */
@ -187,17 +202,19 @@ void sunxi_usbc_enable(int index)
sunxi_usb_phy_init(sunxi_usbc); sunxi_usb_phy_init(sunxi_usbc);
sunxi_usb_passby(sunxi_usbc, SUNXI_USB_PASSBY_EN); if (sunxi_usbc->id != 0)
sunxi_usb_passby(sunxi_usbc, SUNXI_USB_PASSBY_EN);
enabled_hcd_count++; enabled_hcd_count++;
} }
void sunxi_usbc_disable(int index) void sunxi_usbc_disable(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
sunxi_usb_passby(sunxi_usbc, !SUNXI_USB_PASSBY_EN); if (sunxi_usbc->id != 0)
sunxi_usb_passby(sunxi_usbc, !SUNXI_USB_PASSBY_EN);
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I
clrbits_le32(&ccm->ahb_reset0_cfg, sunxi_usbc->ahb_clk_mask); clrbits_le32(&ccm->ahb_reset0_cfg, sunxi_usbc->ahb_clk_mask);
@ -214,7 +231,7 @@ void sunxi_usbc_disable(int index)
void sunxi_usbc_vbus_enable(int index) void sunxi_usbc_vbus_enable(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
if (sunxi_usbc->gpio_vbus != -1) if (sunxi_usbc->gpio_vbus != -1)
gpio_direction_output(sunxi_usbc->gpio_vbus, 1); gpio_direction_output(sunxi_usbc->gpio_vbus, 1);
@ -222,7 +239,7 @@ void sunxi_usbc_vbus_enable(int index)
void sunxi_usbc_vbus_disable(int index) void sunxi_usbc_vbus_disable(int index)
{ {
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index - 1]; struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
if (sunxi_usbc->gpio_vbus != -1) if (sunxi_usbc->gpio_vbus != -1)
gpio_direction_output(sunxi_usbc->gpio_vbus, 0); gpio_direction_output(sunxi_usbc->gpio_vbus, 0);

4
arch/arm/include/asm/arch-sunxi/clock_sun4i.h
View File

@ -302,10 +302,12 @@ struct sunxi_ccm_reg {
#define CCM_GMAC_CTRL_GPIT_MII (0x0 << 2) #define CCM_GMAC_CTRL_GPIT_MII (0x0 << 2)
#define CCM_GMAC_CTRL_GPIT_RGMII (0x1 << 2) #define CCM_GMAC_CTRL_GPIT_RGMII (0x1 << 2)
#define CCM_USB_CTRL_PHY0_RST (0x1 << 0)
#define CCM_USB_CTRL_PHY1_RST (0x1 << 1) #define CCM_USB_CTRL_PHY1_RST (0x1 << 1)
#define CCM_USB_CTRL_PHY2_RST (0x1 << 2) #define CCM_USB_CTRL_PHY2_RST (0x1 << 2)
#define CCM_USB_CTRL_PHYGATE (0x1 << 8) #define CCM_USB_CTRL_PHYGATE (0x1 << 8)
/* These 2 are sun6i only, define them as 0 on sun4i */ /* These 3 are sun6i only, define them as 0 on sun4i */
#define CCM_USB_CTRL_PHY0_CLK 0
#define CCM_USB_CTRL_PHY1_CLK 0 #define CCM_USB_CTRL_PHY1_CLK 0
#define CCM_USB_CTRL_PHY2_CLK 0 #define CCM_USB_CTRL_PHY2_CLK 0

2
arch/arm/include/asm/arch-sunxi/clock_sun6i.h
View File

@ -229,10 +229,12 @@ struct sunxi_ccm_reg {
#define CCM_MMC_CTRL_PLL6 (0x1 << 24) #define CCM_MMC_CTRL_PLL6 (0x1 << 24)
#define CCM_MMC_CTRL_ENABLE (0x1 << 31) #define CCM_MMC_CTRL_ENABLE (0x1 << 31)
#define CCM_USB_CTRL_PHY0_RST (0x1 << 0)
#define CCM_USB_CTRL_PHY1_RST (0x1 << 1) #define CCM_USB_CTRL_PHY1_RST (0x1 << 1)
#define CCM_USB_CTRL_PHY2_RST (0x1 << 2) #define CCM_USB_CTRL_PHY2_RST (0x1 << 2)
/* There is no global phy clk gate on sun6i, define as 0 */ /* There is no global phy clk gate on sun6i, define as 0 */
#define CCM_USB_CTRL_PHYGATE 0 #define CCM_USB_CTRL_PHYGATE 0
#define CCM_USB_CTRL_PHY0_CLK (0x1 << 8)
#define CCM_USB_CTRL_PHY1_CLK (0x1 << 9) #define CCM_USB_CTRL_PHY1_CLK (0x1 << 9)
#define CCM_USB_CTRL_PHY2_CLK (0x1 << 10) #define CCM_USB_CTRL_PHY2_CLK (0x1 << 10)

7
board/sunxi/Kconfig
View File

@ -267,6 +267,13 @@ config MMC_SUNXI_SLOT_EXTRA
slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable
support for this. support for this.
config USB0_VBUS_PIN
string "Vbus enable pin for usb0 (otg)"
default ""
---help---
Set the Vbus enable pin for usb0 (otg). This takes a string in the
format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
config USB1_VBUS_PIN config USB1_VBUS_PIN
string "Vbus enable pin for usb1 (ehci0)" string "Vbus enable pin for usb1 (ehci0)"
default "PH6" if MACH_SUN4I || MACH_SUN7I default "PH6" if MACH_SUN4I || MACH_SUN7I