Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 327b6b08 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents c973b112 2ad56496
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -33,3 +33,6 @@ The result of the execution of this aml method is
attached to /proc/acpi/hotkey/poll_method, which is dnyamically
created.  Please use command "cat /proc/acpi/hotkey/polling_method" 
to retrieve it.

Note: Use cmdline "acpi_generic_hotkey" to over-ride
loading any platform specific drivers.
+93 −0
Original line number Diff line number Diff line
			S3C24XX USB Host support
			========================



Introduction
------------

  This document details the S3C2410/S3C2440 in-built OHCI USB host support.

Configuration
-------------

  Enable at least the following kernel options:

  menuconfig:

   Device Drivers  --->
     USB support  --->
       <*> Support for Host-side USB
       <*>   OHCI HCD support


  .config:
    CONFIG_USB
    CONFIG_USB_OHCI_HCD


  Once these options are configured, the standard set of USB device
  drivers can be configured and used.


Board Support
-------------

  The driver attaches to a platform device, which will need to be
  added by the board specific support file in linux/arch/arm/mach-s3c2410,
  such as mach-bast.c or mach-smdk2410.c

  The platform device's platform_data field is only needed if the
  board implements extra power control or over-current monitoring.

  The OHCI driver does not ensure the state of the S3C2410's MISCCTRL
  register, so if both ports are to be used for the host, then it is
  the board support file's responsibility to ensure that the second
  port is configured to be connected to the OHCI core.


Platform Data
-------------

  See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
  descriptions of the platform device data. An implementation
  can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .

  The `struct s3c2410_hcd_info` contains a pair of functions
  that get called to enable over-current detection, and to
  control the port power status.

  The ports are numbered 0 and 1.

  power_control:

    Called to enable or disable the power on the port.

  enable_oc:

    Called to enable or disable the over-current monitoring.
    This should claim or release the resources being used to
    check the power condition on the port, such as an IRQ.

  report_oc:

    The OHCI driver fills this field in for the over-current code
    to call when there is a change to the over-current state on
    an port. The ports argument is a bitmask of 1 bit per port,
    with bit X being 1 for an over-current on port X.

    The function s3c2410_usb_report_oc() has been provided to
    ensure this is called correctly.

  port[x]:

    This is struct describes each port, 0 or 1. The platform driver
    should set the flags field of each port to S3C_HCDFLG_USED if
    the port is enabled.



Document Author
---------------

Ben Dooks, (c) 2005 Simtec Electronics
+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ running once the system is up.

	acpi_fake_ecdt	[HW,ACPI] Workaround failure due to BIOS lacking ECDT

	acpi_generic_hotkey [HW,ACPI]
			Allow consolidated generic hotkey driver to
			over-ride platform specific driver.
			See also Documentation/acpi-hotkey.txt.

	ad1816=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>
			See also Documentation/sound/oss/AD1816.
+0 −14
Original line number Diff line number Diff line
@@ -266,20 +266,6 @@ port an old driver to the new PCI interface. They are no longer present
in the kernel as they aren't compatible with hotplug or PCI domains or
having sane locking.

pcibios_present() and		Since ages, you don't need to test presence
pci_present()			of PCI subsystem when trying to talk to it.
				If it's not there, the list of PCI devices
				is empty and all functions for searching for
				devices just return NULL.
pcibios_(read|write)_*		Superseded by their pci_(read|write)_*
				counterparts.
pcibios_find_*			Superseded by their pci_get_* counterparts.
pci_for_each_dev()		Superseded by pci_get_device()
pci_for_each_dev_reverse()	Superseded by pci_find_device_reverse()
pci_for_each_bus()		Superseded by pci_find_next_bus()
pci_find_device()		Superseded by pci_get_device()
pci_find_subsys()		Superseded by pci_get_subsys()
pci_find_slot()			Superseded by pci_get_slot()
pcibios_find_class()		Superseded by pci_get_class()
pci_find_class()		Superseded by pci_get_class()
pci_(read|write)_*_nodev()	Superseded by pci_bus_(read|write)_*()
+13 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ DVB SUBSYSTEM AND DRIVERS
P:	LinuxTV.org Project
M: 	linux-dvb-maintainer@linuxtv.org
L: 	linux-dvb@linuxtv.org (subscription required)
W:	http://linuxtv.org/developer/dvb.xml
W:	http://linuxtv.org/
S:	Supported

EATA-DMA SCSI DRIVER
@@ -1828,6 +1828,12 @@ P: Greg Kroah-Hartman
M:	greg@kroah.com
S:	Maintained

PCIE HOTPLUG DRIVER
P:	Kristen Carlson Accardi
M:	kristen.c.accardi@intel.com
L:	pcihpd-discuss@lists.sourceforge.net
S:	Maintained

PCMCIA SUBSYSTEM
P:	Linux PCMCIA Team
L:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia
@@ -2204,6 +2210,12 @@ W: http://projects.buici.com/arm
L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
S:	Maintained

SHPC HOTPLUG DRIVER
P:	Kristen Carlson Accardi
M:	kristen.c.accardi@intel.com
L:	pcihpd-discuss@lists.sourceforge.net
S:	Maintained

SPARC (sparc32):
P:	William L. Irwin
M:	wli@holomorphy.com
Loading