Patchwork The buzzer of TechNexion TIM-5690.

login
register
about
Submitter Libra Li
Date 2009-11-24 11:11:00
Message ID <df21912a0911240311y6ed10870pde178cbd578d551f@mail.gmail.com>
Download mbox | patch
Permalink /patch/588/
State Superseded
Headers show

Comments

Libra Li - 2009-11-24 11:11:00
Hi,

    This patch is buzzer function of TechNexion TIM-5690.
    That isn't everyone needs. So I don't put in public areas.
    Thanks.


    Signed-off: Libra Li <libra.li@technexion.com>
Myles Watson - 2009-11-24 16:13:32
2009/11/24 Libra Li <librali1977@gmail.com>:
> Hi,
>
>     This patch is buzzer function of TechNexion TIM-5690.
>     That isn't everyone needs. So I don't put in public areas.
>     Thanks.
>
>     Signed-off: Libra Li <libra.li@technexion.com>
Could you use __PRE_RAM__ instead of EARLY_STAGE?  Does it mean
something different?

Thanks,
Myles

Patch

Index: src/mainboard/technexion/tim5690/speaker.h
===================================================================
--- src/mainboard/technexion/tim5690/speaker.h	(revision 0)
+++ src/mainboard/technexion/tim5690/speaker.h	(revision 0)
@@ -0,0 +1,7 @@ 
+
+
+void speaker_init(uint8_t time);
+void speaker_on_nodelay(void);
+void speaker_off_nodelay(void);
+void speaker_on_delay(void);
+void speaker_off_delay(void);
Index: src/mainboard/technexion/tim5690/Makefile.inc
===================================================================
--- src/mainboard/technexion/tim5690/Makefile.inc	(revision 4952)
+++ src/mainboard/technexion/tim5690/Makefile.inc	(working copy)
@@ -32,6 +32,8 @@ 
 # This is debug message for products of Technexion.
 obj-y += tn_post_code.o
 
+obj-y += speaker.o
+
 # This is part of the conversion to init-obj and away from included code.
 
 initobj-y += crt0.o
Index: src/mainboard/technexion/tim5690/cache_as_ram_auto.c
===================================================================
--- src/mainboard/technexion/tim5690/cache_as_ram_auto.c	(revision 4952)
+++ src/mainboard/technexion/tim5690/cache_as_ram_auto.c	(working copy)
@@ -100,8 +100,9 @@ 
 
 #include "cpu/amd/model_fxx/fidvid.c"
 
-#define TECHNEXION_EARLY_SETUP
+#define EARLY_STAGE
 #include "tn_post_code.c"
+#include "speaker.c"
 
 
 #if CONFIG_USE_FALLBACK_IMAGE == 1
@@ -249,6 +250,9 @@ 
 		soft_reset();
 	}
 
+	speaker_init(255);
+	speaker_on_nodelay();
+
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
@@ -261,6 +265,8 @@ 
 
 	sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);
 
+	speaker_off_nodelay();
+
 	rs690_before_pci_init();
 	sb600_before_pci_init();
 
Index: src/mainboard/technexion/tim5690/tn_post_code.c
===================================================================
--- src/mainboard/technexion/tim5690/tn_post_code.c	(revision 4952)
+++ src/mainboard/technexion/tim5690/tn_post_code.c	(working copy)
@@ -1,5 +1,5 @@ 
 
-#ifdef TECHNEXION_EARLY_SETUP
+#ifdef EARLY_STAGE
 
 #include <arch/cpu.h>
 #include "southbridge/amd/sb600/sb600.h"
@@ -14,7 +14,7 @@ 
 #include "tn_post_code.h"
 
 
-#ifdef TECHNEXION_EARLY_SETUP
+#ifdef EARLY_STAGE
 
 // TechNexion's Post Code Initially.
 void technexion_post_code_init(void)
@@ -116,7 +116,7 @@ 
    device_t dev=0;
 
    // SMBus Module and ACPI Block (Device 20, Function 0)
-#ifdef TECHNEXION_EARLY_SETUP
+#ifdef EARLY_STAGE
    dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SB600_SM), 0);
 #else
    dev = dev_find_device(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SB600_SM, 0);
Index: src/mainboard/technexion/tim5690/Config.lb
===================================================================
--- src/mainboard/technexion/tim5690/Config.lb	(revision 4952)
+++ src/mainboard/technexion/tim5690/Config.lb	(working copy)
@@ -31,6 +31,7 @@ 
 
 driver mainboard.o
 object tn_post_code.o
+object speaker.o
 
 #dir /drivers/si/3114
 
Index: src/mainboard/technexion/tim5690/tn_post_code.h
===================================================================
--- src/mainboard/technexion/tim5690/tn_post_code.h	(revision 4952)
+++ src/mainboard/technexion/tim5690/tn_post_code.h	(working copy)
@@ -5,7 +5,7 @@ 
 #define LED_MESSAGE_RAM         0x01
 
 
-#ifdef TECHNEXION_EARLY_SETUP
+#ifdef EARLY_STAGE
 
 // TechNexion's Post Code Initially.
 void technexion_post_code_init(void);
Index: src/mainboard/technexion/tim5690/speaker.c
===================================================================
--- src/mainboard/technexion/tim5690/speaker.c	(revision 0)
+++ src/mainboard/technexion/tim5690/speaker.c	(revision 0)
@@ -0,0 +1,85 @@ 
+
+
+
+#ifdef EARLY_STAGE
+
+#include <arch/cpu.h>
+#include "southbridge/amd/sb600/sb600.h"
+
+#else
+
+#include <arch/io.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <../southbridge/amd/sb600/sb600.h>
+#include <delay.h>
+
+#endif
+
+#include "speaker.h"
+
+//void speaker_init(u16 time) {
+void speaker_init(uint8_t time) {
+   /* SB600 RRG.
+    * Options_0 - RW – 8 bits - [PM_Reg: 60h].
+    * SpkrEn, bit[5]=1b, Setting this bit will configure GPIO2 to be speaker output.
+    */
+#ifndef EARLY_STAGE
+   pm_iowrite(0x60, (pm_ioread(0x60) | (1<<5)));
+#else
+   pmio_write(0x60, (pmio_read(0x60) | (1<<5)));
+#endif // EARLY_STAGE
+
+   /* SB600 RRG.
+    * Tmr1CntrlWord - RW – 8 bits - [IO_Reg: 43h].
+    * ModeSelect, bit[3:1]=011b, Square wave output.
+    * CmmandSelect, bit[5:4]=11b, Read/write least, and then most significant byte.
+    * CounterSelect, bit[7:6]=10b, Select counter 2.
+    */
+   outb(0xb6, 0x43);
+   
+
+   /* SB600 RRG.
+    * TimerCh2- RW – 8 bits - [IO_Reg: 42h].
+    */
+   outb(time, 0x42);
+}
+
+void speaker_on_nodelay(void) {
+   /* SB600 RRG.
+    * Nmi_Status - RW – 8 bits - [IO_Reg: 61h].
+    * SpkrEnable, bit[0]=1b, Enable counter 2
+    * SpkrTmrEnable, bit[1]=1b, Speaker timer on
+    */
+   outb(inb(0x61) | 0x03, 0x61);
+}
+
+void speaker_on_delay(void) {
+   /* SB600 RRG.
+    * Nmi_Status - RW – 8 bits - [IO_Reg: 61h].
+    * SpkrEnable, bit[0]=1b, Enable counter 2
+    * SpkrTmrEnable, bit[1]=1b, Speaker timer on
+    */
+   outb(inb(0x61) | 0x03, 0x61);
+   mdelay(100);
+}
+
+void speaker_off_nodelay(void) {
+   /* SB600 RRG.
+    * Nmi_Status - RW – 8 bits - [IO_Reg: 61h].
+    * SpkrEnable, bit[0]=0b, Disable counter 2
+    * SpkrTmrEnable, bit[1]=0b, Speaker timer off
+    */
+   outb(inb(0x61) & ~0x03, 0x61);
+}
+
+void speaker_off_delay(void) {
+   /* SB600 RRG.
+    * Nmi_Status - RW – 8 bits - [IO_Reg: 61h].
+    * SpkrEnable, bit[0]=0b, Disable counter 2
+    * SpkrTmrEnable, bit[1]=0b, Speaker timer off
+    */
+   outb(inb(0x61) & ~0x03, 0x61);
+   mdelay(100);
+}
+
Index: src/mainboard/technexion/tim5690/mainboard.c
===================================================================
--- src/mainboard/technexion/tim5690/mainboard.c	(revision 4952)
+++ src/mainboard/technexion/tim5690/mainboard.c	(working copy)
@@ -28,6 +28,7 @@ 
 #include <../southbridge/amd/sb600/sb600.h>
 #include "chip.h"
 #include "tn_post_code.h"
+//#include "speaker.h" // test buzzer
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
@@ -184,6 +185,12 @@ 
 		uma_memory_base, uma_memory_size);
 #endif
 	technexion_post_code(LED_MESSAGE_FINISH);
+        // test buzzer
+	//speaker_on_delay();
+	//speaker_off_delay();
+	//speaker_on_delay();
+	//speaker_off_nodelay();
+	
 }
 
 struct chip_operations mainboard_ops = {