aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/board-polaris.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/boards/board-polaris.c')
-rw-r--r--arch/sh/boards/board-polaris.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/sh/boards/board-polaris.c b/arch/sh/boards/board-polaris.c
index 5bc126900ce..594866356c2 100644
--- a/arch/sh/boards/board-polaris.c
+++ b/arch/sh/boards/board-polaris.c
@@ -89,15 +89,15 @@ static int __init polaris_initialise(void)
89 printk(KERN_INFO "Configuring Polaris external bus\n"); 89 printk(KERN_INFO "Configuring Polaris external bus\n");
90 90
91 /* Configure area 5 with 2 wait states */ 91 /* Configure area 5 with 2 wait states */
92 wcr = ctrl_inw(WCR2); 92 wcr = __raw_readw(WCR2);
93 wcr &= (~AREA5_WAIT_CTRL); 93 wcr &= (~AREA5_WAIT_CTRL);
94 wcr |= (WAIT_STATES_10 << 10); 94 wcr |= (WAIT_STATES_10 << 10);
95 ctrl_outw(wcr, WCR2); 95 __raw_writew(wcr, WCR2);
96 96
97 /* Configure area 5 for 32-bit access */ 97 /* Configure area 5 for 32-bit access */
98 bcr_mask = ctrl_inw(BCR2); 98 bcr_mask = __raw_readw(BCR2);
99 bcr_mask |= 1 << 10; 99 bcr_mask |= 1 << 10;
100 ctrl_outw(bcr_mask, BCR2); 100 __raw_writew(bcr_mask, BCR2);
101 101
102 return platform_add_devices(polaris_devices, 102 return platform_add_devices(polaris_devices,
103 ARRAY_SIZE(polaris_devices)); 103 ARRAY_SIZE(polaris_devices));
@@ -128,13 +128,13 @@ static struct ipr_desc ipr_irq_desc = {
128static void __init init_polaris_irq(void) 128static void __init init_polaris_irq(void)
129{ 129{
130 /* Disable all interrupts */ 130 /* Disable all interrupts */
131 ctrl_outw(0, BCR_ILCRA); 131 __raw_writew(0, BCR_ILCRA);
132 ctrl_outw(0, BCR_ILCRB); 132 __raw_writew(0, BCR_ILCRB);
133 ctrl_outw(0, BCR_ILCRC); 133 __raw_writew(0, BCR_ILCRC);
134 ctrl_outw(0, BCR_ILCRD); 134 __raw_writew(0, BCR_ILCRD);
135 ctrl_outw(0, BCR_ILCRE); 135 __raw_writew(0, BCR_ILCRE);
136 ctrl_outw(0, BCR_ILCRF); 136 __raw_writew(0, BCR_ILCRF);
137 ctrl_outw(0, BCR_ILCRG); 137 __raw_writew(0, BCR_ILCRG);
138 138
139 register_ipr_controller(&ipr_irq_desc); 139 register_ipr_controller(&ipr_irq_desc);
140} 140}