sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -156,32 +156,32 @@ device_initcall(se7722_devices_setup);
|
||||
|
||||
static void __init se7722_setup(char **cmdline_p)
|
||||
{
|
||||
ctrl_outw(0x010D, FPGA_OUT); /* FPGA */
|
||||
__raw_writew(0x010D, FPGA_OUT); /* FPGA */
|
||||
|
||||
ctrl_outw(0x0000, PORT_PECR); /* PORT E 1 = IRQ5 ,E 0 = BS */
|
||||
ctrl_outw(0x1000, PORT_PJCR); /* PORT J 1 = IRQ1,J 0 =IRQ0 */
|
||||
__raw_writew(0x0000, PORT_PECR); /* PORT E 1 = IRQ5 ,E 0 = BS */
|
||||
__raw_writew(0x1000, PORT_PJCR); /* PORT J 1 = IRQ1,J 0 =IRQ0 */
|
||||
|
||||
/* LCDC I/O */
|
||||
ctrl_outw(0x0020, PORT_PSELD);
|
||||
__raw_writew(0x0020, PORT_PSELD);
|
||||
|
||||
/* SIOF1*/
|
||||
ctrl_outw(0x0003, PORT_PSELB);
|
||||
ctrl_outw(0xe000, PORT_PSELC);
|
||||
ctrl_outw(0x0000, PORT_PKCR);
|
||||
__raw_writew(0x0003, PORT_PSELB);
|
||||
__raw_writew(0xe000, PORT_PSELC);
|
||||
__raw_writew(0x0000, PORT_PKCR);
|
||||
|
||||
/* LCDC */
|
||||
ctrl_outw(0x4020, PORT_PHCR);
|
||||
ctrl_outw(0x0000, PORT_PLCR);
|
||||
ctrl_outw(0x0000, PORT_PMCR);
|
||||
ctrl_outw(0x0002, PORT_PRCR);
|
||||
ctrl_outw(0x0000, PORT_PXCR); /* LCDC,CS6A */
|
||||
__raw_writew(0x4020, PORT_PHCR);
|
||||
__raw_writew(0x0000, PORT_PLCR);
|
||||
__raw_writew(0x0000, PORT_PMCR);
|
||||
__raw_writew(0x0002, PORT_PRCR);
|
||||
__raw_writew(0x0000, PORT_PXCR); /* LCDC,CS6A */
|
||||
|
||||
/* KEYSC */
|
||||
ctrl_outw(0x0A10, PORT_PSELA); /* BS,SHHID2 */
|
||||
ctrl_outw(0x0000, PORT_PYCR);
|
||||
ctrl_outw(0x0000, PORT_PZCR);
|
||||
ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x4000, PORT_HIZCRA);
|
||||
ctrl_outw(ctrl_inw(PORT_HIZCRC) & ~0xc000, PORT_HIZCRC);
|
||||
__raw_writew(0x0A10, PORT_PSELA); /* BS,SHHID2 */
|
||||
__raw_writew(0x0000, PORT_PYCR);
|
||||
__raw_writew(0x0000, PORT_PZCR);
|
||||
__raw_writew(__raw_readw(PORT_HIZCRA) & ~0x4000, PORT_HIZCRA);
|
||||
__raw_writew(__raw_readw(PORT_HIZCRC) & ~0xc000, PORT_HIZCRC);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user