diff options
| -rw-r--r-- | firmware/export/as3525v2.h | 39 | ||||
| -rw-r--r-- | firmware/export/usb-s3c6400x.h | 8 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.c | 1 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.h | 75 |
4 files changed, 47 insertions, 76 deletions
diff --git a/firmware/export/as3525v2.h b/firmware/export/as3525v2.h index 4c571f2a22..3778ff7785 100644 --- a/firmware/export/as3525v2.h +++ b/firmware/export/as3525v2.h @@ -45,4 +45,43 @@ #undef USB_DEVBSS_ATTR #define USB_DEVBSS_ATTR __attribute__((aligned(32))) +#define USBPHY_REG(offset) (*(volatile uint32_t*)(OTGBASE + offset)) + +/** User HW Config1 Register */ +#define GHWCFG1 USBPHY_REG(0x044) +#define GHWCFG1_epdir_bitp(ep) (2 * (ep)) +#define GHWCFG1_epdir_bits 0x3 +#define GHWCFG1_EPDIR_BIDIR 0 +#define GHWCFG1_EPDIR_IN 1 +#define GHWCFG1_EPDIR_OUT 2 + +/** User HW Config2 Register */ +#define GHWCFG2 USBPHY_REG(0x048) +#define GHWCFG2_arch_bitp 3 /** Architecture */ +#define GHWCFG2_arch_bits 0x3 +#define GHWCFG2_hs_phy_type_bitp 6 /** High speed PHY type */ +#define GHWCFG2_hs_phy_type_bits 0x3 +#define GHWCFG2_fs_phy_type_bitp 8 /** Full speed PHY type */ +#define GHWCFG2_fs_phy_type_bits 0x3 +#define GHWCFG2_num_ep_bitp 10 /** Number of endpoints */ +#define GHWCFG2_num_ep_bits 0xf +#define GHWCFG2_dyn_fifo (1 << 19) /** Dynamic FIFO */ +/* For GHWCFG2_HS_PHY_TYPE and GHWCFG2_FS_PHY_TYPE */ +#define GHWCFG2_PHY_TYPE_UNSUPPORTED 0 +#define GHWCFG2_PHY_TYPE_UTMI 1 +#define GHWCFG2_ARCH_INTERNAL_DMA 2 + +/** User HW Config3 Register */ +#define GHWCFG3 USBPHY_REG(0x04C) +#define GHWCFG3_dfifo_len_bitp 16 /** Total fifo size */ +#define GHWCFG3_dfifo_len_bits 0xffff + +/** User HW Config4 Register */ +#define GHWCFG4 USBPHY_REG(0x050) +#define GHWCFG4_utmi_phy_data_width_bitp 14 /** UTMI+ data bus width */ +#define GHWCFG4_utmi_phy_data_width_bits 0x3 +#define GHWCFG4_ded_fifo_en (1 << 25) /** Dedicated Tx FIFOs */ +#define GHWCFG4_num_in_ep_bitp 26 /** Number of IN endpoints */ +#define GHWCFG4_num_in_ep_bits 0xf + #endif /* __AS3525V2_H__ */ diff --git a/firmware/export/usb-s3c6400x.h b/firmware/export/usb-s3c6400x.h index 4c5f57e5ad..165ab4e461 100644 --- a/firmware/export/usb-s3c6400x.h +++ b/firmware/export/usb-s3c6400x.h @@ -480,6 +480,14 @@ /** Device Endpoint (ep) DMA Address Register */ #define DEPDMA(x,out) (*((const void* volatile*)(OTGBASE + 0x914 + (0x200 * (!!out)) + 0x20 * (x)))) +#if 0 /* Those are present in as3525v2, not s5l870x */ +/** Device IN Endpoint (ep) Transmit FIFO Status Register */ +#define DTXFSTS(ep) (*((const void* volatile*)(OTGBASE + 0x918 + 0x20 * (x)))) + +/** Device OUT Endpoint (ep) Frame number Register */ +#define DOEPFN(ep) (*((const void* volatile*)(OTGBASE + 0xB04 + 0x20 * (x)))) +#endif + /* Power and Clock Gating Register */ #define PCGCCTL (*((uint32_t volatile*)(OTGBASE + 0xE00))) diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index c9d687f910..e9a2ca8178 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c @@ -33,7 +33,6 @@ #include "system.h" //#define LOGF_ENABLE #include "logf.h" -#include "usb-drv-as3525v2.h" #include "usb_core.h" static const uint8_t in_ep_list[] = {0, 1, 3, 5}; diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.h b/firmware/target/arm/as3525/usb-drv-as3525v2.h deleted file mode 100644 index 7f45f52014..0000000000 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.h +++ /dev/null @@ -1,75 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright © 2010 Amaury Pouly - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef __USB_DRV_AS3525v2_H__ -#define __USB_DRV_AS3525v2_H__ - -#include "as3525v2.h" -#include "usb-s3c6400x.h" - -/** - * Registers not present in usb-s3c6400 - */ -#define BASE_REG(offset) (*(volatile uint32_t*)(OTGBASE + offset)) - -/** User HW Config1 Register */ -#define GHWCFG1 BASE_REG(0x044) -#define GHWCFG1_epdir_bitp(ep) (2 * (ep)) -#define GHWCFG1_epdir_bits 0x3 -#define GHWCFG1_EPDIR_BIDIR 0 -#define GHWCFG1_EPDIR_IN 1 -#define GHWCFG1_EPDIR_OUT 2 - -/** User HW Config2 Register */ -#define GHWCFG2 BASE_REG(0x048) -#define GHWCFG2_arch_bitp 3 /** Architecture */ -#define GHWCFG2_arch_bits 0x3 -#define GHWCFG2_hs_phy_type_bitp 6 /** High speed PHY type */ -#define GHWCFG2_hs_phy_type_bits 0x3 -#define GHWCFG2_fs_phy_type_bitp 8 /** Full speed PHY type */ -#define GHWCFG2_fs_phy_type_bits 0x3 -#define GHWCFG2_num_ep_bitp 10 /** Number of endpoints */ -#define GHWCFG2_num_ep_bits 0xf -#define GHWCFG2_dyn_fifo (1 << 19) /** Dynamic FIFO */ -/* For GHWCFG2_HS_PHY_TYPE and GHWCFG2_FS_PHY_TYPE */ -#define GHWCFG2_PHY_TYPE_UNSUPPORTED 0 -#define GHWCFG2_PHY_TYPE_UTMI 1 -#define GHWCFG2_ARCH_INTERNAL_DMA 2 - -/** User HW Config3 Register */ -#define GHWCFG3 BASE_REG(0x04C) -#define GHWCFG3_dfifo_len_bitp 16 /** Total fifo size */ -#define GHWCFG3_dfifo_len_bits 0xffff - -/** User HW Config4 Register */ -#define GHWCFG4 BASE_REG(0x050) -#define GHWCFG4_utmi_phy_data_width_bitp 14 /** UTMI+ data bus width */ -#define GHWCFG4_utmi_phy_data_width_bits 0x3 -#define GHWCFG4_ded_fifo_en (1 << 25) /** Dedicated Tx FIFOs */ -#define GHWCFG4_num_in_ep_bitp 26 /** Number of IN endpoints */ -#define GHWCFG4_num_in_ep_bits 0xf - -/** Device IN Endpoint (ep) Transmit FIFO Status Register */ -#define DTXFSTS(ep) (*((const void* volatile*)(OTGBASE + 0x918 + 0x20 * (x)))) - -/** Device OUT Endpoint (ep) Frame number Register */ -#define DOEPFN(ep) (*((const void* volatile*)(OTGBASE + 0xB04 + 0x20 * (x)))) - -#endif /* __USB_DRV_AS3525v2_H__ */ |