Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / m68k / atari / config.c

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index e328eaf816e372ff07f8e0d5dc214aaf9ee18f88..565c6f06ab0b8193ef02f8028d6a8baf8ff00b06 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -234,44 +234,44 @@ void __init config_atari(void)
         * Determine hardware present
         */
 
-       printk("Atari hardware found: ");
+       pr_info("Atari hardware found:");
        if (MACH_IS_MEDUSA) {
                /* There's no Atari video hardware on the Medusa, but all the
                 * addresses below generate a DTACK so no bus error occurs! */
        } else if (hwreg_present(f030_xreg)) {
                ATARIHW_SET(VIDEL_SHIFTER);
-               printk("VIDEL ");
+               pr_cont(" VIDEL");
                /* This is a temporary hack: If there is Falcon video
                 * hardware, we assume that the ST-DMA serves SCSI instead of
                 * ACSI. In the future, there should be a better method for
                 * this...
                 */
                ATARIHW_SET(ST_SCSI);
-               printk("STDMA-SCSI ");
+               pr_cont(" STDMA-SCSI");
        } else if (hwreg_present(tt_palette)) {
                ATARIHW_SET(TT_SHIFTER);
-               printk("TT_SHIFTER ");
+               pr_cont(" TT_SHIFTER");
        } else if (hwreg_present(&shifter.bas_hi)) {
                if (hwreg_present(&shifter.bas_lo) &&
                    (shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) {
                        ATARIHW_SET(EXTD_SHIFTER);
-                       printk("EXTD_SHIFTER ");
+                       pr_cont(" EXTD_SHIFTER");
                } else {
                        ATARIHW_SET(STND_SHIFTER);
-                       printk("STND_SHIFTER ");
+                       pr_cont(" STND_SHIFTER");
                }
        }
        if (hwreg_present(&st_mfp.par_dt_reg)) {
                ATARIHW_SET(ST_MFP);
-               printk("ST_MFP ");
+               pr_cont(" ST_MFP");
        }
        if (hwreg_present(&tt_mfp.par_dt_reg)) {
                ATARIHW_SET(TT_MFP);
-               printk("TT_MFP ");
+               pr_cont(" TT_MFP");
        }
        if (hwreg_present(&tt_scsi_dma.dma_addr_hi)) {
                ATARIHW_SET(SCSI_DMA);
-               printk("TT_SCSI_DMA ");
+               pr_cont(" TT_SCSI_DMA");
        }
        /*
         * The ST-DMA address registers aren't readable
@@ -284,27 +284,27 @@ void __init config_atari(void)
             (st_dma.dma_vhi = 0xaa) && (st_dma.dma_hi = 0x55) &&
             st_dma.dma_vhi == 0xaa && st_dma.dma_hi == 0x55)) {
                ATARIHW_SET(EXTD_DMA);
-               printk("EXTD_DMA ");
+               pr_cont(" EXTD_DMA");
        }
        if (hwreg_present(&tt_scsi.scsi_data)) {
                ATARIHW_SET(TT_SCSI);
-               printk("TT_SCSI ");
+               pr_cont(" TT_SCSI");
        }
        if (hwreg_present(&sound_ym.rd_data_reg_sel)) {
                ATARIHW_SET(YM_2149);
-               printk("YM2149 ");
+               pr_cont(" YM2149");
        }
        if (!MACH_IS_MEDUSA && hwreg_present(&tt_dmasnd.ctrl)) {
                ATARIHW_SET(PCM_8BIT);
-               printk("PCM ");
+               pr_cont(" PCM");
        }
        if (hwreg_present(&falcon_codec.unused5)) {
                ATARIHW_SET(CODEC);
-               printk("CODEC ");
+               pr_cont(" CODEC");
        }
        if (hwreg_present(&dsp56k_host_interface.icr)) {
                ATARIHW_SET(DSP56K);
-               printk("DSP56K ");
+               pr_cont(" DSP56K");
        }
        if (hwreg_present(&tt_scc_dma.dma_ctrl) &&
 #if 0
@@ -316,33 +316,33 @@ void __init config_atari(void)
 #endif
            ) {
                ATARIHW_SET(SCC_DMA);
-               printk("SCC_DMA ");
+               pr_cont(" SCC_DMA");
        }
        if (scc_test(&atari_scc.cha_a_ctrl)) {
                ATARIHW_SET(SCC);
-               printk("SCC ");
+               pr_cont(" SCC");
        }
        if (scc_test(&st_escc.cha_b_ctrl)) {
                ATARIHW_SET(ST_ESCC);
-               printk("ST_ESCC ");
+               pr_cont(" ST_ESCC");
        }
        if (hwreg_present(&tt_scu.sys_mask)) {
                ATARIHW_SET(SCU);
                /* Assume a VME bus if there's a SCU */
                ATARIHW_SET(VME);
-               printk("VME SCU ");
+               pr_cont(" VME SCU");
        }
        if (hwreg_present((void *)(0xffff9210))) {
                ATARIHW_SET(ANALOG_JOY);
-               printk("ANALOG_JOY ");
+               pr_cont(" ANALOG_JOY");
        }
        if (hwreg_present(blitter.halftone)) {
                ATARIHW_SET(BLITTER);
-               printk("BLITTER ");
+               pr_cont(" BLITTER");
        }
        if (hwreg_present((void *)0xfff00039)) {
                ATARIHW_SET(IDE);
-               printk("IDE ");
+               pr_cont(" IDE");
        }
 #if 1 /* This maybe wrong */
        if (!MACH_IS_MEDUSA && hwreg_present(&tt_microwire.data) &&
@@ -355,31 +355,31 @@ void __init config_atari(void)
                ATARIHW_SET(MICROWIRE);
                while (tt_microwire.mask != 0x7ff)
                        ;
-               printk("MICROWIRE ");
+               pr_cont(" MICROWIRE");
        }
 #endif
        if (hwreg_present(&tt_rtc.regsel)) {
                ATARIHW_SET(TT_CLK);
-               printk("TT_CLK ");
+               pr_cont(" TT_CLK");
                mach_hwclk = atari_tt_hwclk;
                mach_set_clock_mmss = atari_tt_set_clock_mmss;
        }
        if (hwreg_present(&mste_rtc.sec_ones)) {
                ATARIHW_SET(MSTE_CLK);
-               printk("MSTE_CLK ");
+               pr_cont(" MSTE_CLK");
                mach_hwclk = atari_mste_hwclk;
                mach_set_clock_mmss = atari_mste_set_clock_mmss;
        }
        if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) &&
            hwreg_write(&dma_wd.fdc_speed, 0)) {
                ATARIHW_SET(FDCSPEED);
-               printk("FDC_SPEED ");
+               pr_cont(" FDC_SPEED");
        }
        if (!ATARIHW_PRESENT(ST_SCSI)) {
                ATARIHW_SET(ACSI);
-               printk("ACSI ");
+               pr_cont(" ACSI");
        }
-       printk("\n");
+       pr_cont("\n");
 
        if (CPU_IS_040_OR_060)
                /* Now it seems to be safe to turn of the tt0 transparent