sure
On Wed, Apr 27, 2011 at 03:36:44PM -0500, joshua stein wrote:
> this attaches acpithinkpad to newer lenovo thinkpads like the x120e.
>
> hw.sensors.acpithinkpad0.temp0=57.00 degC
> hw.sensors.acpithinkpad0.temp1=0.00 degC
> hw.sensors.acpithinkpad0.temp2=57.00 degC
> hw.sensors.acpithinkpad0.temp3=0.00 degC
> hw.sensors.acpithinkpad0.temp4=0.00 degC
> hw.sensors.acpithinkpad0.temp5=0.00 degC
> hw.sensors.acpithinkpad0.temp6=27.00 degC
> hw.sensors.acpithinkpad0.temp7=0.00 degC
> hw.sensors.acpithinkpad0.fan0=335 RPM
>
>
> Index: acpi.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/acpi/acpi.c,v
> retrieving revision 1.223
> diff -u -p -u -p -r1.223 acpi.c
> --- acpi.c 22 Apr 2011 18:22:01 -0000 1.223
> +++ acpi.c 27 Apr 2011 20:32:46 -0000
> @@ -2328,7 +2328,8 @@ acpi_foundhid(struct aml_node *node, voi
> aaa.aaa_name = "acpibtn";
> else if (!strcmp(dev, ACPI_DEV_ASUS))
> aaa.aaa_name = "acpiasus";
> - else if (!strcmp(dev, ACPI_DEV_THINKPAD)) {
> + else if (!strcmp(dev, ACPI_DEV_IBM) ||
> + !strcmp(dev, ACPI_DEV_LENOVO)) {
> aaa.aaa_name = "acpithinkpad";
> acpi_thinkpad_enabled = 1;
> } else if (!strcmp(dev, ACPI_DEV_ASUSAIBOOSTER))
> Index: acpireg.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/acpi/acpireg.h,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 acpireg.h
> --- acpireg.h 4 Jan 2011 21:17:49 -0000 1.24
> +++ acpireg.h 27 Apr 2011 20:32:47 -0000
> @@ -713,7 +713,8 @@ struct acpi_ivrs {
> #define ACPI_DEV_THZ "THERMALZONE" /* Thermal Zone */
> #define ACPI_DEV_FFB "FIXEDBUTTON" /* Fixed Feature Button */
> #define ACPI_DEV_ASUS "ASUS010" /* ASUS Hotkeys */
> -#define ACPI_DEV_THINKPAD "IBM0068" /* ThinkPad support */
> +#define ACPI_DEV_IBM "IBM0068" /* IBM ThinkPad support */
> +#define ACPI_DEV_LENOVO "LEN0068" /* Lenovo ThinkPad support */
> #define ACPI_DEV_ASUSAIBOOSTER "ATK0110" /* ASUSTeK AI Booster */
>
> #endif /* !_DEV_ACPI_ACPIREG_H_ */
> Index: acpithinkpad.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/acpi/acpithinkpad.c,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 acpithinkpad.c
> --- acpithinkpad.c 2 Jan 2011 04:56:57 -0000 1.25
> +++ acpithinkpad.c 27 Apr 2011 20:32:47 -0000
> @@ -114,7 +114,9 @@ struct cfdriver acpithinkpad_cd = {
> NULL, "acpithinkpad", DV_DULL
> };
>
> -const char *acpithinkpad_hids[] = { ACPI_DEV_THINKPAD, 0 };
> +const char *acpithinkpad_hids[] = {
> + ACPI_DEV_IBM, ACPI_DEV_LENOVO, 0
> +};
>
> int
> thinkpad_match(struct device *parent, void *match, void *aux)
>
>
>
> OpenBSD 4.9-current (GENERIC.MP) #6: Thu Dec 31 18:16:11 CST 2009
> [email protected]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> RTC BIOS diagnostic error 80<clock_battery>
> real mem = 3867213824 (3688MB)
> avail mem = 3750223872 (3576MB)
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xf9ba0 (60 entries)
> bios0: vendor LENOVO version "8FET27WW (1.11 )" date 03/24/2011
> bios0: LENOVO 05962RU
> acpi0 at bios0: rev 2
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP SLIC HPET APIC MCFG UEFI UEFI SSDT SSDT UEFI
> acpi0: wakeup devices PB4_(S4) PB5_(S4) PB6_(S4) PB7_(S4) OHC1(S3) EHC1(S3)
> OHC2(S3) EHC2(S3) OHC3(S3) EHC3(S3) OHC4(S3) SBAZ(S4) GEC_(S4) P2P_(S5)
> SPB0(S4) SPB1(S4) SPB2(S4) SPB3(S4) LID_(S4)
> acpitimer0 at acpi0: 3579545 Hz, 32 bits
> acpihpet0 at acpi0: 14318180 Hz
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: AMD E-350 Processor, 1597.52 MHz
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,SSSE3,CX16,POPCNT,NXE,MMXX,FFXSR,LONG
> cpu0: 32KB 64b/line 2-way I-cache, 32KB 64b/line 8-way D-cache, 512KB
> 64b/line 16-way L2 cache
> cpu0: DTLB 40 4KB entries fully associative, 8 4MB entries fully associative
> cpu0: apic clock running at 199MHz
> cpu1 at mainbus0: apid 1 (application processor)
> cpu1: AMD E-350 Processor, 1596.60 MHz
> cpu1:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,SSSE3,CX16,POPCNT,NXE,MMXX,FFXSR,LONG
> cpu1: 32KB 64b/line 2-way I-cache, 32KB 64b/line 8-way D-cache, 512KB
> 64b/line 16-way L2 cache
> cpu1: DTLB 40 4KB entries fully associative, 8 4MB entries fully associative
> ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 21, 24 pins
> ioapic0: misconfigured as apic 0, remapped to apid 2
> acpimcfg0 at acpi0 addr 0xf8000000, bus 0-31
> acpiprt0 at acpi0: bus 0 (PCI0)
> acpiprt1 at acpi0: bus -1 (PB4_)
> acpiprt2 at acpi0: bus -1 (PB5_)
> acpiprt3 at acpi0: bus 1 (PB6_)
> acpiprt4 at acpi0: bus -1 (PB7_)
> acpiprt5 at acpi0: bus 2 (P2P_)
> acpiprt6 at acpi0: bus 3 (SPB0)
> acpiprt7 at acpi0: bus 4 (SPB1)
> acpiprt8 at acpi0: bus -1 (SPB2)
> acpiprt9 at acpi0: bus -1 (SPB3)
> acpiec0 at acpi0
> acpicpu0 at acpi0: C2, PSS
> acpicpu1 at acpi0: C2, PSS
> acpitz0 at acpi0: critical temperature 92 degC
> acpibtn0 at acpi0: PWRB
> acpibtn1 at acpi0: SLPB
> acpithinkpad0 at acpi0
> acpiac0 at acpi0: AC unit online
> acpibat0 at acpi0: BAT1 model "42T4855" serial 627 type LION oem "LGC"
> acpibtn2 at acpi0: LID_
> pci0 at mainbus0 bus 0
> pchb0 at pci0 dev 0 function 0 vendor "AMD", unknown product 0x1510 rev 0x00
> vga1 at pci0 dev 1 function 0 vendor "ATI", unknown product 0x9802 rev 0x00
> wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
> wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
> azalia0 at pci0 dev 1 function 1 vendor "ATI", unknown product 0x1314 rev
> 0x00: apic 2 int 19
> azalia0: no supported codecs
> ppb0 at pci0 dev 6 function 0 vendor "AMD", unknown product 0x1514 rev 0x00:
> apic 2 int 18
> pci1 at ppb0 bus 1
> re0 at pci1 dev 0 function 0 "Realtek 8168" rev 0x03: RTL8168D/8111D
> (0x2800), apic 2 int 18, address e8:9a:8f:04:ff:ae
> rgephy0 at re0 phy 7: RTL8169S/8110S PHY, rev. 2
> ahci0 at pci0 dev 17 function 0 "ATI SBx00 SATA" rev 0x00: apic 2 int 19,
> AHCI 1.2
> scsibus0 at ahci0: 32 targets
> sd0 at scsibus0 targ 0 lun 0: <ATA, INTEL SSDSA2M120, 2CV1> SCSI3 0/direct
> fixed naa.50015179594de1ea
> sd0: 114473MB, 512 bytes/sec, 234441648 sec total
> ohci0 at pci0 dev 18 function 0 "ATI SB700 USB" rev 0x00: apic 2 int 18,
> version 1.0, legacy support
> ehci0 at pci0 dev 18 function 2 "ATI SB700 USB2" rev 0x00: apic 2 int 17
> usb0 at ehci0: USB revision 2.0
> uhub0 at usb0 "ATI EHCI root hub" rev 2.00/1.00 addr 1
> ohci1 at pci0 dev 19 function 0 "ATI SB700 USB" rev 0x00: apic 2 int 18,
> version 1.0, legacy support
> ehci1 at pci0 dev 19 function 2 "ATI SB700 USB2" rev 0x00: apic 2 int 17
> usb1 at ehci1: USB revision 2.0
> uhub1 at usb1 "ATI EHCI root hub" rev 2.00/1.00 addr 1
> piixpm0 at pci0 dev 20 function 0 "ATI SBx00 SMBus" rev 0x42: SMBus disabled
> azalia1 at pci0 dev 20 function 2 "ATI SBx00 HD Audio" rev 0x40: apic 2 int 16
> azalia1: codecs: Conexant/0x5066
> audio0 at azalia1
> pcib0 at pci0 dev 20 function 3 "ATI SB700 ISA" rev 0x40
> ppb1 at pci0 dev 20 function 4 "ATI SB600 PCI" rev 0x40
> pci2 at ppb1 bus 2
> ppb2 at pci0 dev 21 function 0 vendor "ATI", unknown product 0x43a0 rev 0x00
> pci3 at ppb2 bus 3
> ppb3 at pci0 dev 21 function 1 vendor "ATI", unknown product 0x43a1 rev 0x00:
> apic 2 int 16
> pci4 at ppb3 bus 4
> "Realtek 8176" rev 0x01 at pci4 dev 0 function 0 not configured
> pchb1 at pci0 dev 24 function 0 vendor "AMD", unknown product 0x1700 rev 0x43
> pchb2 at pci0 dev 24 function 1 vendor "AMD", unknown product 0x1701 rev 0x00
> pchb3 at pci0 dev 24 function 2 vendor "AMD", unknown product 0x1702 rev 0x00
> pchb4 at pci0 dev 24 function 3 vendor "AMD", unknown product 0x1703 rev 0x00
> pchb5 at pci0 dev 24 function 4 vendor "AMD", unknown product 0x1704 rev 0x00
> pchb6 at pci0 dev 24 function 5 vendor "AMD", unknown product 0x1718 rev 0x00
> pchb7 at pci0 dev 24 function 6 vendor "AMD", unknown product 0x1716 rev 0x00
> pchb8 at pci0 dev 24 function 7 vendor "AMD", unknown product 0x1719 rev 0x00
> usb2 at ohci0: USB revision 1.0
> uhub2 at usb2 "ATI OHCI root hub" rev 1.00/1.00 addr 1
> usb3 at ohci1: USB revision 1.0
> uhub3 at usb3 "ATI OHCI root hub" rev 1.00/1.00 addr 1
> isa0 at pcib0
> isadma0 at isa0
> pckbc0 at isa0 port 0x60/5
> pckbd0 at pckbc0 (kbd slot)
> pckbc0: using irq 1 for kbd slot
> wskbd0 at pckbd0: console keyboard, using wsdisplay0
> pms0 at pckbc0 (aux slot)
> pckbc0: using irq 12 for aux slot
> wsmouse0 at pms0 mux 0
> pcppi0 at isa0 port 0x61
> spkr0 at pcppi0
> mtrr: Pentium Pro MTRR support
> umass0 at uhub1 port 2 configuration 1 interface 0 "Generic USB2.0-CRW" rev
> 2.00/58.88 addr 2
> umass0: using SCSI over Bulk-Only
> scsibus1 at umass0: 2 targets, initiator 0
> sd1 at scsibus1 targ 1 lun 0: <Generic-, Multi-Card, 1.00> SCSI0 0/direct
> removable serial.0bda0158114173400000
> uvideo0 at uhub1 port 5 configuration 1 interface 0 "Image Processor
> Integrated Camera" rev 2.00/30.08 addr 3
> video0 at uvideo0
> vscsi0 at root
> scsibus2 at vscsi0: 256 targets
> softraid0 at root
> root on sd0a (b028bbcf27adaab0.a) swap on sd0b dump on sd0b
