2 files changed, 6 insertions, 7 deletions

diff --git a/firmware/target/arm/ata-pp5020.c b/firmware/target/arm/ata-pp5020.c
index f8ca773132..022d1654d6 100644
--- a/firmware/target/arm/ata-pp5020.c
+++ b/firmware/target/arm/ata-pp5020.c
@@ -43,9 +43,9 @@ bool ata_is_coldstart()
 void ata_device_init()
 {
     /* From ipod-ide.c:ipod_ide_register() */
-    outl(inl(0xc3000028) | (1 << 5), 0xc3000028);
-    outl(inl(0xc3000028) & ~0x10000000, 0xc3000028);
+    IDE0_CFG |= (1<<5);
+    IDE0_CFG &=~(0x10000000);   /* cpu < 65MHz */
 
-    outl(0x10, 0xc3000000);
-    outl(0x80002150, 0xc3000004);
+    IDE0_PRI_TIMING0 = 0x10;
+    IDE0_PRI_TIMING1 = 0x80002150;
 }
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index 891213468c..d8eecadc9b 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -206,9 +206,8 @@ void pcm_play_dma_start(const void *addr, size_t size)
     pcm_playing = true;
 
 #if CONFIG_CPU == PP5020
-    /* setup I2S interrupt for FIQ */
-    outl(inl(0x6000402c) | I2S_MASK, 0x6000402c);
-    CPU_INT_EN = I2S_MASK;
+    CPU_INT_PRIORITY |= I2S_MASK;   /* FIQ priority for I2S */
+    CPU_INT_EN = I2S_MASK;          /* Enable I2S interrupt */
 #elif CONFIG_CPU == PP5024
 #else
     /* setup I2S interrupt for FIQ */