122 lines
4.6 KiB
Diff
122 lines
4.6 KiB
Diff
|
--- a/arch/mips/bcm63xx/usb-common.c
|
||
|
|
+++ b/arch/mips/bcm63xx/usb-common.c
|
||
|
|
@@ -109,6 +109,27 @@ void bcm63xx_usb_priv_ohci_cfg_set(void)
|
||
|
|
reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
|
||
|
|
reg |= USBH_PRIV_SETUP_IOC_MASK;
|
||
|
|
bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
|
||
|
|
+ } else if (BCMCPU_IS_6318()) {
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_PLL_CTRL1_SUSP_EN;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6318_REG);
|
||
|
|
+ reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
|
||
|
|
+ reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_SETUP_IOC_MASK;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+ reg &= ~USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SIM_CTRL_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_SIM_CTRL_LADDR_SEL;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SIM_CTRL_6318_REG);
|
||
|
|
}
|
||
|
|
|
||
|
|
spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
|
||
|
|
@@ -144,6 +165,27 @@ void bcm63xx_usb_priv_ehci_cfg_set(void)
|
||
|
|
reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
|
||
|
|
reg |= USBH_PRIV_SETUP_IOC_MASK;
|
||
|
|
bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
|
||
|
|
+ } else if (BCMCPU_IS_6318()) {
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_PLL_CTRL1_SUSP_EN;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6318_REG);
|
||
|
|
+ reg &= ~USBH_PRIV_SWAP_EHCI_ENDN_MASK;
|
||
|
|
+ reg |= USBH_PRIV_SWAP_EHCI_DATA_MASK;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_SETUP_IOC_MASK;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+ reg &= ~USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
|
||
|
|
+
|
||
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SIM_CTRL_6318_REG);
|
||
|
|
+ reg |= USBH_PRIV_SIM_CTRL_LADDR_SEL;
|
||
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SIM_CTRL_6318_REG);
|
||
|
|
}
|
||
|
|
|
||
|
|
spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
|
||
|
|
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||
|
|
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||
|
|
@@ -800,6 +800,12 @@
|
||
|
|
#define GPIO_MODE_6368_SPI_SSN4 (1 << 30)
|
||
|
|
#define GPIO_MODE_6368_SPI_SSN5 (1 << 31)
|
||
|
|
|
||
|
|
+#define GPIO_PINMUX_SEL0_6318 0x1c
|
||
|
|
+#define GPIO_PINMUX_SEL0_GPIO13_SHIFT 26
|
||
|
|
+#define GPIO_PINMUX_SEL0_GPIO13_MASK (0x3 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
|
||
|
|
+#define GPIO_PINMUX_SEL0_GPIO13_PWRON (1 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
|
||
|
|
+#define GPIO_PINMUX_SEL0_GPIO13_LED (2 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
|
||
|
|
+#define GPIO_PINMUX_SEL0_GPIO13_GPIO (3 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
|
||
|
|
|
||
|
|
#define GPIO_PINMUX_OTHR_REG 0x24
|
||
|
|
#define GPIO_PINMUX_OTHR_6328_USB_SHIFT 12
|
||
|
|
@@ -1118,6 +1124,7 @@
|
||
|
|
|
||
|
|
#define USBH_PRIV_SWAP_6358_REG 0x0
|
||
|
|
#define USBH_PRIV_SWAP_6368_REG 0x1c
|
||
|
|
+#define USBH_PRIV_SWAP_6318_REG 0x0c
|
||
|
|
|
||
|
|
#define USBH_PRIV_SWAP_USBD_SHIFT 6
|
||
|
|
#define USBH_PRIV_SWAP_USBD_MASK (1 << USBH_PRIV_SWAP_USBD_SHIFT)
|
||
|
|
@@ -1143,6 +1150,13 @@
|
||
|
|
#define USBH_PRIV_SETUP_IOC_SHIFT 4
|
||
|
|
#define USBH_PRIV_SETUP_IOC_MASK (1 << USBH_PRIV_SETUP_IOC_SHIFT)
|
||
|
|
|
||
|
|
+#define USBH_PRIV_SETUP_6318_REG 0x00
|
||
|
|
+#define USBH_PRIV_PLL_CTRL1_6318_REG 0x04
|
||
|
|
+#define USBH_PRIV_PLL_CTRL1_SUSP_EN (1 << 27)
|
||
|
|
+#define USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN (1 << 31)
|
||
|
|
+#define USBH_PRIV_SIM_CTRL_6318_REG 0x20
|
||
|
|
+#define USBH_PRIV_SIM_CTRL_LADDR_SEL (1 << 5)
|
||
|
|
+
|
||
|
|
|
||
|
|
/*************************************************************************
|
||
|
|
* _REG relative to RSET_USBD
|
||
|
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||
|
|
@@ -299,6 +299,7 @@ static struct board_info __initdata boar
|
||
|
|
.has_ohci0 = 1,
|
||
|
|
.has_pccard = 1,
|
||
|
|
.has_ehci0 = 1,
|
||
|
|
+ .has_ehci0 = 1,
|
||
|
|
|
||
|
|
.has_dsp = 1,
|
||
|
|
.dsp = {
|
||
|
|
@@ -914,6 +915,15 @@ void __init board_prom_init(void)
|
||
|
|
}
|
||
|
|
|
||
|
|
bcm_gpio_writel(val, GPIO_MODE_REG);
|
||
|
|
+
|
||
|
|
+#if IS_ENABLED(CONFIG_USB)
|
||
|
|
+ if (BCMCPU_IS_6318() && (board.has_ehci0 || board.has_ohci0)) {
|
||
|
|
+ val = bcm_gpio_readl(GPIO_PINMUX_SEL0_6318);
|
||
|
|
+ val &= ~GPIO_PINMUX_SEL0_GPIO13_MASK;
|
||
|
|
+ val |= GPIO_PINMUX_SEL0_GPIO13_PWRON;
|
||
|
|
+ bcm_gpio_writel(val, GPIO_PINMUX_SEL0_6318);
|
||
|
|
+ }
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|