[PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx

[linux-2.6.git] / arch / sh / boards / hp6xx / setup.c

diff --git a/arch/sh/boards/hp6xx/hp680/setup.c b/arch/sh/boards/hp6xx/setup.c
similarity index 70%
rename from arch/sh/boards/hp6xx/hp680/setup.c
rename to arch/sh/boards/hp6xx/setup.c
index 4170190f26448090bb348ecbe3bf6ced853ce291..6d94a8e2e67a0563a228b1d2ba66a73c97674dd5 100644 (file)
--- a/arch/sh/boards/hp6xx/hp680/setup.c
+++ b/arch/sh/boards/hp6xx/setup.c
@@ -11,18 +11,19 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
 
 #include <linux/config.h>
 #include <linux/init.h>

-#include <asm/hd64461/hd64461.h>

 #include <asm/io.h>
 #include <asm/io.h>

+#include <asm/hd64461.h>

 #include <asm/hp6xx/hp6xx.h>
 #include <asm/cpu/dac.h>
 
 const char *get_system_type(void)
 {
 #include <asm/hp6xx/hp6xx.h>
 #include <asm/cpu/dac.h>
 
 const char *get_system_type(void)
 {

-       return "HP680";
+       return "HP6xx";

 }
 
 int __init platform_setup(void)
 {
 }
 
 int __init platform_setup(void)
 {

+       u8 v8;

        u16 v;
        v = inw(HD64461_STBCR);
        v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST |
        u16 v;
        v = inw(HD64461_STBCR);
        v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST |


@@ -30,12 +31,25 @@ int __init platform_setup(void)
            HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST |
            HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST |
            HD64461_STBCR_SAFECKE_IST;
            HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST |
            HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST |
            HD64461_STBCR_SAFECKE_IST;

+#ifndef CONFIG_HD64461_ENABLER
+       v |= HD64461_STBCR_SPC1ST;
+#endif

        outw(v, HD64461_STBCR);
        v = inw(HD64461_GPADR);
        v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0;
        outw(v, HD64461_GPADR);
 
        outw(v, HD64461_STBCR);
        v = inw(HD64461_GPADR);
        v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0;
        outw(v, HD64461_GPADR);
 

+       outw(HD64461_PCCGCR_VCC0 | HD64461_PCCSCR_VCC1, HD64461_PCC0GCR);
+
+#ifndef CONFIG_HD64461_ENABLER
+       outw(HD64461_PCCGCR_VCC0 | HD64461_PCCSCR_VCC1, HD64461_PCC1GCR);
+#endif
+
+       sh_dac_output(0, DAC_SPEAKER_VOLUME);

        sh_dac_disable(DAC_SPEAKER_VOLUME);
        sh_dac_disable(DAC_SPEAKER_VOLUME);

+       v8 = ctrl_inb(DACR);
+       v8 &= ~DACR_DAE;
+       ctrl_outb(v8,DACR);

 
        return 0;
 }
 
        return 0;
 }