From a72491c864ccc42c173e22cc77a096953544341b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 24 Feb 2015 12:01:00 +0000 Subject: ar71xx: Add QCA953X version2 SoC support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://patchwork.ozlabs.org/patch/435234/ Signed-off-by: 郭传鈜 Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44527 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...35-MIPS-ath79-add-support-for-QCA956x-SoC.patch | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch') diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch index 3216266028..7e031b20e1 100644 --- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch +++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch @@ -276,8 +276,8 @@ --- a/arch/mips/ath79/early_printk.c +++ b/arch/mips/ath79/early_printk.c -@@ -117,6 +117,8 @@ static void prom_putchar_init(void) - case REV_ID_MAJOR_QCA9533: +@@ -118,6 +118,8 @@ static void prom_putchar_init(void) + case REV_ID_MAJOR_QCA9533_V2: case REV_ID_MAJOR_QCA9556: case REV_ID_MAJOR_QCA9558: + case REV_ID_MAJOR_TP9343: @@ -445,7 +445,7 @@ } --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1167,6 +1167,12 @@ config SOC_QCA955X +@@ -1177,6 +1177,12 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n @@ -458,7 +458,7 @@ config ATH79_DEV_M25P80 select ATH79_DEV_SPI def_bool n -@@ -1204,7 +1210,7 @@ config ATH79_DEV_USB +@@ -1214,7 +1220,7 @@ config ATH79_DEV_USB def_bool n config ATH79_DEV_WMAC @@ -519,7 +519,7 @@ return -ENODEV; --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c -@@ -170,15 +170,30 @@ static void __init ath79_detect_sys_type +@@ -175,15 +175,30 @@ static void __init ath79_detect_sys_type rev = id & QCA955X_REV_ID_REVISION_MASK; break; @@ -543,8 +543,8 @@ - if (soc_is_qca953x() || soc_is_qca955x()) + if (soc_is_qca953x() || soc_is_qca955x() || soc_is_qca9561()) - sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s rev %u", - chip, rev); + sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s ver %u rev %u", + chip, ver, rev); + else if (soc_is_tp9343()) + sprintf(ath79_sys_type, "Qualcomm Atheros TP%s rev %u", + chip, rev); @@ -686,8 +686,8 @@ #define REV_ID_MAJOR_MASK 0xfff0 #define REV_ID_MAJOR_AR71XX 0x00a0 #define REV_ID_MAJOR_AR913X 0x00b0 -@@ -614,6 +712,8 @@ - #define REV_ID_MAJOR_QCA9533 0x0140 +@@ -615,6 +713,8 @@ + #define REV_ID_MAJOR_QCA9533_V2 0x0160 #define REV_ID_MAJOR_QCA9556 0x0130 #define REV_ID_MAJOR_QCA9558 0x1130 +#define REV_ID_MAJOR_TP9343 0x0150 @@ -695,7 +695,7 @@ #define AR71XX_REV_ID_MINOR_MASK 0x3 #define AR71XX_REV_ID_MINOR_AR7130 0x0 -@@ -638,6 +738,8 @@ +@@ -639,6 +739,8 @@ #define QCA955X_REV_ID_REVISION_MASK 0xf @@ -704,7 +704,7 @@ /* * SPI block */ -@@ -683,6 +785,19 @@ +@@ -684,6 +786,19 @@ #define AR934X_GPIO_REG_OUT_FUNC5 0x40 #define AR934X_GPIO_REG_FUNC 0x6c @@ -724,7 +724,7 @@ #define AR71XX_GPIO_COUNT 16 #define AR7240_GPIO_COUNT 18 #define AR7241_GPIO_COUNT 20 -@@ -691,6 +806,7 @@ +@@ -692,6 +807,7 @@ #define AR934X_GPIO_COUNT 23 #define QCA953X_GPIO_COUNT 24 #define QCA955X_GPIO_COUNT 24 -- cgit v1.2.3