diff options
| author | Pawel Szyszuk <pawel.szyszuk@stericsson.com> | 2011-10-06 12:35:01 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:07:30 +0200 |
| commit | ecc25025b1584b32fd0d51895dde1e9265803d24 (patch) | |
| tree | 13bdc215c8420bdc814779c1d38ed03e6a0c4f23 | |
| parent | 3eb3e1775ead27876884f5119342cdd8ffb091b9 (diff) | |
ARM: U9500: HSI registers update to DB8500 V2 spec
ST-Ericsson Linux next: NA
ST-Ericsson ID: 365681
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I396c2a4d44ded438308e358aa0ad976a397d4dd6
Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33224
Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com>
Reviewed-by: Derek MORTON <derek.morton@stericsson.com>
Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/hsi.h | 11 | ||||
| -rw-r--r-- | drivers/hsi/controllers/ste_hsi.c | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/include/mach/hsi.h b/arch/arm/mach-ux500/include/mach/hsi.h index 1d2ab206e27..58d33249cae 100644 --- a/arch/arm/mach-ux500/include/mach/hsi.h +++ b/arch/arm/mach-ux500/include/mach/hsi.h @@ -16,13 +16,11 @@ #define STE_HSI_TX_IOSTATE 0x00C #define STE_HSI_TX_BUFSTATE 0x010 #define STE_HSI_TX_DIVISOR 0x014 -#define STE_HSI_TX_PARITY 0x018 #define STE_HSI_TX_BREAK 0x01C #define STE_HSI_TX_CHANNELS 0x020 #define STE_HSI_TX_FLUSHBITS 0x024 #define STE_HSI_TX_PRIORITY 0x028 -#define STE_HSI_TX_BURSTLEN 0x02C -#define STE_HSI_TX_PREAMBLE 0x030 +#define STE_HSI_TX_STATICCONFID 0x02C #define STE_HSI_TX_DATASWAP 0x034 #define STE_HSI_TX_FRAMELENX 0x080 #define STE_HSI_TX_BUFFERX 0x0C0 @@ -31,10 +29,11 @@ #define STE_HSI_TX_GAUGEX 0x180 #define STE_HSI_TX_WATERMARKX 0x1C0 #define STE_HSI_TX_DMAEN 0x200 -#define STE_HSI_TX_WATERMARKIS 0x204 +#define STE_HSI_TX_WATERMARKMIS 0x204 #define STE_HSI_TX_WATERMARKIM 0x208 #define STE_HSI_TX_WATERMARKIC 0x20C #define STE_HSI_TX_WATERMARKID 0x210 +#define STE_HSI_TX_WATERMARKIS 0x214 #define STE_HSI_TX_PERIPHID0 0xFE0 #define STE_HSI_TX_PERIPHID1 0xFE4 #define STE_HSI_TX_PERIPHID2 0xFE8 @@ -46,7 +45,6 @@ #define STE_HSI_RX_STATE 0x008 #define STE_HSI_RX_BUFSTATE 0x00C #define STE_HSI_RX_THRESHOLD 0x010 -#define STE_HSI_RX_PARITY 0x014 #define STE_HSI_RX_DETECTOR 0x018 #define STE_HSI_RX_EXCEP 0x01C #define STE_HSI_RX_ACK 0x020 @@ -65,7 +63,7 @@ #define STE_HSI_RX_WATERMARKX 0x1C0 #define STE_HSI_RX_FRAMEBURSTCNT 0x1E0 #define STE_HSI_RX_DMAEN 0x200 -#define STE_HSI_RX_WATERMARKIS 0x204 +#define STE_HSI_RX_WATERMARKMIS 0x204 #define STE_HSI_RX_WATERMARKIM 0x208 #define STE_HSI_RX_WATERMARKIC 0x20C #define STE_HSI_RX_WATERMARKID 0x210 @@ -73,6 +71,7 @@ #define STE_HSI_RX_OVERRUNIM 0x218 #define STE_HSI_RX_EXCEPMIS 0x21C #define STE_HSI_RX_EXCEPIM 0x220 +#define STE_HSI_RX_WATERMARKIS 0x224 #define STE_HSI_RX_PERIPHID0 0xFE0 #define STE_HSI_RX_PERIPHID1 0xFE4 #define STE_HSI_RX_PERIPHID2 0xFE8 diff --git a/drivers/hsi/controllers/ste_hsi.c b/drivers/hsi/controllers/ste_hsi.c index fe43d7b2133..8348a66697d 100644 --- a/drivers/hsi/controllers/ste_hsi.c +++ b/drivers/hsi/controllers/ste_hsi.c @@ -141,8 +141,6 @@ static void ste_hsi_init_registers(struct ste_hsi_controller *ste_hsi) writel(0, ste_hsi->tx_base + STE_HSI_TX_FLUSHBITS); /* TO DO: TX channel priorities will be implemented later */ writel(0, ste_hsi->tx_base + STE_HSI_TX_PRIORITY); - writel(0, ste_hsi->tx_base + STE_HSI_TX_BURSTLEN); - writel(0, ste_hsi->tx_base + STE_HSI_TX_PREAMBLE); writel(0, ste_hsi->tx_base + STE_HSI_TX_DATASWAP); writel(0, ste_hsi->tx_base + STE_HSI_TX_DMAEN); writel(0, ste_hsi->tx_base + STE_HSI_TX_WATERMARKID); @@ -187,7 +185,6 @@ static void ste_hsi_setup_registers(struct ste_hsi_controller *ste_hsi) */ writel(pcontext->tx_mode, ste_hsi->tx_base + STE_HSI_TX_MODE); writel(pcontext->tx_divisor, ste_hsi->tx_base + STE_HSI_TX_DIVISOR); - writel(0, ste_hsi->tx_base + STE_HSI_TX_PARITY); writel(pcontext->tx_channels, ste_hsi->tx_base + STE_HSI_TX_CHANNELS); /* Calculate buffers number per channel */ buffers = STE_HSI_MAX_BUFFERS / pcontext->tx_channels; @@ -879,7 +876,7 @@ static void ste_hsi_rx_tasklet(unsigned long data) u32 irq_status, irq_mask; unsigned int i; - irq_status = readl(ste_hsi->rx_base + STE_HSI_RX_WATERMARKIS); + irq_status = readl(ste_hsi->rx_base + STE_HSI_RX_WATERMARKMIS); if (!irq_status) goto out; @@ -927,7 +924,7 @@ static void ste_hsi_tx_tasklet(unsigned long data) u32 irq_status, irq_mask; unsigned int i; - irq_status = readl(ste_hsi->tx_base + STE_HSI_TX_WATERMARKIS); + irq_status = readl(ste_hsi->tx_base + STE_HSI_TX_WATERMARKMIS); if (!irq_status) goto out; |