91 lines
2.1 KiB
Diff
91 lines
2.1 KiB
Diff
--- a/arch/mips/ath79/setup.c
|
|
+++ b/arch/mips/ath79/setup.c
|
|
@@ -170,13 +170,18 @@ static void __init ath79_detect_sys_type
|
|
rev = id & AR944X_REV_ID_REVISION_MASK;
|
|
break;
|
|
|
|
+ case REV_ID_MAJOR_QCA9531:
|
|
+ ath79_soc = ATH79_SOC_QCA9531;
|
|
+ chip = "9531";
|
|
+ rev = id & QCA953X_REV_ID_REVISION_MASK;
|
|
+ break;
|
|
default:
|
|
panic("ath79: unknown SoC, id:0x%08x", id);
|
|
}
|
|
|
|
ath79_soc_rev = rev;
|
|
|
|
- if (soc_is_qca955x())
|
|
+ if (soc_is_qca955x() || soc_is_qca953x())
|
|
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
|
|
@@ -460,6 +460,7 @@
|
|
#define REV_ID_MAJOR_AR9341 0x0120
|
|
#define REV_ID_MAJOR_AR9342 0x1120
|
|
#define REV_ID_MAJOR_AR9344 0x2120
|
|
+#define REV_ID_MAJOR_QCA9531 0x0140
|
|
#define REV_ID_MAJOR_QCA9558 0x1130
|
|
|
|
#define AR71XX_REV_ID_MINOR_MASK 0x3
|
|
@@ -483,6 +484,8 @@
|
|
|
|
#define AR944X_REV_ID_REVISION_MASK 0xf
|
|
|
|
+#define QCA953X_REV_ID_REVISION_MASK 0xf
|
|
+
|
|
/*
|
|
* SPI block
|
|
*/
|
|
--- 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_QCA9531,
|
|
ATH79_SOC_QCA9558,
|
|
};
|
|
|
|
@@ -94,4 +95,14 @@ static inline int soc_is_ar9344(void)
|
|
return (ath79_soc == ATH79_SOC_AR9344);
|
|
}
|
|
|
|
+static inline int soc_is_qca9531(void)
|
|
+{
|
|
+ return ath79_soc == ATH79_SOC_QCA9531;
|
|
+}
|
|
+
|
|
+static inline int soc_is_qca953x(void)
|
|
+{
|
|
+ return soc_is_qca9531();
|
|
+}
|
|
+
|
|
static inline int soc_is_ar934x(void)
|
|
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -100,6 +100,12 @@ config SOC_AR934X
|
|
select PCI_AR724X if PCI
|
|
def_bool n
|
|
|
|
+config SOC_QCA953X
|
|
+ select USB_ARCH_HAS_EHCI
|
|
+ select HW_HAS_PCI
|
|
+ select PCI_AR724X if PCI
|
|
+ def_bool n
|
|
+
|
|
config SOC_QCA955X
|
|
select USB_ARCH_HAS_EHCI
|
|
select HW_HAS_PCI
|
|
@@ -122,7 +128,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
|
|
|
|
endif
|