ar71xx: define wmac reset function for QCA955x
authorFelix Fietkau <nbd@nbd.name>
Sat, 9 Jul 2016 14:12:46 +0000 (16:12 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 15 Jul 2016 12:19:06 +0000 (14:19 +0200)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch [new file with mode: 0644]
target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch

diff --git a/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch b/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
new file mode 100644 (file)
index 0000000..8c2e605
--- /dev/null
@@ -0,0 +1,82 @@
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -39,7 +39,7 @@ unsigned int ath79_soc_rev;
+ void __iomem *ath79_pll_base;
+ void __iomem *ath79_reset_base;
+ EXPORT_SYMBOL_GPL(ath79_reset_base);
+-static void __iomem *ath79_ddr_base;
++void __iomem *ath79_ddr_base;
+ static void __iomem *ath79_ddr_wb_flush_base;
+ static void __iomem *ath79_ddr_pci_win_base;
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+@@ -32,7 +32,7 @@
+ #define AR71XX_SPI_SIZE               0x01000000
+ #define AR71XX_DDR_CTRL_BASE  (AR71XX_APB_BASE + 0x00000000)
+-#define AR71XX_DDR_CTRL_SIZE  0x100
++#define AR71XX_DDR_CTRL_SIZE  0x200
+ #define AR71XX_UART_BASE      (AR71XX_APB_BASE + 0x00020000)
+ #define AR71XX_UART_SIZE      0x100
+ #define AR71XX_USB_CTRL_BASE  (AR71XX_APB_BASE + 0x00030000)
+@@ -218,6 +218,9 @@
+ #define QCA953X_DDR_REG_FLUSH_PCIE    0xa8
+ #define QCA953X_DDR_REG_FLUSH_WMAC    0xac
++#define QCA955X_DDR_CTL_CONFIG                0x108
++#define QCA955X_DDR_CTL_CONFIG_ACT_WMAC       BIT(23)
++
+ /*
+  * PLL block
+  */
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -171,6 +171,27 @@ static void qca953x_wmac_setup(void)
+       ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision;
+ }
++static int ar955x_wmac_reset(void)
++{
++      int i;
++
++      /* Try to wait for WMAC DDR activity to stop */
++      for (i = 0; i < 10; i++) {
++              if (!(__raw_readl(ath79_ddr_base + QCA955X_DDR_CTL_CONFIG) &
++                    QCA955X_DDR_CTL_CONFIG_ACT_WMAC))
++                      break;
++
++              udelay(10);
++      }
++
++      ath79_device_reset_set(QCA955X_RESET_RTC);
++      udelay(10);
++      ath79_device_reset_clear(QCA955X_RESET_RTC);
++      udelay(10);
++
++      return 0;
++}
++
+ static void qca955x_wmac_setup(void)
+ {
+       u32 t;
+@@ -187,6 +208,8 @@ static void qca955x_wmac_setup(void)
+               ath79_wmac_data.is_clk_25mhz = false;
+       else
+               ath79_wmac_data.is_clk_25mhz = true;
++
++      ath79_wmac_data.external_reset = ar955x_wmac_reset;
+ }
+ static void qca956x_wmac_setup(void)
+--- a/arch/mips/ath79/common.h
++++ b/arch/mips/ath79/common.h
+@@ -19,6 +19,8 @@
+ #define ATH79_MEM_SIZE_MIN    (2 * 1024 * 1024)
+ #define ATH79_MEM_SIZE_MAX    (256 * 1024 * 1024)
++extern void __iomem *ath79_ddr_base;
++
+ void ath79_clocks_init(void);
+ unsigned long ath79_get_sys_clk_rate(const char *id);
index f7f6b72..7db6ad3 100644 (file)
@@ -4,7 +4,7 @@ functions on the Arduino Yun.
 
 --- a/arch/mips/ath79/common.h
 +++ b/arch/mips/ath79/common.h
-@@ -28,6 +28,7 @@ void ath79_ddr_wb_flush(unsigned int reg
+@@ -30,6 +30,7 @@ void ath79_ddr_wb_flush(unsigned int reg
  void ath79_gpio_function_enable(u32 mask);
  void ath79_gpio_function_disable(u32 mask);
  void ath79_gpio_function_setup(u32 set, u32 clear);
@@ -48,7 +48,7 @@ functions on the Arduino Yun.
        void __iomem *reg = ath79_gpio_get_function_reg();
 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -847,6 +847,7 @@
+@@ -850,6 +850,7 @@
  #define AR71XX_GPIO_REG_INT_PENDING   0x20
  #define AR71XX_GPIO_REG_INT_ENABLE    0x24
  #define AR71XX_GPIO_REG_FUNC          0x28
@@ -56,7 +56,7 @@ functions on the Arduino Yun.
  
  #define AR934X_GPIO_REG_OUT_FUNC0     0x2c
  #define AR934X_GPIO_REG_OUT_FUNC1     0x30
-@@ -971,6 +972,8 @@
+@@ -974,6 +975,8 @@
  #define AR724X_GPIO_FUNC_UART_EN              BIT(1)
  #define AR724X_GPIO_FUNC_JTAG_DISABLE         BIT(0)