---

yaml --- r: 18636 b: refs/heads/master c: 0025835 h: refs/heads/master v: v3
git-mirror · Jan 17, 2006 · eeca51b · eeca51b
1 parent 9e87c06
commit eeca51b
Show file tree

Hide file tree

Showing 13 changed files with 290 additions and 254 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ebdce726baf17eb66c5a1bf402ae6f161a082ed
+refs/heads/master: 0025835cf20e07056b8521b8c1d7d0bfe07e81f1
diff --git a/trunk/arch/sh/boards/hp6xx/Makefile b/trunk/arch/sh/boards/hp6xx/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the HP6xx specific parts of the kernel
+#
+
+obj-y	 := mach.o setup.o
+
diff --git a/trunk/arch/sh/boards/hp6xx/hp620/Makefile b/trunk/arch/sh/boards/hp6xx/hp620/Makefile
diff --git a/trunk/arch/sh/boards/hp6xx/hp620/mach.c b/trunk/arch/sh/boards/hp6xx/hp620/mach.c
diff --git a/trunk/arch/sh/boards/hp6xx/hp620/setup.c b/trunk/arch/sh/boards/hp6xx/hp620/setup.c
diff --git a/trunk/arch/sh/boards/hp6xx/hp680/Makefile b/trunk/arch/sh/boards/hp6xx/hp680/Makefile
diff --git a/trunk/arch/sh/boards/hp6xx/hp690/Makefile b/trunk/arch/sh/boards/hp6xx/hp690/Makefile
diff --git a/trunk/arch/sh/boards/hp6xx/hp690/mach.c b/trunk/arch/sh/boards/hp6xx/hp690/mach.c
diff --git a/trunk/arch/sh/boards/hp6xx/hp680/mach.c → trunk/arch/sh/boards/hp6xx/mach.c b/trunk/arch/sh/boards/hp6xx/hp680/mach.c → trunk/arch/sh/boards/hp6xx/mach.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/sh/boards/hp6xx/hp680/mach.c
+ * linux/arch/sh/boards/hp6xx/mach.c
  *
  * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
  *
@@ -8,19 +8,12 @@
  *
  * Machine vector for the HP680
  */
-
-#include <linux/init.h>
-
 #include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/machvec_init.h>
-
+#include <asm/hd64461.h>
 #include <asm/io.h>
-#include <asm/hd64461/hd64461.h>
-#include <asm/hp6xx/io.h>
 #include <asm/irq.h>
 
-struct sh_machine_vector mv_hp680 __initmv = {
+struct sh_machine_vector mv_hp6xx __initmv = {
 	.mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM,
 
 	.mv_inb = hd64461_inb,
@@ -50,4 +43,4 @@ struct sh_machine_vector mv_hp680 __initmv = {
 	.mv_irq_demux = hd64461_irq_demux,
 };
 
-ALIAS_MV(hp680)
+ALIAS_MV(hp6xx)
diff --git a/trunk/arch/sh/boards/hp6xx/hp680/setup.c → trunk/arch/sh/boards/hp6xx/setup.c b/trunk/arch/sh/boards/hp6xx/hp680/setup.c → trunk/arch/sh/boards/hp6xx/setup.c
@@ -11,31 +11,45 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#include <asm/hd64461/hd64461.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)
 {
-	return "HP680";
+	return "HP6xx";
 }
 
 int __init platform_setup(void)
 {
+	u8 v8;
 	u16 v;
 	v = inw(HD64461_STBCR);
 	v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST |
 	    HD64461_STBCR_STM1ST | HD64461_STBCR_STM0ST |
 	    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(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);
+	v8 = ctrl_inb(DACR);
+	v8 &= ~DACR_DAE;
+	ctrl_outb(v8,DACR);
 
 	return 0;
 }