From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 12 Sep 2012 19:06:38 +0000 (+0000)
Subject: ar71xx: define NAND controller base address and register size for AR934X/QCA955x
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=40a5f5c16e16def178de20e9ec9027f3a6a26f53;p=openwrt%2Fstaging%2Fflorian.git

ar71xx: define NAND controller base address and register size for AR934X/QCA955x

SVN-Revision: 33382
---

diff --git a/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch
index 1d9ec4166a..8a11a70d11 100644
--- a/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch
+++ b/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch
@@ -20,7 +20,7 @@
  
  #define AR71XX_PCI_MEM_BASE	0x10000000
  #define AR71XX_PCI_MEM_SIZE	0x07000000
-@@ -82,11 +88,15 @@
+@@ -82,17 +88,23 @@
  
  #define AR933X_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
  #define AR933X_UART_SIZE	0x14
@@ -36,16 +36,26 @@
  #define AR934X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
  #define AR934X_WMAC_SIZE	0x20000
  #define AR934X_EHCI_BASE	0x1b000000
-@@ -112,6 +122,8 @@
+ #define AR934X_EHCI_SIZE	0x200
+ #define AR934X_SRIF_BASE	(AR71XX_APB_BASE + 0x00116000)
+ #define AR934X_SRIF_SIZE	0x1000
++#define AR934X_NFC_BASE		0x1b000200
++#define AR934X_NFC_SIZE		0xb8
+ 
+ #define QCA955X_PCI_MEM_BASE0	0x10000000
+ #define QCA955X_PCI_MEM_BASE1	0x12000000
+@@ -112,6 +124,10 @@
  #define QCA955X_EHCI0_BASE	0x1b000000
  #define QCA955X_EHCI1_BASE	0x1b400000
  #define QCA955X_EHCI_SIZE	0x200
 +#define QCA955X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
 +#define QCA955X_GMAC_SIZE	0x40
++#define QCA955X_NFC_BASE	0x1b000200
++#define QCA955X_NFC_SIZE	0xb8
  
  /*
   * DDR_CTRL block
-@@ -167,6 +179,9 @@
+@@ -167,6 +183,9 @@
  #define AR71XX_AHB_DIV_SHIFT		20
  #define AR71XX_AHB_DIV_MASK		0x7
  
@@ -55,7 +65,7 @@
  #define AR724X_PLL_REG_CPU_CONFIG	0x00
  #define AR724X_PLL_REG_PCIE_CONFIG	0x18
  
-@@ -179,6 +194,8 @@
+@@ -179,6 +198,8 @@
  #define AR724X_DDR_DIV_SHIFT		22
  #define AR724X_DDR_DIV_MASK		0x3
  
@@ -64,7 +74,7 @@
  #define AR913X_PLL_REG_CPU_CONFIG	0x00
  #define AR913X_PLL_REG_ETH_CONFIG	0x04
  #define AR913X_PLL_REG_ETH0_INT_CLOCK	0x14
-@@ -191,6 +208,9 @@
+@@ -191,6 +212,9 @@
  #define AR913X_AHB_DIV_SHIFT		19
  #define AR913X_AHB_DIV_MASK		0x1
  
@@ -74,7 +84,7 @@
  #define AR933X_PLL_CPU_CONFIG_REG	0x00
  #define AR933X_PLL_CLOCK_CTRL_REG	0x08
  
-@@ -212,6 +232,8 @@
+@@ -212,6 +236,8 @@
  #define AR934X_PLL_CPU_CONFIG_REG		0x00
  #define AR934X_PLL_DDR_CONFIG_REG		0x04
  #define AR934X_PLL_CPU_DDR_CLK_CTRL_REG		0x08
@@ -83,7 +93,7 @@
  
  #define AR934X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
  #define AR934X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
-@@ -244,6 +266,8 @@
+@@ -244,6 +270,8 @@
  #define AR934X_PLL_CPU_DDR_CLK_CTRL_DDRCLK_FROM_DDRPLL	BIT(21)
  #define AR934X_PLL_CPU_DDR_CLK_CTRL_AHBCLK_FROM_DDRPLL	BIT(24)
  
@@ -92,7 +102,7 @@
  #define QCA955X_PLL_CPU_CONFIG_REG		0x00
  #define QCA955X_PLL_DDR_CONFIG_REG		0x04
  #define QCA955X_PLL_CLK_CTRL_REG		0x08
-@@ -370,16 +394,50 @@
+@@ -370,16 +398,50 @@
  #define AR913X_RESET_USB_HOST		BIT(5)
  #define AR913X_RESET_USB_PHY		BIT(4)
  
@@ -143,7 +153,7 @@
  #define AR933X_BOOTSTRAP_REF_CLK_40	BIT(0)
  
  #define AR934X_BOOTSTRAP_SW_OPTION8	BIT(23)
-@@ -520,6 +578,14 @@
+@@ -520,6 +582,14 @@
  #define AR71XX_GPIO_REG_INT_ENABLE	0x24
  #define AR71XX_GPIO_REG_FUNC		0x28
  
@@ -158,7 +168,7 @@
  #define AR71XX_GPIO_COUNT		16
  #define AR724X_GPIO_COUNT		18
  #define AR913X_GPIO_COUNT		22
-@@ -548,4 +614,133 @@
+@@ -548,4 +618,133 @@
  #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT	13
  #define AR934X_SRIF_DPLL2_OUTDIV_MASK	0x7
  
diff --git a/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch b/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
index 2ff6c3af57..087dbc0829 100644
--- a/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
+++ b/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
@@ -149,9 +149,9 @@
  #endif /* _ATH79_DEV_WMAC_H */
 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -125,6 +125,14 @@
- #define QCA955X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
- #define QCA955X_GMAC_SIZE	0x40
+@@ -129,6 +129,14 @@
+ #define QCA955X_NFC_BASE	0x1b000200
+ #define QCA955X_NFC_SIZE	0xb8
  
 +#define AR9300_OTP_BASE		0x14000
 +#define AR9300_OTP_STATUS	0x15f18