From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161141AbWBVWQ2 (ORCPT ); Wed, 22 Feb 2006 17:16:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751509AbWBVWQ1 (ORCPT ); Wed, 22 Feb 2006 17:16:27 -0500 Received: from fmr18.intel.com ([134.134.136.17]:16314 "EHLO orsfmr003.jf.intel.com") by vger.kernel.org with ESMTP id S1751507AbWBVWLB (ORCPT ); Wed, 22 Feb 2006 17:11:01 -0500 Date: Wed, 22 Feb 2006 13:40:54 -0800 From: Randy Dunlap To: lkml Cc: linux-ide@vger.kernel.org, akpm@osdl.org, jgarzik@pobox.com Subject: [PATCH 1/13] ATA ACPI: Makefile/Kconfig/doc. Message-Id: <20060222134054.69373431.randy_d_dunlap@linux.intel.com> In-Reply-To: <20060222133241.595a8509.randy_d_dunlap@linux.intel.com> References: <20060222133241.595a8509.randy_d_dunlap@linux.intel.com> X-Mailer: Sylpheed version 2.0.4 (GTK+ 2.8.3; x86_64-unknown-linux-gnu) X-Face: "}I"O`t9.W]b]8SycP0Jap#)%JR,H)Eg(FP)?S1qh0ZJRu|mz*%SKpL7rcKI3(OwmK2@uo\b2 GB:7w&?a,*<8v[ldN`5)MXFcm'cjwRs5)ui)j Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Add ata_acpi in Makefile and Kconfig. Add ACPI obj_handle. Add ata_acpi.c to libata kernel-doc template file. Signed-off-by: Randy Dunlap --- Documentation/DocBook/libata.tmpl | 6 ++++++ drivers/scsi/Kconfig | 5 +++++ drivers/scsi/Makefile | 3 +++ include/linux/libata.h | 6 ++++++ 4 files changed, 20 insertions(+) --- linux-2616-rc4-ata.orig/drivers/scsi/Makefile +++ linux-2616-rc4-ata/drivers/scsi/Makefile @@ -164,6 +164,9 @@ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags- zalon7xx-objs := zalon.o ncr53c8xx.o NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o libata-objs := libata-core.o libata-scsi.o +ifeq ($(CONFIG_SCSI_SATA_ACPI),y) + libata-objs += libata-acpi.o +endif oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o # Files generated that shall be removed upon make clean --- linux-2616-rc4-ata.orig/drivers/scsi/Kconfig +++ linux-2616-rc4-ata/drivers/scsi/Kconfig @@ -599,6 +599,11 @@ config SCSI_SATA_INTEL_COMBINED depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) default y +config SCSI_SATA_ACPI + bool + depends on SCSI_SATA && ACPI + default y + config SCSI_BUSLOGIC tristate "BusLogic SCSI support" depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API --- linux-2616-rc4-ata.orig/include/linux/libata.h +++ linux-2616-rc4-ata/include/linux/libata.h @@ -33,6 +33,7 @@ #include #include #include +#include /* * compile-time options @@ -318,6 +319,11 @@ struct ata_device { u16 cylinders; /* Number of cylinders */ u16 heads; /* Number of heads */ u16 sectors; /* Number of sectors per track */ + +#ifdef CONFIG_SCSI_SATA_ACPI + /* ACPI objects info */ + acpi_handle obj_handle; +#endif }; struct ata_port { --- linux-2616-rc4-ata.orig/Documentation/DocBook/libata.tmpl +++ linux-2616-rc4-ata/Documentation/DocBook/libata.tmpl @@ -787,6 +787,12 @@ and other resources, etc. !Idrivers/scsi/libata-scsi.c + + libata ACPI interfaces/methods +!Edrivers/scsi/ata_acpi.c +!Idrivers/scsi/ata_acpi.c + + ATA errors & exceptions