ar71xx: add support for QCA953x SoC
I don't have access to the specs, so I'm not sure about every detail, but I haven't seen any problems with my test system, a TL-WR841N v9. It looks pretty much like a QCA955x without PCI, a little twist in the clock calculation and a AR9331-compatible switch. Features not yet supported: * EHCI (my test system doesn't have USB) * ? (I have no idea if the QCA953x has any other features I don't know about that aren't used by the TL-WR841N v9) Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 40399
This commit is contained in:
Felix Fietkau
parent
dba8a58b46
commit
f80f0c7d22
@ -263,6 +263,7 @@ CONFIG_SOC_AR724X=y
|
|||||||
CONFIG_SOC_AR913X=y
|
CONFIG_SOC_AR913X=y
|
||||||
CONFIG_SOC_AR933X=y
|
CONFIG_SOC_AR933X=y
|
||||||
CONFIG_SOC_AR934X=y
|
CONFIG_SOC_AR934X=y
|
||||||
|
CONFIG_SOC_QCA953X=y
|
||||||
CONFIG_SOC_QCA955X=y
|
CONFIG_SOC_QCA955X=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
CONFIG_SPI_AP83=y
|
CONFIG_SPI_AP83=y
|
||||||
|
|||||||
@ -197,6 +197,7 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
|
|||||||
case ATH79_SOC_AR7241:
|
case ATH79_SOC_AR7241:
|
||||||
case ATH79_SOC_AR9330:
|
case ATH79_SOC_AR9330:
|
||||||
case ATH79_SOC_AR9331:
|
case ATH79_SOC_AR9331:
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
mdio_dev = &ath79_mdio1_device;
|
mdio_dev = &ath79_mdio1_device;
|
||||||
mdio_data = &ath79_mdio1_data;
|
mdio_data = &ath79_mdio1_data;
|
||||||
break;
|
break;
|
||||||
@ -254,6 +255,10 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
|
|||||||
mdio_data->is_ar934x = 1;
|
mdio_data->is_ar934x = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
|
mdio_data->builtin_switch = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
case ATH79_SOC_QCA9556:
|
case ATH79_SOC_QCA9556:
|
||||||
case ATH79_SOC_QCA9558:
|
case ATH79_SOC_QCA9558:
|
||||||
mdio_data->is_ar934x = 1;
|
mdio_data->is_ar934x = 1;
|
||||||
@ -563,6 +568,7 @@ static void __init ath79_init_eth_pll_data(unsigned int id)
|
|||||||
case ATH79_SOC_AR9341:
|
case ATH79_SOC_AR9341:
|
||||||
case ATH79_SOC_AR9342:
|
case ATH79_SOC_AR9342:
|
||||||
case ATH79_SOC_AR9344:
|
case ATH79_SOC_AR9344:
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
case ATH79_SOC_QCA9556:
|
case ATH79_SOC_QCA9556:
|
||||||
case ATH79_SOC_QCA9558:
|
case ATH79_SOC_QCA9558:
|
||||||
pll_10 = AR934X_PLL_VAL_10;
|
pll_10 = AR934X_PLL_VAL_10;
|
||||||
@ -620,6 +626,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
|
|||||||
case ATH79_SOC_AR7241:
|
case ATH79_SOC_AR7241:
|
||||||
case ATH79_SOC_AR9330:
|
case ATH79_SOC_AR9330:
|
||||||
case ATH79_SOC_AR9331:
|
case ATH79_SOC_AR9331:
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
|
pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -680,6 +687,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
|
|||||||
case ATH79_SOC_AR7241:
|
case ATH79_SOC_AR7241:
|
||||||
case ATH79_SOC_AR9330:
|
case ATH79_SOC_AR9330:
|
||||||
case ATH79_SOC_AR9331:
|
case ATH79_SOC_AR9331:
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
|
pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -965,6 +973,37 @@ void __init ath79_register_eth(unsigned int id)
|
|||||||
pdata->fifo_cfg3 = 0x01f00140;
|
pdata->fifo_cfg3 = 0x01f00140;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
|
if (id == 0) {
|
||||||
|
pdata->reset_bit = AR933X_RESET_GE0_MAC |
|
||||||
|
AR933X_RESET_GE0_MDIO;
|
||||||
|
pdata->set_speed = ath79_set_speed_dummy;
|
||||||
|
|
||||||
|
pdata->phy_mask = BIT(4);
|
||||||
|
} else {
|
||||||
|
pdata->reset_bit = AR933X_RESET_GE1_MAC |
|
||||||
|
AR933X_RESET_GE1_MDIO;
|
||||||
|
pdata->set_speed = ath79_set_speed_dummy;
|
||||||
|
|
||||||
|
pdata->speed = SPEED_1000;
|
||||||
|
pdata->duplex = DUPLEX_FULL;
|
||||||
|
pdata->switch_data = &ath79_switch_data;
|
||||||
|
|
||||||
|
ath79_switch_data.phy_poll_mask |= BIT(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
pdata->ddr_flush = ath79_ddr_no_flush;
|
||||||
|
pdata->has_gbit = 1;
|
||||||
|
pdata->is_ar724x = 1;
|
||||||
|
|
||||||
|
if (!pdata->fifo_cfg1)
|
||||||
|
pdata->fifo_cfg1 = 0x0010ffff;
|
||||||
|
if (!pdata->fifo_cfg2)
|
||||||
|
pdata->fifo_cfg2 = 0x015500aa;
|
||||||
|
if (!pdata->fifo_cfg3)
|
||||||
|
pdata->fifo_cfg3 = 0x01f00140;
|
||||||
|
break;
|
||||||
|
|
||||||
case ATH79_SOC_QCA9556:
|
case ATH79_SOC_QCA9556:
|
||||||
case ATH79_SOC_QCA9558:
|
case ATH79_SOC_QCA9558:
|
||||||
if (id == 0) {
|
if (id == 0) {
|
||||||
@ -1039,6 +1078,7 @@ void __init ath79_register_eth(unsigned int id)
|
|||||||
case ATH79_SOC_AR7241:
|
case ATH79_SOC_AR7241:
|
||||||
case ATH79_SOC_AR9330:
|
case ATH79_SOC_AR9330:
|
||||||
case ATH79_SOC_AR9331:
|
case ATH79_SOC_AR9331:
|
||||||
|
case ATH79_SOC_QCA9533:
|
||||||
pdata->mii_bus_dev = &ath79_mdio1_device.dev;
|
pdata->mii_bus_dev = &ath79_mdio1_device.dev;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,406 @@
|
|||||||
|
From 5300a7cd7ed2f88488ddba62947b9c6bb9663777 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <5300a7cd7ed2f88488ddba62947b9c6bb9663777.1396122227.git.mschiffer@universe-factory.net>
|
||||||
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||||
|
Date: Sat, 29 Mar 2014 20:26:08 +0100
|
||||||
|
Subject: [PATCH 1/2] MIPS: ath79: add support for QCA953x SoC
|
||||||
|
|
||||||
|
Note that the clock calculation looks very similar to the QCA955x, but the
|
||||||
|
meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
|
||||||
|
---
|
||||||
|
arch/mips/ath79/Kconfig | 6 +-
|
||||||
|
arch/mips/ath79/clock.c | 78 ++++++++++++++++++++++++++
|
||||||
|
arch/mips/ath79/common.c | 4 ++
|
||||||
|
arch/mips/ath79/dev-common.c | 1 +
|
||||||
|
arch/mips/ath79/dev-wmac.c | 20 +++++++
|
||||||
|
arch/mips/ath79/early_printk.c | 1 +
|
||||||
|
arch/mips/ath79/gpio.c | 4 +-
|
||||||
|
arch/mips/ath79/irq.c | 4 ++
|
||||||
|
arch/mips/ath79/setup.c | 8 ++-
|
||||||
|
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 48 ++++++++++++++++
|
||||||
|
arch/mips/include/asm/mach-ath79/ath79.h | 11 ++++
|
||||||
|
11 files changed, 182 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
--- a/arch/mips/ath79/Kconfig
|
||||||
|
+++ b/arch/mips/ath79/Kconfig
|
||||||
|
@@ -929,6 +929,10 @@ config SOC_AR934X
|
||||||
|
select PCI_AR724X if PCI
|
||||||
|
def_bool n
|
||||||
|
|
||||||
|
+config SOC_QCA953X
|
||||||
|
+ select USB_ARCH_HAS_EHCI
|
||||||
|
+ def_bool n
|
||||||
|
+
|
||||||
|
config SOC_QCA955X
|
||||||
|
select USB_ARCH_HAS_EHCI
|
||||||
|
select HW_HAS_PCI
|
||||||
|
@@ -972,7 +976,7 @@ config ATH79_DEV_USB
|
||||||
|
def_bool n
|
||||||
|
|
||||||
|
config ATH79_DEV_WMAC
|
||||||
|
- depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X)
|
||||||
|
+ depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA953X || SOC_QCA955X)
|
||||||
|
def_bool n
|
||||||
|
|
||||||
|
config ATH79_NVRAM
|
||||||
|
--- a/arch/mips/ath79/clock.c
|
||||||
|
+++ b/arch/mips/ath79/clock.c
|
||||||
|
@@ -295,6 +295,82 @@ static void __init ar934x_clocks_init(vo
|
||||||
|
iounmap(dpll_base);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void __init qca953x_clocks_init(void)
|
||||||
|
+{
|
||||||
|
+ u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv;
|
||||||
|
+ u32 cpu_pll, ddr_pll;
|
||||||
|
+ u32 bootstrap;
|
||||||
|
+
|
||||||
|
+ bootstrap = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP);
|
||||||
|
+ if (bootstrap & QCA953X_BOOTSTRAP_REF_CLK_40)
|
||||||
|
+ ath79_ref_clk.rate = 40 * 1000 * 1000;
|
||||||
|
+ else
|
||||||
|
+ ath79_ref_clk.rate = 25 * 1000 * 1000;
|
||||||
|
+
|
||||||
|
+ pll = ath79_pll_rr(QCA953X_PLL_CPU_CONFIG_REG);
|
||||||
|
+ out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK;
|
||||||
|
+ ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CPU_CONFIG_REFDIV_MASK;
|
||||||
|
+ nint = (pll >> QCA953X_PLL_CPU_CONFIG_NINT_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CPU_CONFIG_NINT_MASK;
|
||||||
|
+ frac = (pll >> QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CPU_CONFIG_NFRAC_MASK;
|
||||||
|
+
|
||||||
|
+ cpu_pll = nint * ath79_ref_clk.rate / ref_div;
|
||||||
|
+ cpu_pll += frac * (ath79_ref_clk.rate >> 6) / ref_div;
|
||||||
|
+ cpu_pll /= (1 << out_div);
|
||||||
|
+
|
||||||
|
+ pll = ath79_pll_rr(QCA953X_PLL_DDR_CONFIG_REG);
|
||||||
|
+ out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK;
|
||||||
|
+ ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_DDR_CONFIG_REFDIV_MASK;
|
||||||
|
+ nint = (pll >> QCA953X_PLL_DDR_CONFIG_NINT_SHIFT) &
|
||||||
|
+ QCA953X_PLL_DDR_CONFIG_NINT_MASK;
|
||||||
|
+ frac = (pll >> QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT) &
|
||||||
|
+ QCA953X_PLL_DDR_CONFIG_NFRAC_MASK;
|
||||||
|
+
|
||||||
|
+ ddr_pll = nint * ath79_ref_clk.rate / ref_div;
|
||||||
|
+ ddr_pll += frac * (ath79_ref_clk.rate >> 6) / (ref_div << 4);
|
||||||
|
+ ddr_pll /= (1 << out_div);
|
||||||
|
+
|
||||||
|
+ clk_ctrl = ath79_pll_rr(QCA953X_PLL_CLK_CTRL_REG);
|
||||||
|
+
|
||||||
|
+ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
|
||||||
|
+
|
||||||
|
+ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS)
|
||||||
|
+ ath79_cpu_clk.rate = ath79_ref_clk.rate;
|
||||||
|
+ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL)
|
||||||
|
+ ath79_cpu_clk.rate = cpu_pll / (postdiv + 1);
|
||||||
|
+ else
|
||||||
|
+ ath79_cpu_clk.rate = ddr_pll / (postdiv + 1);
|
||||||
|
+
|
||||||
|
+ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK;
|
||||||
|
+
|
||||||
|
+ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS)
|
||||||
|
+ ath79_ddr_clk.rate = ath79_ref_clk.rate;
|
||||||
|
+ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL)
|
||||||
|
+ ath79_ddr_clk.rate = ddr_pll / (postdiv + 1);
|
||||||
|
+ else
|
||||||
|
+ ath79_ddr_clk.rate = cpu_pll / (postdiv + 1);
|
||||||
|
+
|
||||||
|
+ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT) &
|
||||||
|
+ QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK;
|
||||||
|
+
|
||||||
|
+ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS)
|
||||||
|
+ ath79_ahb_clk.rate = ath79_ref_clk.rate;
|
||||||
|
+ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL)
|
||||||
|
+ ath79_ahb_clk.rate = ddr_pll / (postdiv + 1);
|
||||||
|
+ else
|
||||||
|
+ ath79_ahb_clk.rate = cpu_pll / (postdiv + 1);
|
||||||
|
+
|
||||||
|
+ ath79_wdt_clk.rate = ath79_ref_clk.rate;
|
||||||
|
+ ath79_uart_clk.rate = ath79_ref_clk.rate;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void __init qca955x_clocks_init(void)
|
||||||
|
{
|
||||||
|
u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv;
|
||||||
|
@@ -383,6 +459,8 @@ void __init ath79_clocks_init(void)
|
||||||
|
ar933x_clocks_init();
|
||||||
|
else if (soc_is_ar934x())
|
||||||
|
ar934x_clocks_init();
|
||||||
|
+ else if (soc_is_qca953x())
|
||||||
|
+ qca953x_clocks_init();
|
||||||
|
else if (soc_is_qca955x())
|
||||||
|
qca955x_clocks_init();
|
||||||
|
else
|
||||||
|
--- a/arch/mips/ath79/common.c
|
||||||
|
+++ b/arch/mips/ath79/common.c
|
||||||
|
@@ -73,6 +73,8 @@ void ath79_device_reset_set(u32 mask)
|
||||||
|
reg = AR933X_RESET_REG_RESET_MODULE;
|
||||||
|
else if (soc_is_ar934x())
|
||||||
|
reg = AR934X_RESET_REG_RESET_MODULE;
|
||||||
|
+ else if (soc_is_qca953x())
|
||||||
|
+ reg = QCA953X_RESET_REG_RESET_MODULE;
|
||||||
|
else if (soc_is_qca955x())
|
||||||
|
reg = QCA955X_RESET_REG_RESET_MODULE;
|
||||||
|
else
|
||||||
|
@@ -101,6 +103,8 @@ void ath79_device_reset_clear(u32 mask)
|
||||||
|
reg = AR933X_RESET_REG_RESET_MODULE;
|
||||||
|
else if (soc_is_ar934x())
|
||||||
|
reg = AR934X_RESET_REG_RESET_MODULE;
|
||||||
|
+ else if (soc_is_qca953x())
|
||||||
|
+ reg = QCA953X_RESET_REG_RESET_MODULE;
|
||||||
|
else if (soc_is_qca955x())
|
||||||
|
reg = QCA955X_RESET_REG_RESET_MODULE;
|
||||||
|
else
|
||||||
|
--- a/arch/mips/ath79/dev-common.c
|
||||||
|
+++ b/arch/mips/ath79/dev-common.c
|
||||||
|
@@ -100,6 +100,7 @@ void __init ath79_register_uart(void)
|
||||||
|
soc_is_ar724x() ||
|
||||||
|
soc_is_ar913x() ||
|
||||||
|
soc_is_ar934x() ||
|
||||||
|
+ soc_is_qca953x() ||
|
||||||
|
soc_is_qca955x()) {
|
||||||
|
ath79_uart_data[0].uartclk = clk_get_rate(clk);
|
||||||
|
platform_device_register(&ath79_uart_device);
|
||||||
|
--- a/arch/mips/ath79/dev-wmac.c
|
||||||
|
+++ b/arch/mips/ath79/dev-wmac.c
|
||||||
|
@@ -149,6 +149,24 @@ static void ar934x_wmac_setup(void)
|
||||||
|
ath79_wmac_data.is_clk_25mhz = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void qca953x_wmac_setup(void)
|
||||||
|
+{
|
||||||
|
+ u32 t;
|
||||||
|
+
|
||||||
|
+ ath79_wmac_device.name = "qca953x_wmac";
|
||||||
|
+
|
||||||
|
+ ath79_wmac_resources[0].start = QCA953X_WMAC_BASE;
|
||||||
|
+ ath79_wmac_resources[0].end = QCA953X_WMAC_BASE + QCA953X_WMAC_SIZE - 1;
|
||||||
|
+ ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
|
||||||
|
+ ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
|
||||||
|
+
|
||||||
|
+ t = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP);
|
||||||
|
+ if (t & QCA953X_BOOTSTRAP_REF_CLK_40)
|
||||||
|
+ ath79_wmac_data.is_clk_25mhz = false;
|
||||||
|
+ else
|
||||||
|
+ ath79_wmac_data.is_clk_25mhz = true;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void qca955x_wmac_setup(void)
|
||||||
|
{
|
||||||
|
u32 t;
|
||||||
|
@@ -366,6 +384,8 @@ void __init ath79_register_wmac(u8 *cal_
|
||||||
|
ar933x_wmac_setup();
|
||||||
|
else if (soc_is_ar934x())
|
||||||
|
ar934x_wmac_setup();
|
||||||
|
+ else if (soc_is_qca953x())
|
||||||
|
+ qca953x_wmac_setup();
|
||||||
|
else if (soc_is_qca955x())
|
||||||
|
qca955x_wmac_setup();
|
||||||
|
else
|
||||||
|
--- a/arch/mips/ath79/early_printk.c
|
||||||
|
+++ b/arch/mips/ath79/early_printk.c
|
||||||
|
@@ -114,6 +114,7 @@ static void prom_putchar_init(void)
|
||||||
|
case REV_ID_MAJOR_AR9341:
|
||||||
|
case REV_ID_MAJOR_AR9342:
|
||||||
|
case REV_ID_MAJOR_AR9344:
|
||||||
|
+ case REV_ID_MAJOR_QCA9533:
|
||||||
|
case REV_ID_MAJOR_QCA9556:
|
||||||
|
case REV_ID_MAJOR_QCA9558:
|
||||||
|
_prom_putchar = prom_putchar_ar71xx;
|
||||||
|
--- a/arch/mips/ath79/gpio.c
|
||||||
|
+++ b/arch/mips/ath79/gpio.c
|
||||||
|
@@ -224,6 +224,8 @@ void __init ath79_gpio_init(void)
|
||||||
|
ath79_gpio_count = AR933X_GPIO_COUNT;
|
||||||
|
else if (soc_is_ar934x())
|
||||||
|
ath79_gpio_count = AR934X_GPIO_COUNT;
|
||||||
|
+ else if (soc_is_qca953x())
|
||||||
|
+ ath79_gpio_count = QCA953X_GPIO_COUNT;
|
||||||
|
else if (soc_is_qca955x())
|
||||||
|
ath79_gpio_count = QCA955X_GPIO_COUNT;
|
||||||
|
else
|
||||||
|
@@ -231,7 +233,7 @@ void __init ath79_gpio_init(void)
|
||||||
|
|
||||||
|
ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
|
||||||
|
ath79_gpio_chip.ngpio = ath79_gpio_count;
|
||||||
|
- if (soc_is_ar934x() || soc_is_qca955x()) {
|
||||||
|
+ if (soc_is_ar934x() || soc_is_qca953x() || soc_is_qca955x()) {
|
||||||
|
ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
|
||||||
|
ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
|
||||||
|
}
|
||||||
|
--- a/arch/mips/ath79/irq.c
|
||||||
|
+++ b/arch/mips/ath79/irq.c
|
||||||
|
@@ -106,6 +106,7 @@ static void __init ath79_misc_irq_init(v
|
||||||
|
else if (soc_is_ar724x() ||
|
||||||
|
soc_is_ar933x() ||
|
||||||
|
soc_is_ar934x() ||
|
||||||
|
+ soc_is_qca953x() ||
|
||||||
|
soc_is_qca955x())
|
||||||
|
ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
|
||||||
|
else
|
||||||
|
@@ -352,6 +353,9 @@ void __init arch_init_irq(void)
|
||||||
|
} else if (soc_is_ar934x()) {
|
||||||
|
ath79_ip2_handler = ath79_default_ip2_handler;
|
||||||
|
ath79_ip3_handler = ar934x_ip3_handler;
|
||||||
|
+ } else if (soc_is_qca953x()) {
|
||||||
|
+ ath79_ip2_handler = ath79_default_ip2_handler;
|
||||||
|
+ ath79_ip3_handler = ath79_default_ip3_handler;
|
||||||
|
} else if (soc_is_qca955x()) {
|
||||||
|
ath79_ip2_handler = ath79_default_ip2_handler;
|
||||||
|
ath79_ip3_handler = ath79_default_ip3_handler;
|
||||||
|
--- a/arch/mips/ath79/setup.c
|
||||||
|
+++ b/arch/mips/ath79/setup.c
|
||||||
|
@@ -151,6 +151,12 @@ static void __init ath79_detect_sys_type
|
||||||
|
rev = id & AR934X_REV_ID_REVISION_MASK;
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case REV_ID_MAJOR_QCA9533:
|
||||||
|
+ ath79_soc = ATH79_SOC_QCA9533;
|
||||||
|
+ chip = "9533";
|
||||||
|
+ rev = id & QCA953X_REV_ID_REVISION_MASK;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case REV_ID_MAJOR_QCA9556:
|
||||||
|
ath79_soc = ATH79_SOC_QCA9556;
|
||||||
|
chip = "9556";
|
||||||
|
@@ -169,7 +175,7 @@ static void __init ath79_detect_sys_type
|
||||||
|
|
||||||
|
ath79_soc_rev = rev;
|
||||||
|
|
||||||
|
- if (soc_is_qca955x())
|
||||||
|
+ if (soc_is_qca953x() || soc_is_qca955x())
|
||||||
|
sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s rev %u",
|
||||||
|
chip, rev);
|
||||||
|
else
|
||||||
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
||||||
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
||||||
|
@@ -106,6 +106,9 @@
|
||||||
|
#define AR934X_SRIF_BASE (AR71XX_APB_BASE + 0x00116000)
|
||||||
|
#define AR934X_SRIF_SIZE 0x1000
|
||||||
|
|
||||||
|
+#define QCA953X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000)
|
||||||
|
+#define QCA953X_WMAC_SIZE 0x20000
|
||||||
|
+
|
||||||
|
#define QCA955X_PCI_MEM_BASE0 0x10000000
|
||||||
|
#define QCA955X_PCI_MEM_BASE1 0x12000000
|
||||||
|
#define QCA955X_PCI_MEM_SIZE 0x02000000
|
||||||
|
@@ -280,6 +283,43 @@
|
||||||
|
|
||||||
|
#define AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL BIT(6)
|
||||||
|
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_REG 0x00
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_REG 0x04
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_REG 0x08
|
||||||
|
+#define QCA953X_PLL_ETH_XMII_CONTROL_REG 0x2c
|
||||||
|
+#define QCA953X_PLL_ETH_SGMII_CONTROL_REG 0x48
|
||||||
|
+
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT 0
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_NFRAC_MASK 0x3f
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_NINT_SHIFT 6
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_NINT_MASK 0x3f
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT 12
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_REFDIV_MASK 0x1f
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT 19
|
||||||
|
+#define QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK 0x3
|
||||||
|
+
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT 0
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_NFRAC_MASK 0x3ff
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_NINT_SHIFT 10
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_NINT_MASK 0x3f
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT 16
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_REFDIV_MASK 0x1f
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT 23
|
||||||
|
+#define QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK 0x7
|
||||||
|
+
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS BIT(2)
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS BIT(3)
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS BIT(4)
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT 5
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK 0x1f
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT 10
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK 0x1f
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT 15
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK 0x1f
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL BIT(20)
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL BIT(21)
|
||||||
|
+#define QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL BIT(24)
|
||||||
|
+
|
||||||
|
#define QCA955X_PLL_CPU_CONFIG_REG 0x00
|
||||||
|
#define QCA955X_PLL_DDR_CONFIG_REG 0x04
|
||||||
|
#define QCA955X_PLL_CLK_CTRL_REG 0x08
|
||||||
|
@@ -356,6 +396,10 @@
|
||||||
|
#define AR934X_RESET_REG_BOOTSTRAP 0xb0
|
||||||
|
#define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac
|
||||||
|
|
||||||
|
+#define QCA953X_RESET_REG_RESET_MODULE 0x1c
|
||||||
|
+#define QCA953X_RESET_REG_BOOTSTRAP 0xb0
|
||||||
|
+#define QCA953X_RESET_REG_EXT_INT_STATUS 0xac
|
||||||
|
+
|
||||||
|
#define QCA955X_RESET_REG_RESET_MODULE 0x1c
|
||||||
|
#define QCA955X_RESET_REG_BOOTSTRAP 0xb0
|
||||||
|
#define QCA955X_RESET_REG_EXT_INT_STATUS 0xac
|
||||||
|
@@ -504,6 +548,8 @@
|
||||||
|
#define AR934X_BOOTSTRAP_SDRAM_DISABLED BIT(1)
|
||||||
|
#define AR934X_BOOTSTRAP_DDR1 BIT(0)
|
||||||
|
|
||||||
|
+#define QCA953X_BOOTSTRAP_REF_CLK_40 BIT(4)
|
||||||
|
+
|
||||||
|
#define QCA955X_BOOTSTRAP_REF_CLK_40 BIT(4)
|
||||||
|
|
||||||
|
#define AR934X_PCIE_WMAC_INT_WMAC_MISC BIT(0)
|
||||||
|
@@ -566,6 +612,7 @@
|
||||||
|
#define REV_ID_MAJOR_AR9341 0x0120
|
||||||
|
#define REV_ID_MAJOR_AR9342 0x1120
|
||||||
|
#define REV_ID_MAJOR_AR9344 0x2120
|
||||||
|
+#define REV_ID_MAJOR_QCA9533 0x0140
|
||||||
|
#define REV_ID_MAJOR_QCA9556 0x0130
|
||||||
|
#define REV_ID_MAJOR_QCA9558 0x1130
|
||||||
|
|
||||||
|
@@ -588,6 +635,8 @@
|
||||||
|
|
||||||
|
#define AR934X_REV_ID_REVISION_MASK 0xf
|
||||||
|
|
||||||
|
+#define QCA953X_REV_ID_REVISION_MASK 0xf
|
||||||
|
+
|
||||||
|
#define QCA955X_REV_ID_REVISION_MASK 0xf
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -641,6 +690,7 @@
|
||||||
|
#define AR913X_GPIO_COUNT 22
|
||||||
|
#define AR933X_GPIO_COUNT 30
|
||||||
|
#define AR934X_GPIO_COUNT 23
|
||||||
|
+#define QCA953X_GPIO_COUNT 24
|
||||||
|
#define QCA955X_GPIO_COUNT 24
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/arch/mips/include/asm/mach-ath79/ath79.h
|
||||||
|
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
|
||||||
|
@@ -32,6 +32,7 @@ enum ath79_soc_type {
|
||||||
|
ATH79_SOC_AR9341,
|
||||||
|
ATH79_SOC_AR9342,
|
||||||
|
ATH79_SOC_AR9344,
|
||||||
|
+ ATH79_SOC_QCA9533,
|
||||||
|
ATH79_SOC_QCA9556,
|
||||||
|
ATH79_SOC_QCA9558,
|
||||||
|
};
|
||||||
|
@@ -100,6 +101,16 @@ static inline int soc_is_ar934x(void)
|
||||||
|
return soc_is_ar9341() || soc_is_ar9342() || soc_is_ar9344();
|
||||||
|
}
|
||||||
|
|
||||||
|
+static inline int soc_is_qca9533(void)
|
||||||
|
+{
|
||||||
|
+ return ath79_soc == ATH79_SOC_QCA9533;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static inline int soc_is_qca953x(void)
|
||||||
|
+{
|
||||||
|
+ return soc_is_qca9533();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static inline int soc_is_qca9556(void)
|
||||||
|
{
|
||||||
|
return ath79_soc == ATH79_SOC_QCA9556;
|
||||||
Loading…
Reference in New Issue
Block a user