summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2011-09-13 23:38:52 +0000
committerAmaury Pouly <pamaury@rockbox.org>2011-09-13 23:38:52 +0000
commitb27d07e094376c2970cdb62434450f7a683edee7 (patch)
tree2658c55c393803f8435c925593fb9d93cdf694df /firmware
parentb51ecea14aba6d86fc47cc79179eb19bdd0cd70a (diff)
downloadrockbox-b27d07e094376c2970cdb62434450f7a683edee7.tar.gz
rockbox-b27d07e094376c2970cdb62434450f7a683edee7.tar.bz2
rockbox-b27d07e094376c2970cdb62434450f7a683edee7.zip
imx233/fuze+: reset ssp block correctly, define maximum ssp transfer size
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30525 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/imx233/ssp-imx233.c3
-rw-r--r--firmware/target/arm/imx233/ssp-imx233.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/target/arm/imx233/ssp-imx233.c b/firmware/target/arm/imx233/ssp-imx233.c
index 912f9c3ae4..21d5658392 100644
--- a/firmware/target/arm/imx233/ssp-imx233.c
+++ b/firmware/target/arm/imx233/ssp-imx233.c
@@ -93,8 +93,7 @@ void imx233_ssp_init(void)
void imx233_ssp_start(int ssp)
{
/* Gate block */
- __REG_CLR(HW_SSP_CTRL0(ssp)) = __BLOCK_CLKGATE;
- while(HW_SSP_CTRL0(ssp) & __BLOCK_CLKGATE);
+ imx233_reset_block(&HW_SSP_CTRL0(ssp));
/* Gate dma channel */
imx233_dma_clkgate_channel(APB_SSP(ssp), true);
/* If first block to start, start SSP clock */
diff --git a/firmware/target/arm/imx233/ssp-imx233.h b/firmware/target/arm/imx233/ssp-imx233.h
index c9083d8d75..42aa2550a6 100644
--- a/firmware/target/arm/imx233/ssp-imx233.h
+++ b/firmware/target/arm/imx233/ssp-imx233.h
@@ -28,6 +28,7 @@
#include "system.h"
#include "system-target.h"
#include "pinctrl-imx233.h"
+#include "dma-imx233.h"
/* ssp can value 1 or 2 */
#define __SSP_SELECT(ssp, ssp1, ssp2) ((ssp) == 1 ? (ssp1) : (ssp2))
@@ -130,6 +131,8 @@
#define HW_SSP_VERSION(ssp) (*(volatile uint32_t *)(HW_SSP_BASE(ssp) + 0x110))
+#define IMX233_MAX_SSP_XFER_SIZE IMX233_MAX_SINGLE_DMA_XFER_SIZE
+
enum imx233_ssp_error_t
{
SSP_SUCCESS = 0,