app_start.c: use new io funcs

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/target_firmware/magpie_fw_dev/target/init/app_start.c b/target_firmware/magpie_fw_dev/target/init/app_start.c
index 9a7bbe36b58f8bf102e7b6b65533070eaa9f5b0b..8960199a204daab16f281f27046160d372bb128a 100644 (file)
--- a/target_firmware/magpie_fw_dev/target/init/app_start.c
+++ b/target_firmware/magpie_fw_dev/target/init/app_start.c
@@ -38,6 +38,8 @@
 #include "regdump.h"
 #include "usb_defs.h"
 
+#include "adf_os_io.h"
+
 #include "init.h"
 #include <linux/compiler.h>
 
@@ -122,9 +124,9 @@ void __section(boot) __noreturn __visible app_start(void)
        hostif = A_IS_HOST_PRESENT();
 
 #if defined(PROJECT_MAGPIE)
-       rst_status = *((volatile uint32_t*)WATCH_DOG_MAGIC_PATTERN_ADDR);
+       rst_status = ioread32(WATCH_DOG_MAGIC_PATTERN_ADDR);
 #elif defined(PROJECT_K2)
-       rst_status = HAL_WORD_REG_READ(MAGPIE_REG_RST_STATUS_ADDR);
+       rst_status = ioread32(MAGPIE_REG_RST_STATUS_ADDR);
 #endif /* #if defined(PROJECT_MAGPIE) */
 
 
@@ -159,7 +161,7 @@ void __section(boot) __noreturn __visible app_start(void)
 #if defined(PROJECT_MAGPIE)
        *((volatile uint32_t*)WATCH_DOG_MAGIC_PATTERN_ADDR)=WDT_MAGIC_PATTERN;
 #elif defined(PROJECT_K2)
-       HAL_WORD_REG_WRITE(MAGPIE_REG_RST_STATUS_ADDR, WDT_MAGIC_PATTERN);
+       iowrite32(MAGPIE_REG_RST_STATUS_ADDR, WDT_MAGIC_PATTERN);
 #endif /* #if defined(PROJECT_MAGPIE) */
 
        /* intr enable would left for firmware */
@@ -206,63 +208,52 @@ void __section(boot) __noreturn __visible app_start(void)
                _indir_tbl.htc._HTC_ControlSvcProcessMsg = HTCControlSvcProcessMsg_patch;
 #endif
 
-               if (!(USB_BYTE_REG_READ(ZM_MAIN_CTRL_OFFSET)&BIT6)) {
+               if (!(ioread8_usb(ZM_MAIN_CTRL_OFFSET) & BIT6))
                        vUSBFIFO_EP6Cfg_FS_patch();
-               }
 
 #ifdef FUSION_USB_ENABLE_TX_STREAM
                // For K2, enable tx stream mode
                A_PRINTF("Enable Tx Stream mode: 0x%x\r\n",
-                       USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET));
-
-               // Patch for K2 USB STREAM mode
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)&(~BIT0)));  // disable down stream DMA mode
-
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET,
-                                  ((USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|BIT6)));
+                       ioread32_usb(ZM_SOC_USB_MODE_CTRL_OFFSET));
 
+               /* Patch for K2 USB STREAM mode */
+               /* disable down stream DMA mode */
+               io32_rmw_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT6, BIT0);
 #if SYSTEM_MODULE_HP_EP5
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET,
-                                  ((USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|BIT8)));
+               io32_set_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT8);
 #endif
 
 #if SYSTEM_MODULE_HP_EP6
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET,
-                                  ((USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|BIT9)));
+               io32_set_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT9);
 #endif
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET,
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|(BIT0)));    // enable down stream DMA mode
+               /* enable down stream DMA mode */
+               io32_set_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT0);
 #endif
 
 #ifdef FUSION_USB_ENABLE_RX_STREAM
-               // Patch for K2 USB STREAM mode
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)&(~BIT1)));  // disable upstream DMA mode
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)&(~BIT3)));  // enable upstream stream mode
-
-               // K2, Set maximum IN transfer to 8K
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)&(0xcf)));
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|(0x20)));
-
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET,
-                                  (USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET)|(BIT1)));    // enable upstream DMA mode
-
-               USB_WORD_REG_WRITE(ZM_SOC_USB_TIME_CTRL_OFFSET, 0xa0);  // set stream mode timeout critirea
+               /* Patch for K2 USB STREAM mode */
+               /* disable upstream DMA mode and enable upstream stream mode */
+               io32_clr_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT1 | BIT3);
+
+               /* K2, Set maximum IN transfer to 8K */
+               io32_rmw_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, 0x20, 0x30);
+
+               /* enable upstream DMA mode */
+               io32_set_usb(ZM_SOC_USB_MODE_CTRL_OFFSET, BIT1);
+
+               /* set stream mode timeout critirea */
+               iowrite32_usb(ZM_SOC_USB_TIME_CTRL_OFFSET, 0xa0);
 #if defined(PROJECT_K2)
                /*0x10004020 is vaild in k2 but could be invaild in other chip*/
-               if ((HAL_WORD_REG_READ(0x10004020) & 0x2000) != 0) {
+               if ((ioread32(0x10004020) & 0x2000) != 0) {
                        /* disable stream mode for AR9270 */
-                       USB_WORD_REG_WRITE(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 0);
+                       iowrite32_usb(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 0);
                } else {
                        /* enable stream mode for AR9271 */
-                       USB_WORD_REG_WRITE(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 9);
+                       iowrite32_usb(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 9);
                }
 #else
-               USB_WORD_REG_WRITE(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 9);
+               iowrite32_usb(ZM_SOC_USB_MAX_AGGREGATE_OFFSET, 9);
 #endif
 #endif
        }
@@ -270,8 +261,7 @@ void __section(boot) __noreturn __visible app_start(void)
        else if (hostif == HIF_PCI )
                hif_pci_patch_install(&_indir_tbl.hif);
 #endif
-               A_PRINTF("USB mode: 0x%x\r\n",
-                       USB_WORD_REG_READ(0x100));
+       A_PRINTF("USB mode: 0x%x\r\n", ioread32_usb(0x100));
 
        // patch the clock function
        if(1) {
@@ -288,12 +278,9 @@ void __section(boot) __noreturn __visible app_start(void)
        Magpie_init();
 
 #if MAGPIE_ENABLE_WLAN == 1
-
-       HAL_WORD_REG_WRITE(MAGPIE_REG_RST_RESET_ADDR,
-                          (HAL_WORD_REG_READ(MAGPIE_REG_RST_RESET_ADDR)&(~(BIT10|BIT8|BIT7|BIT6))));
+       io32_clr(MAGPIE_REG_RST_RESET_ADDR, BIT10 | BIT8 | BIT7 | BIT6);
 #if defined(PROJECT_MAGPIE)
-       HAL_WORD_REG_WRITE(MAGPIE_REG_AHB_ARB_ADDR,
-                          (HAL_WORD_REG_READ(MAGPIE_REG_AHB_ARB_ADDR)|BIT1));
+       io32_set(MAGPIE_REG_AHB_ARB_ADDR, BIT1);
 #endif
 
        wlan_pci_module_init();

diff --git a/target_firmware/magpie_fw_dev/target/init/init.h b/target_firmware/magpie_fw_dev/target/init/init.h
index e346bd2e54e505a1c09c0d4645558ebf83e28da1..89ab2a92ad892400fff9b7f2a2b968c7eb8da46e 100644 (file)
--- a/target_firmware/magpie_fw_dev/target/init/init.h
+++ b/target_firmware/magpie_fw_dev/target/init/init.h
@@ -37,6 +37,7 @@
 #define ALLOCRAM_SIZE        ( SYS_RAM_SZIE - ( ALLOCRAM_START - SYS_D_RAM_REGION_0_BASE) - SYS_D_RAM_STACK_SIZE)
 
 #include "regdump.h"
+#include <linux/compiler.h>
 
 #define SBOOT_PATTERN 0x5342
 #define IS_FLASHBOOT() (((DEBUG_SYSTEM_STATE&~(0x0000ffff))>>16==SBOOT_PATTERN))