diff options
114 files changed, 3128 insertions, 1299 deletions
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt new file mode 100644 index 000000000000..e164403f60e1 --- /dev/null +++ b/Documentation/block/queue-sysfs.txt | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | Queue sysfs files | ||
| 2 | ================= | ||
| 3 | |||
| 4 | This text file will detail the queue files that are located in the sysfs tree | ||
| 5 | for each block device. Note that stacked devices typically do not export | ||
| 6 | any settings, since their queue merely functions are a remapping target. | ||
| 7 | These files are the ones found in the /sys/block/xxx/queue/ directory. | ||
| 8 | |||
| 9 | Files denoted with a RO postfix are readonly and the RW postfix means | ||
| 10 | read-write. | ||
| 11 | |||
| 12 | hw_sector_size (RO) | ||
| 13 | ------------------- | ||
| 14 | This is the hardware sector size of the device, in bytes. | ||
| 15 | |||
| 16 | max_hw_sectors_kb (RO) | ||
| 17 | ---------------------- | ||
| 18 | This is the maximum number of kilobytes supported in a single data transfer. | ||
| 19 | |||
| 20 | max_sectors_kb (RW) | ||
| 21 | ------------------- | ||
| 22 | This is the maximum number of kilobytes that the block layer will allow | ||
| 23 | for a filesystem request. Must be smaller than or equal to the maximum | ||
| 24 | size allowed by the hardware. | ||
| 25 | |||
| 26 | nomerges (RW) | ||
| 27 | ------------- | ||
| 28 | This enables the user to disable the lookup logic involved with IO merging | ||
| 29 | requests in the block layer. Merging may still occur through a direct | ||
| 30 | 1-hit cache, since that comes for (almost) free. The IO scheduler will not | ||
| 31 | waste cycles doing tree/hash lookups for merges if nomerges is 1. Defaults | ||
| 32 | to 0, enabling all merges. | ||
| 33 | |||
| 34 | nr_requests (RW) | ||
| 35 | ---------------- | ||
| 36 | This controls how many requests may be allocated in the block layer for | ||
| 37 | read or write requests. Note that the total allocated number may be twice | ||
| 38 | this amount, since it applies only to reads or writes (not the accumulated | ||
| 39 | sum). | ||
| 40 | |||
| 41 | read_ahead_kb (RW) | ||
| 42 | ------------------ | ||
| 43 | Maximum number of kilobytes to read-ahead for filesystems on this block | ||
| 44 | device. | ||
| 45 | |||
| 46 | rq_affinity (RW) | ||
| 47 | ---------------- | ||
| 48 | If this option is enabled, the block layer will migrate request completions | ||
| 49 | to the CPU that originally submitted the request. For some workloads | ||
| 50 | this provides a significant reduction in CPU cycles due to caching effects. | ||
| 51 | |||
| 52 | scheduler (RW) | ||
| 53 | -------------- | ||
| 54 | When read, this file will display the current and available IO schedulers | ||
| 55 | for this block device. The currently active IO scheduler will be enclosed | ||
| 56 | in [] brackets. Writing an IO scheduler name to this file will switch | ||
| 57 | control of this block device to that new IO scheduler. Note that writing | ||
| 58 | an IO scheduler name to this file will attempt to load that IO scheduler | ||
| 59 | module, if it isn't already present in the system. | ||
| 60 | |||
| 61 | |||
| 62 | |||
| 63 | Jens Axboe <jens.axboe@oracle.com>, February 2009 | ||
diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt new file mode 100644 index 000000000000..8447fd7090d0 --- /dev/null +++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | |||
| @@ -0,0 +1,180 @@ | |||
| 1 | MPC5200 Device Tree Bindings | ||
| 2 | ---------------------------- | ||
| 3 | |||
| 4 | (c) 2006-2009 Secret Lab Technologies Ltd | ||
| 5 | Grant Likely <grant.likely@secretlab.ca> | ||
| 6 | |||
| 7 | Naming conventions | ||
| 8 | ------------------ | ||
| 9 | For mpc5200 on-chip devices, the format for each compatible value is | ||
| 10 | <chip>-<device>[-<mode>]. The OS should be able to match a device driver | ||
| 11 | to the device based solely on the compatible value. If two drivers | ||
| 12 | match on the compatible list; the 'most compatible' driver should be | ||
| 13 | selected. | ||
| 14 | |||
| 15 | The split between the MPC5200 and the MPC5200B leaves a bit of a | ||
| 16 | conundrum. How should the compatible property be set up to provide | ||
| 17 | maximum compatibility information; but still accurately describe the | ||
| 18 | chip? For the MPC5200; the answer is easy. Most of the SoC devices | ||
| 19 | originally appeared on the MPC5200. Since they didn't exist anywhere | ||
| 20 | else; the 5200 compatible properties will contain only one item; | ||
| 21 | "fsl,mpc5200-<device>". | ||
| 22 | |||
| 23 | The 5200B is almost the same as the 5200, but not quite. It fixes | ||
| 24 | silicon bugs and it adds a small number of enhancements. Most of the | ||
| 25 | devices either provide exactly the same interface as on the 5200. A few | ||
| 26 | devices have extra functions but still have a backwards compatible mode. | ||
| 27 | To express this information as completely as possible, 5200B device trees | ||
| 28 | should have two items in the compatible list: | ||
| 29 | compatible = "fsl,mpc5200b-<device>","fsl,mpc5200-<device>"; | ||
| 30 | |||
| 31 | It is *strongly* recommended that 5200B device trees follow this convention | ||
| 32 | (instead of only listing the base mpc5200 item). | ||
| 33 | |||
| 34 | ie. ethernet on mpc5200: compatible = "fsl,mpc5200-fec"; | ||
| 35 | ethernet on mpc5200b: compatible = "fsl,mpc5200b-fec", "fsl,mpc5200-fec"; | ||
| 36 | |||
| 37 | Modal devices, like PSCs, also append the configured function to the | ||
| 38 | end of the compatible field. ie. A PSC in i2s mode would specify | ||
| 39 | "fsl,mpc5200-psc-i2s", not "fsl,mpc5200-i2s". This convention is chosen to | ||
| 40 | avoid naming conflicts with non-psc devices providing the same | ||
| 41 | function. For example, "fsl,mpc5200-spi" and "fsl,mpc5200-psc-spi" describe | ||
| 42 | the mpc5200 simple spi device and a PSC spi mode respectively. | ||
| 43 | |||
| 44 | At the time of writing, exact chip may be either 'fsl,mpc5200' or | ||
| 45 | 'fsl,mpc5200b'. | ||
| 46 | |||
| 47 | The soc node | ||
| 48 | ------------ | ||
| 49 | This node describes the on chip SOC peripherals. Every mpc5200 based | ||
| 50 | board will have this node, and as such there is a common naming | ||
| 51 | convention for SOC devices. | ||
| 52 | |||
| 53 | Required properties: | ||
| 54 | name description | ||
| 55 | ---- ----------- | ||
| 56 | ranges Memory range of the internal memory mapped registers. | ||
| 57 | Should be <0 [baseaddr] 0xc000> | ||
| 58 | reg Should be <[baseaddr] 0x100> | ||
| 59 | compatible mpc5200: "fsl,mpc5200-immr" | ||
| 60 | mpc5200b: "fsl,mpc5200b-immr" | ||
| 61 | system-frequency 'fsystem' frequency in Hz; XLB, IPB, USB and PCI | ||
| 62 | clocks are derived from the fsystem clock. | ||
| 63 | bus-frequency IPB bus frequency in Hz. Clock rate | ||
| 64 | used by most of the soc devices. | ||
| 65 | |||
| 66 | soc child nodes | ||
| 67 | --------------- | ||
| 68 | Any on chip SOC devices available to Linux must appear as soc5200 child nodes. | ||
| 69 | |||
| 70 | Note: The tables below show the value for the mpc5200. A mpc5200b device | ||
| 71 | tree should use the "fsl,mpc5200b-<device>","fsl,mpc5200-<device>" form. | ||
| 72 | |||
| 73 | Required soc5200 child nodes: | ||
| 74 | name compatible Description | ||
| 75 | ---- ---------- ----------- | ||
| 76 | cdm@<addr> fsl,mpc5200-cdm Clock Distribution | ||
| 77 | interrupt-controller@<addr> fsl,mpc5200-pic need an interrupt | ||
| 78 | controller to boot | ||
| 79 | bestcomm@<addr> fsl,mpc5200-bestcomm Bestcomm DMA controller | ||
| 80 | |||
| 81 | Recommended soc5200 child nodes; populate as needed for your board | ||
| 82 | name compatible Description | ||
| 83 | ---- ---------- ----------- | ||
| 84 | timer@<addr> fsl,mpc5200-gpt General purpose timers | ||
| 85 | gpio@<addr> fsl,mpc5200-gpio MPC5200 simple gpio controller | ||
| 86 | gpio@<addr> fsl,mpc5200-gpio-wkup MPC5200 wakeup gpio controller | ||
| 87 | rtc@<addr> fsl,mpc5200-rtc Real time clock | ||
| 88 | mscan@<addr> fsl,mpc5200-mscan CAN bus controller | ||
| 89 | pci@<addr> fsl,mpc5200-pci PCI bridge | ||
| 90 | serial@<addr> fsl,mpc5200-psc-uart PSC in serial mode | ||
| 91 | i2s@<addr> fsl,mpc5200-psc-i2s PSC in i2s mode | ||
| 92 | ac97@<addr> fsl,mpc5200-psc-ac97 PSC in ac97 mode | ||
| 93 | spi@<addr> fsl,mpc5200-psc-spi PSC in spi mode | ||
| 94 | irda@<addr> fsl,mpc5200-psc-irda PSC in IrDA mode | ||
| 95 | spi@<addr> fsl,mpc5200-spi MPC5200 spi device | ||
| 96 | ethernet@<addr> fsl,mpc5200-fec MPC5200 ethernet device | ||
| 97 | ata@<addr> fsl,mpc5200-ata IDE ATA interface | ||
| 98 | i2c@<addr> fsl,mpc5200-i2c I2C controller | ||
| 99 | usb@<addr> fsl,mpc5200-ohci,ohci-be USB controller | ||
| 100 | xlb@<addr> fsl,mpc5200-xlb XLB arbitrator | ||
| 101 | |||
| 102 | fsl,mpc5200-gpt nodes | ||
| 103 | --------------------- | ||
| 104 | On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board | ||
| 105 | design supports the internal wdt, then the device node for GPT0 should | ||
| 106 | include the empty property 'fsl,has-wdt'. | ||
| 107 | |||
| 108 | An mpc5200-gpt can be used as a single line GPIO controller. To do so, | ||
| 109 | add the following properties to the gpt node: | ||
| 110 | gpio-controller; | ||
| 111 | #gpio-cells = <2>; | ||
| 112 | When referencing the GPIO line from another node, the first cell must always | ||
| 113 | be zero and the second cell represents the gpio flags and described in the | ||
| 114 | gpio device tree binding. | ||
| 115 | |||
| 116 | An mpc5200-gpt can be used as a single line edge sensitive interrupt | ||
| 117 | controller. To do so, add the following properties to the gpt node: | ||
| 118 | interrupt-controller; | ||
| 119 | #interrupt-cells = <1>; | ||
| 120 | When referencing the IRQ line from another node, the cell represents the | ||
| 121 | sense mode; 1 for edge rising, 2 for edge falling. | ||
| 122 | |||
| 123 | fsl,mpc5200-psc nodes | ||
| 124 | --------------------- | ||
| 125 | The PSCs should include a cell-index which is the index of the PSC in | ||
| 126 | hardware. cell-index is used to determine which shared SoC registers to | ||
| 127 | use when setting up PSC clocking. cell-index number starts at '0'. ie: | ||
| 128 | PSC1 has 'cell-index = <0>' | ||
| 129 | PSC4 has 'cell-index = <3>' | ||
| 130 | |||
| 131 | PSC in i2s mode: The mpc5200 and mpc5200b PSCs are not compatible when in | ||
| 132 | i2s mode. An 'mpc5200b-psc-i2s' node cannot include 'mpc5200-psc-i2s' in the | ||
| 133 | compatible field. | ||
| 134 | |||
| 135 | |||
| 136 | fsl,mpc5200-gpio and fsl,mpc5200-gpio-wkup nodes | ||
| 137 | ------------------------------------------------ | ||
| 138 | Each GPIO controller node should have the empty property gpio-controller and | ||
| 139 | #gpio-cells set to 2. First cell is the GPIO number which is interpreted | ||
| 140 | according to the bit numbers in the GPIO control registers. The second cell | ||
| 141 | is for flags which is currently unused. | ||
| 142 | |||
| 143 | fsl,mpc5200-fec nodes | ||
| 144 | --------------------- | ||
| 145 | The FEC node can specify one of the following properties to configure | ||
| 146 | the MII link: | ||
| 147 | - fsl,7-wire-mode - An empty property that specifies the link uses 7-wire | ||
| 148 | mode instead of MII | ||
| 149 | - current-speed - Specifies that the MII should be configured for a fixed | ||
| 150 | speed. This property should contain two cells. The | ||
| 151 | first cell specifies the speed in Mbps and the second | ||
| 152 | should be '0' for half duplex and '1' for full duplex | ||
| 153 | - phy-handle - Contains a phandle to an Ethernet PHY. | ||
| 154 | |||
| 155 | Interrupt controller (fsl,mpc5200-pic) node | ||
| 156 | ------------------------------------------- | ||
| 157 | The mpc5200 pic binding splits hardware IRQ numbers into two levels. The | ||
| 158 | split reflects the layout of the PIC hardware itself, which groups | ||
| 159 | interrupts into one of three groups; CRIT, MAIN or PERP. Also, the | ||
| 160 | Bestcomm dma engine has it's own set of interrupt sources which are | ||
| 161 | cascaded off of peripheral interrupt 0, which the driver interprets as a | ||
| 162 | fourth group, SDMA. | ||
| 163 | |||
| 164 | The interrupts property for device nodes using the mpc5200 pic consists | ||
| 165 | of three cells; <L1 L2 level> | ||
| 166 | |||
| 167 | L1 := [CRIT=0, MAIN=1, PERP=2, SDMA=3] | ||
| 168 | L2 := interrupt number; directly mapped from the value in the | ||
| 169 | "ICTL PerStat, MainStat, CritStat Encoded Register" | ||
| 170 | level := [LEVEL_HIGH=0, EDGE_RISING=1, EDGE_FALLING=2, LEVEL_LOW=3] | ||
| 171 | |||
| 172 | For external IRQs, use the following interrupt property values (how to | ||
| 173 | specify external interrupts is a frequently asked question): | ||
| 174 | External interrupts: | ||
| 175 | external irq0: interrupts = <0 0 n>; | ||
| 176 | external irq1: interrupts = <1 1 n>; | ||
| 177 | external irq2: interrupts = <1 2 n>; | ||
| 178 | external irq3: interrupts = <1 3 n>; | ||
| 179 | 'n' is sense (0: level high, 1: edge rising, 2: edge falling 3: level low) | ||
| 180 | |||
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt deleted file mode 100644 index 6f12f1c79c0c..000000000000 --- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt +++ /dev/null | |||
| @@ -1,277 +0,0 @@ | |||
| 1 | MPC5200 Device Tree Bindings | ||
| 2 | ---------------------------- | ||
| 3 | |||
| 4 | (c) 2006-2007 Secret Lab Technologies Ltd | ||
| 5 | Grant Likely <grant.likely at secretlab.ca> | ||
| 6 | |||
| 7 | ********** DRAFT *********** | ||
| 8 | * WARNING: Do not depend on the stability of these bindings just yet. | ||
| 9 | * The MPC5200 device tree conventions are still in flux | ||
| 10 | * Keep an eye on the linuxppc-dev mailing list for more details | ||
| 11 | ********** DRAFT *********** | ||
| 12 | |||
| 13 | I - Introduction | ||
| 14 | ================ | ||
| 15 | Boards supported by the arch/powerpc architecture require device tree be | ||
| 16 | passed by the boot loader to the kernel at boot time. The device tree | ||
| 17 | describes what devices are present on the board and how they are | ||
| 18 | connected. The device tree can either be passed as a binary blob (as | ||
| 19 | described in Documentation/powerpc/booting-without-of.txt), or passed | ||
| 20 | by Open Firmware (IEEE 1275) compatible firmware using an OF compatible | ||
| 21 | client interface API. | ||
| 22 | |||
| 23 | This document specifies the requirements on the device-tree for mpc5200 | ||
| 24 | based boards. These requirements are above and beyond the details | ||
| 25 | specified in either the Open Firmware spec or booting-without-of.txt | ||
| 26 | |||
| 27 | All new mpc5200-based boards are expected to match this document. In | ||
| 28 | cases where this document is not sufficient to support a new board port, | ||
| 29 | this document should be updated as part of adding the new board support. | ||
| 30 | |||
| 31 | II - Philosophy | ||
| 32 | =============== | ||
| 33 | The core of this document is naming convention. The whole point of | ||
| 34 | defining this convention is to reduce or eliminate the number of | ||
| 35 | special cases required to support a 5200 board. If all 5200 boards | ||
| 36 | follow the same convention, then generic 5200 support code will work | ||
| 37 | rather than coding special cases for each new board. | ||
| 38 | |||
| 39 | This section tries to capture the thought process behind why the naming | ||
| 40 | convention is what it is. | ||
| 41 | |||
| 42 | 1. names | ||
| 43 | --------- | ||
| 44 | There is strong convention/requirements already established for children | ||
| 45 | of the root node. 'cpus' describes the processor cores, 'memory' | ||
| 46 | describes memory, and 'chosen' provides boot configuration. Other nodes | ||
| 47 | are added to describe devices attached to the processor local bus. | ||
| 48 | |||
| 49 | Following convention already established with other system-on-chip | ||
| 50 | processors, 5200 device trees should use the name 'soc5200' for the | ||
| 51 | parent node of on chip devices, and the root node should be its parent. | ||
| 52 | |||
| 53 | Child nodes are typically named after the configured function. ie. | ||
| 54 | the FEC node is named 'ethernet', and a PSC in uart mode is named 'serial'. | ||
| 55 | |||
| 56 | 2. device_type property | ||
| 57 | ----------------------- | ||
| 58 | similar to the node name convention above; the device_type reflects the | ||
| 59 | configured function of a device. ie. 'serial' for a uart and 'spi' for | ||
| 60 | an spi controller. However, while node names *should* reflect the | ||
| 61 | configured function, device_type *must* match the configured function | ||
| 62 | exactly. | ||
| 63 | |||
| 64 | 3. compatible property | ||
| 65 | ---------------------- | ||
| 66 | Since device_type isn't enough to match devices to drivers, there also | ||
| 67 | needs to be a naming convention for the compatible property. Compatible | ||
| 68 | is an list of device descriptions sorted from specific to generic. For | ||
| 69 | the mpc5200, the required format for each compatible value is | ||
| 70 | <chip>-<device>[-<mode>]. The OS should be able to match a device driver | ||
| 71 | to the device based solely on the compatible value. If two drivers | ||
| 72 | match on the compatible list; the 'most compatible' driver should be | ||
| 73 | selected. | ||
| 74 | |||
| 75 | The split between the MPC5200 and the MPC5200B leaves a bit of a | ||
| 76 | conundrum. How should the compatible property be set up to provide | ||
| 77 | maximum compatibility information; but still accurately describe the | ||
| 78 | chip? For the MPC5200; the answer is easy. Most of the SoC devices | ||
| 79 | originally appeared on the MPC5200. Since they didn't exist anywhere | ||
| 80 | else; the 5200 compatible properties will contain only one item; | ||
| 81 | "mpc5200-<device>". | ||
| 82 | |||
| 83 | The 5200B is almost the same as the 5200, but not quite. It fixes | ||
| 84 | silicon bugs and it adds a small number of enhancements. Most of the | ||
| 85 | devices either provide exactly the same interface as on the 5200. A few | ||
| 86 | devices have extra functions but still have a backwards compatible mode. | ||
| 87 | To express this information as completely as possible, 5200B device trees | ||
| 88 | should have two items in the compatible list; | ||
| 89 | "mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended | ||
| 90 | that 5200B device trees follow this convention (instead of only listing | ||
| 91 | the base mpc5200 item). | ||
| 92 | |||
| 93 | If another chip appear on the market with one of the mpc5200 SoC | ||
| 94 | devices, then the compatible list should include mpc5200-<device>. | ||
| 95 | |||
| 96 | ie. ethernet on mpc5200: compatible = "mpc5200-ethernet" | ||
| 97 | ethernet on mpc5200b: compatible = "mpc5200b-ethernet\0mpc5200-ethernet" | ||
| 98 | |||
| 99 | Modal devices, like PSCs, also append the configured function to the | ||
| 100 | end of the compatible field. ie. A PSC in i2s mode would specify | ||
| 101 | "mpc5200-psc-i2s", not "mpc5200-i2s". This convention is chosen to | ||
| 102 | avoid naming conflicts with non-psc devices providing the same | ||
| 103 | function. For example, "mpc5200-spi" and "mpc5200-psc-spi" describe | ||
| 104 | the mpc5200 simple spi device and a PSC spi mode respectively. | ||
| 105 | |||
| 106 | If the soc device is more generic and present on other SOCs, the | ||
| 107 | compatible property can specify the more generic device type also. | ||
| 108 | |||
| 109 | ie. mscan: compatible = "mpc5200-mscan\0fsl,mscan"; | ||
| 110 | |||
| 111 | At the time of writing, exact chip may be either 'mpc5200' or | ||
| 112 | 'mpc5200b'. | ||
| 113 | |||
| 114 | Device drivers should always try to match as generically as possible. | ||
| 115 | |||
| 116 | III - Structure | ||
| 117 | =============== | ||
| 118 | The device tree for an mpc5200 board follows the structure defined in | ||
| 119 | booting-without-of.txt with the following additional notes: | ||
| 120 | |||
| 121 | 0) the root node | ||
| 122 | ---------------- | ||
| 123 | Typical root description node; see booting-without-of | ||
| 124 | |||
| 125 | 1) The cpus node | ||
| 126 | ---------------- | ||
| 127 | The cpus node follows the basic layout described in booting-without-of. | ||
| 128 | The bus-frequency property holds the XLB bus frequency | ||
| 129 | The clock-frequency property holds the core frequency | ||
| 130 | |||
| 131 | 2) The memory node | ||
| 132 | ------------------ | ||
| 133 | Typical memory description node; see booting-without-of. | ||
| 134 | |||
| 135 | 3) The soc5200 node | ||
| 136 | ------------------- | ||
| 137 | This node describes the on chip SOC peripherals. Every mpc5200 based | ||
| 138 | board will have this node, and as such there is a common naming | ||
| 139 | convention for SOC devices. | ||
| 140 | |||
| 141 | Required properties: | ||
| 142 | name type description | ||
| 143 | ---- ---- ----------- | ||
| 144 | device_type string must be "soc" | ||
| 145 | ranges int should be <0 baseaddr baseaddr+10000> | ||
| 146 | reg int must be <baseaddr 10000> | ||
| 147 | compatible string mpc5200: "mpc5200-soc" | ||
| 148 | mpc5200b: "mpc5200b-soc\0mpc5200-soc" | ||
| 149 | system-frequency int Fsystem frequency; source of all | ||
| 150 | other clocks. | ||
| 151 | bus-frequency int IPB bus frequency in HZ. Clock rate | ||
| 152 | used by most of the soc devices. | ||
| 153 | #interrupt-cells int must be <3>. | ||
| 154 | |||
| 155 | Recommended properties: | ||
| 156 | name type description | ||
| 157 | ---- ---- ----------- | ||
| 158 | model string Exact model of the chip; | ||
| 159 | ie: model="fsl,mpc5200" | ||
| 160 | revision string Silicon revision of chip | ||
| 161 | ie: revision="M08A" | ||
| 162 | |||
| 163 | The 'model' and 'revision' properties are *strongly* recommended. Having | ||
| 164 | them presence acts as a bit of a safety net for working around as yet | ||
| 165 | undiscovered bugs on one version of silicon. For example, device drivers | ||
| 166 | can use the model and revision properties to decide if a bug fix should | ||
| 167 | be turned on. | ||
| 168 | |||
| 169 | 4) soc5200 child nodes | ||
| 170 | ---------------------- | ||
| 171 | Any on chip SOC devices available to Linux must appear as soc5200 child nodes. | ||
| 172 | |||
| 173 | Note: The tables below show the value for the mpc5200. A mpc5200b device | ||
| 174 | tree should use the "mpc5200b-<device>\0mpc5200-<device> form. | ||
| 175 | |||
| 176 | Required soc5200 child nodes: | ||
| 177 | name device_type compatible Description | ||
| 178 | ---- ----------- ---------- ----------- | ||
| 179 | cdm@<addr> cdm mpc5200-cmd Clock Distribution | ||
| 180 | pic@<addr> interrupt-controller mpc5200-pic need an interrupt | ||
| 181 | controller to boot | ||
| 182 | bestcomm@<addr> dma-controller mpc5200-bestcomm 5200 pic also requires | ||
| 183 | the bestcomm device | ||
| 184 | |||
| 185 | Recommended soc5200 child nodes; populate as needed for your board | ||
| 186 | name device_type compatible Description | ||
| 187 | ---- ----------- ---------- ----------- | ||
| 188 | gpt@<addr> gpt fsl,mpc5200-gpt General purpose timers | ||
| 189 | gpt@<addr> gpt fsl,mpc5200-gpt-gpio General purpose | ||
| 190 | timers in GPIO mode | ||
| 191 | gpio@<addr> fsl,mpc5200-gpio MPC5200 simple gpio | ||
| 192 | controller | ||
| 193 | gpio@<addr> fsl,mpc5200-gpio-wkup MPC5200 wakeup gpio | ||
| 194 | controller | ||
| 195 | rtc@<addr> rtc mpc5200-rtc Real time clock | ||
| 196 | mscan@<addr> mscan mpc5200-mscan CAN bus controller | ||
| 197 | pci@<addr> pci mpc5200-pci PCI bridge | ||
| 198 | serial@<addr> serial mpc5200-psc-uart PSC in serial mode | ||
| 199 | i2s@<addr> sound mpc5200-psc-i2s PSC in i2s mode | ||
| 200 | ac97@<addr> sound mpc5200-psc-ac97 PSC in ac97 mode | ||
| 201 | spi@<addr> spi mpc5200-psc-spi PSC in spi mode | ||
| 202 | irda@<addr> irda mpc5200-psc-irda PSC in IrDA mode | ||
| 203 | spi@<addr> spi mpc5200-spi MPC5200 spi device | ||
| 204 | ethernet@<addr> network mpc5200-fec MPC5200 ethernet device | ||
| 205 | ata@<addr> ata mpc5200-ata IDE ATA interface | ||
| 206 | i2c@<addr> i2c mpc5200-i2c I2C controller | ||
| 207 | usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller | ||
| 208 | xlb@<addr> xlb mpc5200-xlb XLB arbitrator | ||
| 209 | |||
| 210 | Important child node properties | ||
| 211 | name type description | ||
| 212 | ---- ---- ----------- | ||
| 213 | cell-index int When multiple devices are present, is the | ||
| 214 | index of the device in the hardware (ie. There | ||
| 215 | are 6 PSC on the 5200 numbered PSC1 to PSC6) | ||
| 216 | PSC1 has 'cell-index = <0>' | ||
| 217 | PSC4 has 'cell-index = <3>' | ||
| 218 | |||
| 219 | 5) General Purpose Timer nodes (child of soc5200 node) | ||
| 220 | On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board | ||
| 221 | design supports the internal wdt, then the device node for GPT0 should | ||
| 222 | include the empty property 'fsl,has-wdt'. | ||
| 223 | |||
| 224 | 6) PSC nodes (child of soc5200 node) | ||
| 225 | PSC nodes can define the optional 'port-number' property to force assignment | ||
| 226 | order of serial ports. For example, PSC5 might be physically connected to | ||
| 227 | the port labeled 'COM1' and PSC1 wired to 'COM1'. In this case, PSC5 would | ||
| 228 | have a "port-number = <0>" property, and PSC1 would have "port-number = <1>". | ||
| 229 | |||
| 230 | PSC in i2s mode: The mpc5200 and mpc5200b PSCs are not compatible when in | ||
| 231 | i2s mode. An 'mpc5200b-psc-i2s' node cannot include 'mpc5200-psc-i2s' in the | ||
| 232 | compatible field. | ||
| 233 | |||
| 234 | 7) GPIO controller nodes | ||
| 235 | Each GPIO controller node should have the empty property gpio-controller and | ||
| 236 | #gpio-cells set to 2. First cell is the GPIO number which is interpreted | ||
| 237 | according to the bit numbers in the GPIO control registers. The second cell | ||
| 238 | is for flags which is currently unsused. | ||
| 239 | |||
| 240 | 8) FEC nodes | ||
| 241 | The FEC node can specify one of the following properties to configure | ||
| 242 | the MII link: | ||
| 243 | "fsl,7-wire-mode" - An empty property that specifies the link uses 7-wire | ||
| 244 | mode instead of MII | ||
| 245 | "current-speed" - Specifies that the MII should be configured for a fixed | ||
| 246 | speed. This property should contain two cells. The | ||
| 247 | first cell specifies the speed in Mbps and the second | ||
| 248 | should be '0' for half duplex and '1' for full duplex | ||
| 249 | "phy-handle" - Contains a phandle to an Ethernet PHY. | ||
| 250 | |||
| 251 | IV - Extra Notes | ||
| 252 | ================ | ||
| 253 | |||
| 254 | 1. Interrupt mapping | ||
| 255 | -------------------- | ||
| 256 | The mpc5200 pic driver splits hardware IRQ numbers into two levels. The | ||
| 257 | split reflects the layout of the PIC hardware itself, which groups | ||
| 258 | interrupts into one of three groups; CRIT, MAIN or PERP. Also, the | ||
| 259 | Bestcomm dma engine has it's own set of interrupt sources which are | ||
| 260 | cascaded off of peripheral interrupt 0, which the driver interprets as a | ||
| 261 | fourth group, SDMA. | ||
| 262 | |||
| 263 | The interrupts property for device nodes using the mpc5200 pic consists | ||
| 264 | of three cells; <L1 L2 level> | ||
| 265 | |||
| 266 | L1 := [CRIT=0, MAIN=1, PERP=2, SDMA=3] | ||
| 267 | L2 := interrupt number; directly mapped from the value in the | ||
| 268 | "ICTL PerStat, MainStat, CritStat Encoded Register" | ||
| 269 | level := [LEVEL_HIGH=0, EDGE_RISING=1, EDGE_FALLING=2, LEVEL_LOW=3] | ||
| 270 | |||
| 271 | 2. Shared registers | ||
| 272 | ------------------- | ||
| 273 | Some SoC devices share registers between them. ie. the i2c devices use | ||
| 274 | a single clock control register, and almost all device are affected by | ||
| 275 | the port_config register. Devices which need to manipulate shared regs | ||
| 276 | should look to the parent SoC node. The soc node is responsible | ||
| 277 | for arbitrating all shared register access. | ||
diff --git a/Documentation/video4linux/v4lgrab.c b/Documentation/video4linux/v4lgrab.c index 079b628481cf..d6e70bef8ad0 100644 --- a/Documentation/video4linux/v4lgrab.c +++ b/Documentation/video4linux/v4lgrab.c | |||
| @@ -4,12 +4,21 @@ | |||
| 4 | * | 4 | * |
| 5 | * Compile with: | 5 | * Compile with: |
| 6 | * gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab | 6 | * gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab |
| 7 | * Use as: | 7 | * Use as: |
| 8 | * v4lgrab >image.ppm | 8 | * v4lgrab >image.ppm |
| 9 | * | 9 | * |
| 10 | * Copyright (C) 1998-05-03, Phil Blundell <philb@gnu.org> | 10 | * Copyright (C) 1998-05-03, Phil Blundell <philb@gnu.org> |
| 11 | * Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c | 11 | * Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c |
| 12 | * with minor modifications (Dave Forrest, drf5n@virginia.edu). | 12 | * with minor modifications (Dave Forrest, drf5n@virginia.edu). |
| 13 | * | ||
| 14 | * | ||
| 15 | * For some cameras you may need to pre-load libv4l to perform | ||
| 16 | * the necessary decompression, e.g.: | ||
| 17 | * | ||
| 18 | * export LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so | ||
| 19 | * ./v4lgrab >image.ppm | ||
| 20 | * | ||
| 21 | * see http://hansdegoede.livejournal.com/3636.html for details. | ||
| 13 | * | 22 | * |
| 14 | */ | 23 | */ |
| 15 | 24 | ||
| @@ -24,7 +33,7 @@ | |||
| 24 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 25 | #include <linux/videodev.h> | 34 | #include <linux/videodev.h> |
| 26 | 35 | ||
| 27 | #define FILE "/dev/video0" | 36 | #define VIDEO_DEV "/dev/video0" |
| 28 | 37 | ||
| 29 | /* Stole this from tvset.c */ | 38 | /* Stole this from tvset.c */ |
| 30 | 39 | ||
| @@ -90,7 +99,7 @@ int get_brightness_adj(unsigned char *image, long size, int *brightness) { | |||
| 90 | 99 | ||
| 91 | int main(int argc, char ** argv) | 100 | int main(int argc, char ** argv) |
| 92 | { | 101 | { |
| 93 | int fd = open(FILE, O_RDONLY), f; | 102 | int fd = open(VIDEO_DEV, O_RDONLY), f; |
| 94 | struct video_capability cap; | 103 | struct video_capability cap; |
| 95 | struct video_window win; | 104 | struct video_window win; |
| 96 | struct video_picture vpic; | 105 | struct video_picture vpic; |
| @@ -100,13 +109,13 @@ int main(int argc, char ** argv) | |||
| 100 | unsigned int i, src_depth; | 109 | unsigned int i, src_depth; |
| 101 | 110 | ||
| 102 | if (fd < 0) { | 111 | if (fd < 0) { |
| 103 | perror(FILE); | 112 | perror(VIDEO_DEV); |
| 104 | exit(1); | 113 | exit(1); |
| 105 | } | 114 | } |
| 106 | 115 | ||
| 107 | if (ioctl(fd, VIDIOCGCAP, &cap) < 0) { | 116 | if (ioctl(fd, VIDIOCGCAP, &cap) < 0) { |
| 108 | perror("VIDIOGCAP"); | 117 | perror("VIDIOGCAP"); |
| 109 | fprintf(stderr, "(" FILE " not a video4linux device?)\n"); | 118 | fprintf(stderr, "(" VIDEO_DEV " not a video4linux device?)\n"); |
| 110 | close(fd); | 119 | close(fd); |
| 111 | exit(1); | 120 | exit(1); |
| 112 | } | 121 | } |
diff --git a/arch/arm/plat-mxc/include/mach/mmc.h b/arch/arm/plat-mxc/include/mach/mmc.h new file mode 100644 index 000000000000..de2128dada5c --- /dev/null +++ b/arch/arm/plat-mxc/include/mach/mmc.h | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | #ifndef ASMARM_ARCH_MMC_H | ||
| 2 | #define ASMARM_ARCH_MMC_H | ||
| 3 | |||
| 4 | #include <linux/mmc/host.h> | ||
| 5 | |||
| 6 | struct device; | ||
| 7 | |||
| 8 | /* board specific SDHC data, optional. | ||
| 9 | * If not present, a writable card with 3,3V is assumed. | ||
| 10 | */ | ||
| 11 | struct imxmmc_platform_data { | ||
| 12 | /* Return values for the get_ro callback should be: | ||
| 13 | * 0 for a read/write card | ||
| 14 | * 1 for a read-only card | ||
| 15 | * -ENOSYS when not supported (equal to NULL callback) | ||
| 16 | * or a negative errno value when something bad happened | ||
| 17 | */ | ||
| 18 | int (*get_ro)(struct device *); | ||
| 19 | |||
| 20 | /* board specific hook to (de)initialize the SD slot. | ||
| 21 | * The board code can call 'handler' on a card detection | ||
| 22 | * change giving data as argument. | ||
| 23 | */ | ||
| 24 | int (*init)(struct device *dev, irq_handler_t handler, void *data); | ||
| 25 | void (*exit)(struct device *dev, void *data); | ||
| 26 | |||
| 27 | /* available voltages. If not given, assume | ||
| 28 | * MMC_VDD_32_33 | MMC_VDD_33_34 | ||
| 29 | */ | ||
| 30 | unsigned int ocr_avail; | ||
| 31 | |||
| 32 | /* adjust slot voltage */ | ||
| 33 | void (*setpower)(struct device *, unsigned int vdd); | ||
| 34 | }; | ||
| 35 | |||
| 36 | #endif | ||
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index 99c495ad9c75..1239c6132b4a 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:12:40 2008 | 4 | # Mon Jan 26 21:41:58 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | |||
| 75 | # | ||
| 76 | # RCU Subsystem | ||
| 77 | # | ||
| 78 | CONFIG_CLASSIC_RCU=y | ||
| 79 | # CONFIG_TREE_RCU is not set | ||
| 80 | # CONFIG_PREEMPT_RCU is not set | ||
| 81 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | ||
| 77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
| 78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
| 79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
| 80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
| 81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
| 90 | # CONFIG_CGROUPS is not set | ||
| 82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
| 83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
| @@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
| 110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
| 111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
| 112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | ||
| 114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -121,13 +129,11 @@ CONFIG_HAVE_CLK=y | |||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | ||
| 125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
| 126 | # CONFIG_MODULES is not set | 133 | # CONFIG_MODULES is not set |
| 127 | CONFIG_BLOCK=y | 134 | CONFIG_BLOCK=y |
| 128 | # CONFIG_LBD is not set | 135 | # CONFIG_LBD is not set |
| 129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 130 | # CONFIG_LSF is not set | ||
| 131 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | 138 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 133 | 139 | ||
| @@ -143,7 +149,6 @@ CONFIG_DEFAULT_AS=y | |||
| 143 | # CONFIG_DEFAULT_CFQ is not set | 149 | # CONFIG_DEFAULT_CFQ is not set |
| 144 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
| 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 146 | CONFIG_CLASSIC_RCU=y | ||
| 147 | # CONFIG_FREEZER is not set | 152 | # CONFIG_FREEZER is not set |
| 148 | 153 | ||
| 149 | # | 154 | # |
| @@ -182,9 +187,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 182 | # CONFIG_TAU is not set | 187 | # CONFIG_TAU is not set |
| 183 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 184 | CONFIG_PPC_BESTCOMM=y | 189 | CONFIG_PPC_BESTCOMM=y |
| 185 | # CONFIG_PPC_BESTCOMM_ATA is not set | ||
| 186 | CONFIG_PPC_BESTCOMM_FEC=y | 190 | CONFIG_PPC_BESTCOMM_FEC=y |
| 187 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 191 | # CONFIG_SIMPLE_GPIO is not set |
| 188 | 192 | ||
| 189 | # | 193 | # |
| 190 | # Kernel options | 194 | # Kernel options |
| @@ -211,6 +215,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 211 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 215 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 212 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 216 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 213 | # CONFIG_KEXEC is not set | 217 | # CONFIG_KEXEC is not set |
| 218 | # CONFIG_CRASH_DUMP is not set | ||
| 214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 219 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 220 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 216 | CONFIG_SELECT_MEMORY_MODEL=y | 221 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -222,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 227 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 228 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | 229 | CONFIG_MIGRATION=y |
| 225 | # CONFIG_RESOURCES_64BIT is not set | ||
| 226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 230 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 227 | CONFIG_ZONE_DMA_FLAG=1 | 231 | CONFIG_ZONE_DMA_FLAG=1 |
| 228 | CONFIG_BOUNCE=y | 232 | CONFIG_BOUNCE=y |
| 229 | CONFIG_VIRT_TO_BUS=y | 233 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_UNEVICTABLE_LRU=y | 234 | CONFIG_UNEVICTABLE_LRU=y |
| 235 | CONFIG_PPC_4K_PAGES=y | ||
| 236 | # CONFIG_PPC_16K_PAGES is not set | ||
| 237 | # CONFIG_PPC_64K_PAGES is not set | ||
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 232 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_PROC_DEVICETREE=y |
| 233 | # CONFIG_CMDLINE_BOOL is not set | 240 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -268,6 +275,7 @@ CONFIG_NET=y | |||
| 268 | # | 275 | # |
| 269 | # Networking options | 276 | # Networking options |
| 270 | # | 277 | # |
| 278 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 271 | CONFIG_PACKET=y | 279 | CONFIG_PACKET=y |
| 272 | # CONFIG_PACKET_MMAP is not set | 280 | # CONFIG_PACKET_MMAP is not set |
| 273 | CONFIG_UNIX=y | 281 | CONFIG_UNIX=y |
| @@ -324,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 324 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
| 325 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
| 326 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
| 335 | # CONFIG_DCB is not set | ||
| 327 | 336 | ||
| 328 | # | 337 | # |
| 329 | # Network testing | 338 | # Network testing |
| @@ -336,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 336 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
| 337 | # CONFIG_PHONET is not set | 346 | # CONFIG_PHONET is not set |
| 338 | # CONFIG_WIRELESS is not set | 347 | # CONFIG_WIRELESS is not set |
| 348 | # CONFIG_WIMAX is not set | ||
| 339 | # CONFIG_RFKILL is not set | 349 | # CONFIG_RFKILL is not set |
| 340 | # CONFIG_NET_9P is not set | 350 | # CONFIG_NET_9P is not set |
| 341 | 351 | ||
| @@ -427,6 +437,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 427 | # CONFIG_MTD_ONENAND is not set | 437 | # CONFIG_MTD_ONENAND is not set |
| 428 | 438 | ||
| 429 | # | 439 | # |
| 440 | # LPDDR flash memory drivers | ||
| 441 | # | ||
| 442 | # CONFIG_MTD_LPDDR is not set | ||
| 443 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 444 | |||
| 445 | # | ||
| 430 | # UBI - Unsorted block images | 446 | # UBI - Unsorted block images |
| 431 | # | 447 | # |
| 432 | # CONFIG_MTD_UBI is not set | 448 | # CONFIG_MTD_UBI is not set |
| @@ -514,6 +530,9 @@ CONFIG_LXT_PHY=y | |||
| 514 | # CONFIG_BROADCOM_PHY is not set | 530 | # CONFIG_BROADCOM_PHY is not set |
| 515 | # CONFIG_ICPLUS_PHY is not set | 531 | # CONFIG_ICPLUS_PHY is not set |
| 516 | # CONFIG_REALTEK_PHY is not set | 532 | # CONFIG_REALTEK_PHY is not set |
| 533 | # CONFIG_NATIONAL_PHY is not set | ||
| 534 | # CONFIG_STE10XP is not set | ||
| 535 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 517 | # CONFIG_FIXED_PHY is not set | 536 | # CONFIG_FIXED_PHY is not set |
| 518 | # CONFIG_MDIO_BITBANG is not set | 537 | # CONFIG_MDIO_BITBANG is not set |
| 519 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
| @@ -539,6 +558,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 539 | # CONFIG_IWLWIFI_LEDS is not set | 558 | # CONFIG_IWLWIFI_LEDS is not set |
| 540 | 559 | ||
| 541 | # | 560 | # |
| 561 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 562 | # | ||
| 563 | |||
| 564 | # | ||
| 542 | # USB Network Adapters | 565 | # USB Network Adapters |
| 543 | # | 566 | # |
| 544 | # CONFIG_USB_CATC is not set | 567 | # CONFIG_USB_CATC is not set |
| @@ -588,8 +611,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
| 588 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 611 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
| 589 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 | 612 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 |
| 590 | CONFIG_UNIX98_PTYS=y | 613 | CONFIG_UNIX98_PTYS=y |
| 614 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 591 | CONFIG_LEGACY_PTYS=y | 615 | CONFIG_LEGACY_PTYS=y |
| 592 | CONFIG_LEGACY_PTY_COUNT=256 | 616 | CONFIG_LEGACY_PTY_COUNT=256 |
| 617 | # CONFIG_HVC_UDBG is not set | ||
| 593 | # CONFIG_IPMI_HANDLER is not set | 618 | # CONFIG_IPMI_HANDLER is not set |
| 594 | # CONFIG_HW_RANDOM is not set | 619 | # CONFIG_HW_RANDOM is not set |
| 595 | # CONFIG_NVRAM is not set | 620 | # CONFIG_NVRAM is not set |
| @@ -629,8 +654,6 @@ CONFIG_I2C_MPC=y | |||
| 629 | # Miscellaneous I2C Chip support | 654 | # Miscellaneous I2C Chip support |
| 630 | # | 655 | # |
| 631 | # CONFIG_DS1682 is not set | 656 | # CONFIG_DS1682 is not set |
| 632 | # CONFIG_EEPROM_AT24 is not set | ||
| 633 | # CONFIG_EEPROM_LEGACY is not set | ||
| 634 | # CONFIG_SENSORS_PCF8574 is not set | 657 | # CONFIG_SENSORS_PCF8574 is not set |
| 635 | # CONFIG_PCF8575 is not set | 658 | # CONFIG_PCF8575 is not set |
| 636 | # CONFIG_SENSORS_PCA9539 is not set | 659 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -675,10 +698,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 675 | # CONFIG_MFD_CORE is not set | 698 | # CONFIG_MFD_CORE is not set |
| 676 | # CONFIG_MFD_SM501 is not set | 699 | # CONFIG_MFD_SM501 is not set |
| 677 | # CONFIG_HTC_PASIC3 is not set | 700 | # CONFIG_HTC_PASIC3 is not set |
| 701 | # CONFIG_TWL4030_CORE is not set | ||
| 678 | # CONFIG_MFD_TMIO is not set | 702 | # CONFIG_MFD_TMIO is not set |
| 679 | # CONFIG_PMIC_DA903X is not set | 703 | # CONFIG_PMIC_DA903X is not set |
| 680 | # CONFIG_MFD_WM8400 is not set | 704 | # CONFIG_MFD_WM8400 is not set |
| 681 | # CONFIG_MFD_WM8350_I2C is not set | 705 | # CONFIG_MFD_WM8350_I2C is not set |
| 706 | # CONFIG_MFD_PCF50633 is not set | ||
| 682 | # CONFIG_REGULATOR is not set | 707 | # CONFIG_REGULATOR is not set |
| 683 | 708 | ||
| 684 | # | 709 | # |
| @@ -736,6 +761,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 736 | # USB Host Controller Drivers | 761 | # USB Host Controller Drivers |
| 737 | # | 762 | # |
| 738 | # CONFIG_USB_C67X00_HCD is not set | 763 | # CONFIG_USB_C67X00_HCD is not set |
| 764 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 739 | # CONFIG_USB_ISP116X_HCD is not set | 765 | # CONFIG_USB_ISP116X_HCD is not set |
| 740 | # CONFIG_USB_ISP1760_HCD is not set | 766 | # CONFIG_USB_ISP1760_HCD is not set |
| 741 | CONFIG_USB_OHCI_HCD=y | 767 | CONFIG_USB_OHCI_HCD=y |
| @@ -760,18 +786,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 760 | # CONFIG_USB_TMC is not set | 786 | # CONFIG_USB_TMC is not set |
| 761 | 787 | ||
| 762 | # | 788 | # |
| 763 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 789 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 764 | # | 790 | # |
| 765 | 791 | ||
| 766 | # | 792 | # |
| 767 | # may also be needed; see USB_STORAGE Help for more information | 793 | # see USB_STORAGE Help for more information |
| 768 | # | 794 | # |
| 769 | CONFIG_USB_STORAGE=y | 795 | CONFIG_USB_STORAGE=y |
| 770 | # CONFIG_USB_STORAGE_DEBUG is not set | 796 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 771 | # CONFIG_USB_STORAGE_DATAFAB is not set | 797 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 772 | # CONFIG_USB_STORAGE_FREECOM is not set | 798 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 773 | # CONFIG_USB_STORAGE_ISD200 is not set | 799 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 774 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 775 | # CONFIG_USB_STORAGE_USBAT is not set | 800 | # CONFIG_USB_STORAGE_USBAT is not set |
| 776 | # CONFIG_USB_STORAGE_SDDR09 is not set | 801 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 777 | # CONFIG_USB_STORAGE_SDDR55 is not set | 802 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| @@ -817,6 +842,10 @@ CONFIG_USB_STORAGE=y | |||
| 817 | # CONFIG_USB_ISIGHTFW is not set | 842 | # CONFIG_USB_ISIGHTFW is not set |
| 818 | # CONFIG_USB_VST is not set | 843 | # CONFIG_USB_VST is not set |
| 819 | # CONFIG_USB_GADGET is not set | 844 | # CONFIG_USB_GADGET is not set |
| 845 | |||
| 846 | # | ||
| 847 | # OTG and related infrastructure | ||
| 848 | # | ||
| 820 | # CONFIG_MMC is not set | 849 | # CONFIG_MMC is not set |
| 821 | # CONFIG_MEMSTICK is not set | 850 | # CONFIG_MEMSTICK is not set |
| 822 | # CONFIG_NEW_LEDS is not set | 851 | # CONFIG_NEW_LEDS is not set |
| @@ -826,7 +855,6 @@ CONFIG_USB_STORAGE=y | |||
| 826 | # CONFIG_DMADEVICES is not set | 855 | # CONFIG_DMADEVICES is not set |
| 827 | # CONFIG_UIO is not set | 856 | # CONFIG_UIO is not set |
| 828 | # CONFIG_STAGING is not set | 857 | # CONFIG_STAGING is not set |
| 829 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 830 | 858 | ||
| 831 | # | 859 | # |
| 832 | # File systems | 860 | # File systems |
| @@ -847,6 +875,7 @@ CONFIG_FS_MBCACHE=y | |||
| 847 | CONFIG_FILE_LOCKING=y | 875 | CONFIG_FILE_LOCKING=y |
| 848 | # CONFIG_XFS_FS is not set | 876 | # CONFIG_XFS_FS is not set |
| 849 | # CONFIG_OCFS2_FS is not set | 877 | # CONFIG_OCFS2_FS is not set |
| 878 | # CONFIG_BTRFS_FS is not set | ||
| 850 | CONFIG_DNOTIFY=y | 879 | CONFIG_DNOTIFY=y |
| 851 | CONFIG_INOTIFY=y | 880 | CONFIG_INOTIFY=y |
| 852 | CONFIG_INOTIFY_USER=y | 881 | CONFIG_INOTIFY_USER=y |
| @@ -883,10 +912,7 @@ CONFIG_TMPFS=y | |||
| 883 | # CONFIG_TMPFS_POSIX_ACL is not set | 912 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 884 | # CONFIG_HUGETLB_PAGE is not set | 913 | # CONFIG_HUGETLB_PAGE is not set |
| 885 | # CONFIG_CONFIGFS_FS is not set | 914 | # CONFIG_CONFIGFS_FS is not set |
| 886 | 915 | CONFIG_MISC_FILESYSTEMS=y | |
| 887 | # | ||
| 888 | # Miscellaneous filesystems | ||
| 889 | # | ||
| 890 | # CONFIG_ADFS_FS is not set | 916 | # CONFIG_ADFS_FS is not set |
| 891 | # CONFIG_AFFS_FS is not set | 917 | # CONFIG_AFFS_FS is not set |
| 892 | # CONFIG_HFS_FS is not set | 918 | # CONFIG_HFS_FS is not set |
| @@ -906,6 +932,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 906 | CONFIG_JFFS2_RTIME=y | 932 | CONFIG_JFFS2_RTIME=y |
| 907 | # CONFIG_JFFS2_RUBIN is not set | 933 | # CONFIG_JFFS2_RUBIN is not set |
| 908 | CONFIG_CRAMFS=y | 934 | CONFIG_CRAMFS=y |
| 935 | # CONFIG_SQUASHFS is not set | ||
| 909 | # CONFIG_VXFS_FS is not set | 936 | # CONFIG_VXFS_FS is not set |
| 910 | # CONFIG_MINIX_FS is not set | 937 | # CONFIG_MINIX_FS is not set |
| 911 | # CONFIG_OMFS_FS is not set | 938 | # CONFIG_OMFS_FS is not set |
| @@ -1002,6 +1029,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1002 | # Library routines | 1029 | # Library routines |
| 1003 | # | 1030 | # |
| 1004 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1005 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1006 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1007 | # CONFIG_CRC_T10DIF is not set | 1035 | # CONFIG_CRC_T10DIF is not set |
| @@ -1053,6 +1081,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1053 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1081 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1054 | # CONFIG_DEBUG_LIST is not set | 1082 | # CONFIG_DEBUG_LIST is not set |
| 1055 | # CONFIG_DEBUG_SG is not set | 1083 | # CONFIG_DEBUG_SG is not set |
| 1084 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1056 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1085 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1057 | # CONFIG_RCU_TORTURE_TEST is not set | 1086 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1058 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1087 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -1061,6 +1090,8 @@ CONFIG_SCHED_DEBUG=y | |||
| 1061 | # CONFIG_FAULT_INJECTION is not set | 1090 | # CONFIG_FAULT_INJECTION is not set |
| 1062 | # CONFIG_LATENCYTOP is not set | 1091 | # CONFIG_LATENCYTOP is not set |
| 1063 | CONFIG_HAVE_FUNCTION_TRACER=y | 1092 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1093 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1094 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1064 | 1095 | ||
| 1065 | # | 1096 | # |
| 1066 | # Tracers | 1097 | # Tracers |
| @@ -1069,11 +1100,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1069 | # CONFIG_SCHED_TRACER is not set | 1100 | # CONFIG_SCHED_TRACER is not set |
| 1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1101 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1071 | # CONFIG_BOOT_TRACER is not set | 1102 | # CONFIG_BOOT_TRACER is not set |
| 1103 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1072 | # CONFIG_STACK_TRACER is not set | 1104 | # CONFIG_STACK_TRACER is not set |
| 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1105 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1074 | # CONFIG_SAMPLES is not set | 1106 | # CONFIG_SAMPLES is not set |
| 1075 | CONFIG_HAVE_ARCH_KGDB=y | 1107 | CONFIG_HAVE_ARCH_KGDB=y |
| 1076 | # CONFIG_KGDB is not set | 1108 | # CONFIG_KGDB is not set |
| 1109 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1110 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1078 | # CONFIG_DEBUG_STACK_USAGE is not set | 1111 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1079 | # CONFIG_DEBUG_PAGEALLOC is not set | 1112 | # CONFIG_DEBUG_PAGEALLOC is not set |
| @@ -1100,11 +1133,15 @@ CONFIG_CRYPTO=y | |||
| 1100 | # | 1133 | # |
| 1101 | # CONFIG_CRYPTO_FIPS is not set | 1134 | # CONFIG_CRYPTO_FIPS is not set |
| 1102 | CONFIG_CRYPTO_ALGAPI=y | 1135 | CONFIG_CRYPTO_ALGAPI=y |
| 1103 | CONFIG_CRYPTO_AEAD=y | 1136 | CONFIG_CRYPTO_ALGAPI2=y |
| 1137 | CONFIG_CRYPTO_AEAD2=y | ||
| 1104 | CONFIG_CRYPTO_BLKCIPHER=y | 1138 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1139 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1105 | CONFIG_CRYPTO_HASH=y | 1140 | CONFIG_CRYPTO_HASH=y |
| 1106 | CONFIG_CRYPTO_RNG=y | 1141 | CONFIG_CRYPTO_HASH2=y |
| 1142 | CONFIG_CRYPTO_RNG2=y | ||
| 1107 | CONFIG_CRYPTO_MANAGER=y | 1143 | CONFIG_CRYPTO_MANAGER=y |
| 1144 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1108 | # CONFIG_CRYPTO_GF128MUL is not set | 1145 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1109 | # CONFIG_CRYPTO_NULL is not set | 1146 | # CONFIG_CRYPTO_NULL is not set |
| 1110 | # CONFIG_CRYPTO_CRYPTD is not set | 1147 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index 9796220032fd..b7b880562906 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:10:16 2008 | 4 | # Mon Jan 26 21:41:14 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -72,14 +72,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
| 74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
| 75 | |||
| 76 | # | ||
| 77 | # RCU Subsystem | ||
| 78 | # | ||
| 79 | CONFIG_CLASSIC_RCU=y | ||
| 80 | # CONFIG_TREE_RCU is not set | ||
| 81 | # CONFIG_PREEMPT_RCU is not set | ||
| 82 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 75 | # CONFIG_IKCONFIG is not set | 84 | # CONFIG_IKCONFIG is not set |
| 76 | CONFIG_LOG_BUF_SHIFT=14 | 85 | CONFIG_LOG_BUF_SHIFT=14 |
| 77 | # CONFIG_CGROUPS is not set | ||
| 78 | CONFIG_GROUP_SCHED=y | 86 | CONFIG_GROUP_SCHED=y |
| 79 | # CONFIG_FAIR_GROUP_SCHED is not set | 87 | # CONFIG_FAIR_GROUP_SCHED is not set |
| 80 | # CONFIG_RT_GROUP_SCHED is not set | 88 | # CONFIG_RT_GROUP_SCHED is not set |
| 81 | CONFIG_USER_SCHED=y | 89 | CONFIG_USER_SCHED=y |
| 82 | # CONFIG_CGROUP_SCHED is not set | 90 | # CONFIG_CGROUP_SCHED is not set |
| 91 | # CONFIG_CGROUPS is not set | ||
| 83 | CONFIG_SYSFS_DEPRECATED=y | 92 | CONFIG_SYSFS_DEPRECATED=y |
| 84 | CONFIG_SYSFS_DEPRECATED_V2=y | 93 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 85 | # CONFIG_RELAY is not set | 94 | # CONFIG_RELAY is not set |
| @@ -112,7 +121,6 @@ CONFIG_SLUB_DEBUG=y | |||
| 112 | CONFIG_SLUB=y | 121 | CONFIG_SLUB=y |
| 113 | # CONFIG_SLOB is not set | 122 | # CONFIG_SLOB is not set |
| 114 | # CONFIG_PROFILING is not set | 123 | # CONFIG_PROFILING is not set |
| 115 | # CONFIG_MARKERS is not set | ||
| 116 | CONFIG_HAVE_OPROFILE=y | 124 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 125 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | 126 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -123,7 +131,6 @@ CONFIG_HAVE_CLK=y | |||
| 123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 124 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 125 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 126 | # CONFIG_TINY_SHMEM is not set | ||
| 127 | CONFIG_BASE_SMALL=0 | 134 | CONFIG_BASE_SMALL=0 |
| 128 | CONFIG_MODULES=y | 135 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | 136 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -131,11 +138,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 138 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 132 | # CONFIG_MODVERSIONS is not set | 139 | # CONFIG_MODVERSIONS is not set |
| 133 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 140 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 134 | CONFIG_KMOD=y | ||
| 135 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
| 136 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
| 137 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 138 | # CONFIG_LSF is not set | ||
| 139 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 145 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 141 | 146 | ||
| @@ -151,7 +156,6 @@ CONFIG_DEFAULT_AS=y | |||
| 151 | # CONFIG_DEFAULT_CFQ is not set | 156 | # CONFIG_DEFAULT_CFQ is not set |
| 152 | # CONFIG_DEFAULT_NOOP is not set | 157 | # CONFIG_DEFAULT_NOOP is not set |
| 153 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 158 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 154 | CONFIG_CLASSIC_RCU=y | ||
| 155 | CONFIG_FREEZER=y | 159 | CONFIG_FREEZER=y |
| 156 | 160 | ||
| 157 | # | 161 | # |
| @@ -192,7 +196,7 @@ CONFIG_PPC_LITE5200=y | |||
| 192 | CONFIG_PPC_BESTCOMM=y | 196 | CONFIG_PPC_BESTCOMM=y |
| 193 | CONFIG_PPC_BESTCOMM_ATA=y | 197 | CONFIG_PPC_BESTCOMM_ATA=y |
| 194 | CONFIG_PPC_BESTCOMM_FEC=y | 198 | CONFIG_PPC_BESTCOMM_FEC=y |
| 195 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 199 | # CONFIG_SIMPLE_GPIO is not set |
| 196 | 200 | ||
| 197 | # | 201 | # |
| 198 | # Kernel options | 202 | # Kernel options |
| @@ -220,6 +224,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 224 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 222 | # CONFIG_KEXEC is not set | 226 | # CONFIG_KEXEC is not set |
| 227 | # CONFIG_CRASH_DUMP is not set | ||
| 223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 228 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 229 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 225 | CONFIG_SELECT_MEMORY_MODEL=y | 230 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -231,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | 236 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 237 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 233 | CONFIG_MIGRATION=y | 238 | CONFIG_MIGRATION=y |
| 234 | # CONFIG_RESOURCES_64BIT is not set | ||
| 235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 239 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 236 | CONFIG_ZONE_DMA_FLAG=1 | 240 | CONFIG_ZONE_DMA_FLAG=1 |
| 237 | CONFIG_BOUNCE=y | 241 | CONFIG_BOUNCE=y |
| 238 | CONFIG_VIRT_TO_BUS=y | 242 | CONFIG_VIRT_TO_BUS=y |
| 239 | CONFIG_UNEVICTABLE_LRU=y | 243 | CONFIG_UNEVICTABLE_LRU=y |
| 244 | CONFIG_PPC_4K_PAGES=y | ||
| 245 | # CONFIG_PPC_16K_PAGES is not set | ||
| 246 | # CONFIG_PPC_64K_PAGES is not set | ||
| 240 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 241 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
| 242 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -264,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 264 | # CONFIG_PCI_MSI is not set | 271 | # CONFIG_PCI_MSI is not set |
| 265 | CONFIG_PCI_LEGACY=y | 272 | CONFIG_PCI_LEGACY=y |
| 266 | # CONFIG_PCI_DEBUG is not set | 273 | # CONFIG_PCI_DEBUG is not set |
| 274 | # CONFIG_PCI_STUB is not set | ||
| 267 | # CONFIG_PCCARD is not set | 275 | # CONFIG_PCCARD is not set |
| 268 | # CONFIG_HOTPLUG_PCI is not set | 276 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | # CONFIG_HAS_RAPIDIO is not set | 277 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -286,6 +294,7 @@ CONFIG_NET=y | |||
| 286 | # | 294 | # |
| 287 | # Networking options | 295 | # Networking options |
| 288 | # | 296 | # |
| 297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 289 | CONFIG_PACKET=y | 298 | CONFIG_PACKET=y |
| 290 | # CONFIG_PACKET_MMAP is not set | 299 | # CONFIG_PACKET_MMAP is not set |
| 291 | CONFIG_UNIX=y | 300 | CONFIG_UNIX=y |
| @@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 342 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
| 343 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
| 344 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
| 354 | # CONFIG_DCB is not set | ||
| 345 | 355 | ||
| 346 | # | 356 | # |
| 347 | # Network testing | 357 | # Network testing |
| @@ -354,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 354 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
| 355 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
| 356 | # CONFIG_WIRELESS is not set | 366 | # CONFIG_WIRELESS is not set |
| 367 | # CONFIG_WIMAX is not set | ||
| 357 | # CONFIG_RFKILL is not set | 368 | # CONFIG_RFKILL is not set |
| 358 | # CONFIG_NET_9P is not set | 369 | # CONFIG_NET_9P is not set |
| 359 | 370 | ||
| @@ -396,13 +407,19 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 396 | # CONFIG_BLK_DEV_HD is not set | 407 | # CONFIG_BLK_DEV_HD is not set |
| 397 | CONFIG_MISC_DEVICES=y | 408 | CONFIG_MISC_DEVICES=y |
| 398 | # CONFIG_PHANTOM is not set | 409 | # CONFIG_PHANTOM is not set |
| 399 | # CONFIG_EEPROM_93CX6 is not set | ||
| 400 | # CONFIG_SGI_IOC4 is not set | 410 | # CONFIG_SGI_IOC4 is not set |
| 401 | # CONFIG_TIFM_CORE is not set | 411 | # CONFIG_TIFM_CORE is not set |
| 402 | # CONFIG_ICS932S401 is not set | 412 | # CONFIG_ICS932S401 is not set |
| 403 | # CONFIG_ENCLOSURE_SERVICES is not set | 413 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 404 | # CONFIG_HP_ILO is not set | 414 | # CONFIG_HP_ILO is not set |
| 405 | # CONFIG_C2PORT is not set | 415 | # CONFIG_C2PORT is not set |
| 416 | |||
| 417 | # | ||
| 418 | # EEPROM support | ||
| 419 | # | ||
| 420 | # CONFIG_EEPROM_AT24 is not set | ||
| 421 | # CONFIG_EEPROM_LEGACY is not set | ||
| 422 | # CONFIG_EEPROM_93CX6 is not set | ||
| 406 | CONFIG_HAVE_IDE=y | 423 | CONFIG_HAVE_IDE=y |
| 407 | # CONFIG_IDE is not set | 424 | # CONFIG_IDE is not set |
| 408 | 425 | ||
| @@ -445,6 +462,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 445 | # CONFIG_SCSI_SRP_ATTRS is not set | 462 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 446 | CONFIG_SCSI_LOWLEVEL=y | 463 | CONFIG_SCSI_LOWLEVEL=y |
| 447 | # CONFIG_ISCSI_TCP is not set | 464 | # CONFIG_ISCSI_TCP is not set |
| 465 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
| 448 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 466 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 449 | # CONFIG_SCSI_3W_9XXX is not set | 467 | # CONFIG_SCSI_3W_9XXX is not set |
| 450 | # CONFIG_SCSI_ACARD is not set | 468 | # CONFIG_SCSI_ACARD is not set |
| @@ -461,6 +479,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 461 | # CONFIG_MEGARAID_SAS is not set | 479 | # CONFIG_MEGARAID_SAS is not set |
| 462 | # CONFIG_SCSI_HPTIOP is not set | 480 | # CONFIG_SCSI_HPTIOP is not set |
| 463 | # CONFIG_SCSI_BUSLOGIC is not set | 481 | # CONFIG_SCSI_BUSLOGIC is not set |
| 482 | # CONFIG_LIBFC is not set | ||
| 483 | # CONFIG_FCOE is not set | ||
| 464 | # CONFIG_SCSI_DMX3191D is not set | 484 | # CONFIG_SCSI_DMX3191D is not set |
| 465 | # CONFIG_SCSI_EATA is not set | 485 | # CONFIG_SCSI_EATA is not set |
| 466 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 486 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -580,6 +600,9 @@ CONFIG_LXT_PHY=y | |||
| 580 | # CONFIG_BROADCOM_PHY is not set | 600 | # CONFIG_BROADCOM_PHY is not set |
| 581 | # CONFIG_ICPLUS_PHY is not set | 601 | # CONFIG_ICPLUS_PHY is not set |
| 582 | # CONFIG_REALTEK_PHY is not set | 602 | # CONFIG_REALTEK_PHY is not set |
| 603 | # CONFIG_NATIONAL_PHY is not set | ||
| 604 | # CONFIG_STE10XP is not set | ||
| 605 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 583 | # CONFIG_FIXED_PHY is not set | 606 | # CONFIG_FIXED_PHY is not set |
| 584 | # CONFIG_MDIO_BITBANG is not set | 607 | # CONFIG_MDIO_BITBANG is not set |
| 585 | CONFIG_NET_ETHERNET=y | 608 | CONFIG_NET_ETHERNET=y |
| @@ -626,6 +649,7 @@ CONFIG_NETDEV_1000=y | |||
| 626 | # CONFIG_JME is not set | 649 | # CONFIG_JME is not set |
| 627 | CONFIG_NETDEV_10000=y | 650 | CONFIG_NETDEV_10000=y |
| 628 | # CONFIG_CHELSIO_T1 is not set | 651 | # CONFIG_CHELSIO_T1 is not set |
| 652 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
| 629 | # CONFIG_CHELSIO_T3 is not set | 653 | # CONFIG_CHELSIO_T3 is not set |
| 630 | # CONFIG_ENIC is not set | 654 | # CONFIG_ENIC is not set |
| 631 | # CONFIG_IXGBE is not set | 655 | # CONFIG_IXGBE is not set |
| @@ -648,6 +672,10 @@ CONFIG_NETDEV_10000=y | |||
| 648 | # CONFIG_WLAN_PRE80211 is not set | 672 | # CONFIG_WLAN_PRE80211 is not set |
| 649 | # CONFIG_WLAN_80211 is not set | 673 | # CONFIG_WLAN_80211 is not set |
| 650 | # CONFIG_IWLWIFI_LEDS is not set | 674 | # CONFIG_IWLWIFI_LEDS is not set |
| 675 | |||
| 676 | # | ||
| 677 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 678 | # | ||
| 651 | # CONFIG_WAN is not set | 679 | # CONFIG_WAN is not set |
| 652 | # CONFIG_FDDI is not set | 680 | # CONFIG_FDDI is not set |
| 653 | # CONFIG_HIPPI is not set | 681 | # CONFIG_HIPPI is not set |
| @@ -695,8 +723,10 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
| 695 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 723 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
| 696 | # CONFIG_SERIAL_JSM is not set | 724 | # CONFIG_SERIAL_JSM is not set |
| 697 | CONFIG_UNIX98_PTYS=y | 725 | CONFIG_UNIX98_PTYS=y |
| 726 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 698 | CONFIG_LEGACY_PTYS=y | 727 | CONFIG_LEGACY_PTYS=y |
| 699 | CONFIG_LEGACY_PTY_COUNT=256 | 728 | CONFIG_LEGACY_PTY_COUNT=256 |
| 729 | # CONFIG_HVC_UDBG is not set | ||
| 700 | # CONFIG_IPMI_HANDLER is not set | 730 | # CONFIG_IPMI_HANDLER is not set |
| 701 | # CONFIG_HW_RANDOM is not set | 731 | # CONFIG_HW_RANDOM is not set |
| 702 | # CONFIG_NVRAM is not set | 732 | # CONFIG_NVRAM is not set |
| @@ -762,8 +792,6 @@ CONFIG_I2C_MPC=y | |||
| 762 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 763 | # | 793 | # |
| 764 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 765 | # CONFIG_EEPROM_AT24 is not set | ||
| 766 | # CONFIG_EEPROM_LEGACY is not set | ||
| 767 | # CONFIG_SENSORS_PCF8574 is not set | 795 | # CONFIG_SENSORS_PCF8574 is not set |
| 768 | # CONFIG_PCF8575 is not set | 796 | # CONFIG_PCF8575 is not set |
| 769 | # CONFIG_SENSORS_PCA9539 is not set | 797 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -796,10 +824,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 796 | # CONFIG_MFD_CORE is not set | 824 | # CONFIG_MFD_CORE is not set |
| 797 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
| 798 | # CONFIG_HTC_PASIC3 is not set | 826 | # CONFIG_HTC_PASIC3 is not set |
| 827 | # CONFIG_TWL4030_CORE is not set | ||
| 799 | # CONFIG_MFD_TMIO is not set | 828 | # CONFIG_MFD_TMIO is not set |
| 800 | # CONFIG_PMIC_DA903X is not set | 829 | # CONFIG_PMIC_DA903X is not set |
| 801 | # CONFIG_MFD_WM8400 is not set | 830 | # CONFIG_MFD_WM8400 is not set |
| 802 | # CONFIG_MFD_WM8350_I2C is not set | 831 | # CONFIG_MFD_WM8350_I2C is not set |
| 832 | # CONFIG_MFD_PCF50633 is not set | ||
| 803 | # CONFIG_REGULATOR is not set | 833 | # CONFIG_REGULATOR is not set |
| 804 | 834 | ||
| 805 | # | 835 | # |
| @@ -846,9 +876,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 846 | # | 876 | # |
| 847 | 877 | ||
| 848 | # | 878 | # |
| 849 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 879 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 850 | # | 880 | # |
| 851 | # CONFIG_USB_GADGET is not set | 881 | # CONFIG_USB_GADGET is not set |
| 882 | |||
| 883 | # | ||
| 884 | # OTG and related infrastructure | ||
| 885 | # | ||
| 852 | # CONFIG_UWB is not set | 886 | # CONFIG_UWB is not set |
| 853 | # CONFIG_MMC is not set | 887 | # CONFIG_MMC is not set |
| 854 | # CONFIG_MEMSTICK is not set | 888 | # CONFIG_MEMSTICK is not set |
| @@ -860,7 +894,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 860 | # CONFIG_DMADEVICES is not set | 894 | # CONFIG_DMADEVICES is not set |
| 861 | # CONFIG_UIO is not set | 895 | # CONFIG_UIO is not set |
| 862 | # CONFIG_STAGING is not set | 896 | # CONFIG_STAGING is not set |
| 863 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 864 | 897 | ||
| 865 | # | 898 | # |
| 866 | # File systems | 899 | # File systems |
| @@ -881,6 +914,7 @@ CONFIG_FS_MBCACHE=y | |||
| 881 | CONFIG_FILE_LOCKING=y | 914 | CONFIG_FILE_LOCKING=y |
| 882 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
| 883 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
| 917 | # CONFIG_BTRFS_FS is not set | ||
| 884 | CONFIG_DNOTIFY=y | 918 | CONFIG_DNOTIFY=y |
| 885 | CONFIG_INOTIFY=y | 919 | CONFIG_INOTIFY=y |
| 886 | CONFIG_INOTIFY_USER=y | 920 | CONFIG_INOTIFY_USER=y |
| @@ -914,10 +948,7 @@ CONFIG_TMPFS=y | |||
| 914 | # CONFIG_TMPFS_POSIX_ACL is not set | 948 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 915 | # CONFIG_HUGETLB_PAGE is not set | 949 | # CONFIG_HUGETLB_PAGE is not set |
| 916 | # CONFIG_CONFIGFS_FS is not set | 950 | # CONFIG_CONFIGFS_FS is not set |
| 917 | 951 | CONFIG_MISC_FILESYSTEMS=y | |
| 918 | # | ||
| 919 | # Miscellaneous filesystems | ||
| 920 | # | ||
| 921 | # CONFIG_ADFS_FS is not set | 952 | # CONFIG_ADFS_FS is not set |
| 922 | # CONFIG_AFFS_FS is not set | 953 | # CONFIG_AFFS_FS is not set |
| 923 | # CONFIG_HFS_FS is not set | 954 | # CONFIG_HFS_FS is not set |
| @@ -926,6 +957,7 @@ CONFIG_TMPFS=y | |||
| 926 | # CONFIG_BFS_FS is not set | 957 | # CONFIG_BFS_FS is not set |
| 927 | # CONFIG_EFS_FS is not set | 958 | # CONFIG_EFS_FS is not set |
| 928 | # CONFIG_CRAMFS is not set | 959 | # CONFIG_CRAMFS is not set |
| 960 | # CONFIG_SQUASHFS is not set | ||
| 929 | # CONFIG_VXFS_FS is not set | 961 | # CONFIG_VXFS_FS is not set |
| 930 | # CONFIG_MINIX_FS is not set | 962 | # CONFIG_MINIX_FS is not set |
| 931 | # CONFIG_OMFS_FS is not set | 963 | # CONFIG_OMFS_FS is not set |
| @@ -967,6 +999,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 967 | # Library routines | 999 | # Library routines |
| 968 | # | 1000 | # |
| 969 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
| 1002 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 970 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
| 971 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_T10DIF is not set | 1005 | # CONFIG_CRC_T10DIF is not set |
| @@ -1016,6 +1049,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1016 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1049 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1017 | # CONFIG_DEBUG_LIST is not set | 1050 | # CONFIG_DEBUG_LIST is not set |
| 1018 | # CONFIG_DEBUG_SG is not set | 1051 | # CONFIG_DEBUG_SG is not set |
| 1052 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1019 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1053 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1020 | # CONFIG_RCU_TORTURE_TEST is not set | 1054 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1021 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1055 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -1024,6 +1058,8 @@ CONFIG_DEBUG_INFO=y | |||
| 1024 | # CONFIG_FAULT_INJECTION is not set | 1058 | # CONFIG_FAULT_INJECTION is not set |
| 1025 | # CONFIG_LATENCYTOP is not set | 1059 | # CONFIG_LATENCYTOP is not set |
| 1026 | CONFIG_HAVE_FUNCTION_TRACER=y | 1060 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1061 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1062 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1027 | 1063 | ||
| 1028 | # | 1064 | # |
| 1029 | # Tracers | 1065 | # Tracers |
| @@ -1032,11 +1068,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1032 | # CONFIG_SCHED_TRACER is not set | 1068 | # CONFIG_SCHED_TRACER is not set |
| 1033 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1069 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1034 | # CONFIG_BOOT_TRACER is not set | 1070 | # CONFIG_BOOT_TRACER is not set |
| 1071 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1035 | # CONFIG_STACK_TRACER is not set | 1072 | # CONFIG_STACK_TRACER is not set |
| 1036 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1037 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
| 1038 | CONFIG_HAVE_ARCH_KGDB=y | 1075 | CONFIG_HAVE_ARCH_KGDB=y |
| 1039 | # CONFIG_KGDB is not set | 1076 | # CONFIG_KGDB is not set |
| 1077 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1040 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1078 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1041 | # CONFIG_DEBUG_STACK_USAGE is not set | 1079 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1042 | # CONFIG_DEBUG_PAGEALLOC is not set | 1080 | # CONFIG_DEBUG_PAGEALLOC is not set |
| @@ -1063,11 +1101,15 @@ CONFIG_CRYPTO=y | |||
| 1063 | # | 1101 | # |
| 1064 | # CONFIG_CRYPTO_FIPS is not set | 1102 | # CONFIG_CRYPTO_FIPS is not set |
| 1065 | CONFIG_CRYPTO_ALGAPI=y | 1103 | CONFIG_CRYPTO_ALGAPI=y |
| 1066 | CONFIG_CRYPTO_AEAD=y | 1104 | CONFIG_CRYPTO_ALGAPI2=y |
| 1105 | CONFIG_CRYPTO_AEAD2=y | ||
| 1067 | CONFIG_CRYPTO_BLKCIPHER=y | 1106 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1107 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1068 | CONFIG_CRYPTO_HASH=y | 1108 | CONFIG_CRYPTO_HASH=y |
| 1069 | CONFIG_CRYPTO_RNG=y | 1109 | CONFIG_CRYPTO_HASH2=y |
| 1110 | CONFIG_CRYPTO_RNG2=y | ||
| 1070 | CONFIG_CRYPTO_MANAGER=y | 1111 | CONFIG_CRYPTO_MANAGER=y |
| 1112 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1071 | # CONFIG_CRYPTO_GF128MUL is not set | 1113 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1072 | # CONFIG_CRYPTO_NULL is not set | 1114 | # CONFIG_CRYPTO_NULL is not set |
| 1073 | # CONFIG_CRYPTO_CRYPTD is not set | 1115 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index d081e0031057..fb10f22fd0d2 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:11:02 2008 | 4 | # Mon Jan 26 21:42:29 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | |||
| 75 | # | ||
| 76 | # RCU Subsystem | ||
| 77 | # | ||
| 78 | CONFIG_CLASSIC_RCU=y | ||
| 79 | # CONFIG_TREE_RCU is not set | ||
| 80 | # CONFIG_PREEMPT_RCU is not set | ||
| 81 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | ||
| 77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
| 78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
| 79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
| 80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
| 81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
| 90 | # CONFIG_CGROUPS is not set | ||
| 82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
| 83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
| @@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
| 110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
| 111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
| 112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | ||
| 114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -121,13 +129,11 @@ CONFIG_HAVE_CLK=y | |||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | ||
| 125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
| 126 | # CONFIG_MODULES is not set | 133 | # CONFIG_MODULES is not set |
| 127 | CONFIG_BLOCK=y | 134 | CONFIG_BLOCK=y |
| 128 | # CONFIG_LBD is not set | 135 | # CONFIG_LBD is not set |
| 129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 130 | # CONFIG_LSF is not set | ||
| 131 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | 138 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 133 | 139 | ||
| @@ -143,7 +149,6 @@ CONFIG_DEFAULT_AS=y | |||
| 143 | # CONFIG_DEFAULT_CFQ is not set | 149 | # CONFIG_DEFAULT_CFQ is not set |
| 144 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
| 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 146 | CONFIG_CLASSIC_RCU=y | ||
| 147 | # CONFIG_FREEZER is not set | 152 | # CONFIG_FREEZER is not set |
| 148 | 153 | ||
| 149 | # | 154 | # |
| @@ -182,9 +187,9 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 182 | # CONFIG_TAU is not set | 187 | # CONFIG_TAU is not set |
| 183 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 184 | CONFIG_PPC_BESTCOMM=y | 189 | CONFIG_PPC_BESTCOMM=y |
| 185 | # CONFIG_PPC_BESTCOMM_ATA is not set | 190 | CONFIG_PPC_BESTCOMM_ATA=y |
| 186 | CONFIG_PPC_BESTCOMM_FEC=y | 191 | CONFIG_PPC_BESTCOMM_FEC=y |
| 187 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 192 | # CONFIG_SIMPLE_GPIO is not set |
| 188 | 193 | ||
| 189 | # | 194 | # |
| 190 | # Kernel options | 195 | # Kernel options |
| @@ -211,6 +216,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 211 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 216 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 212 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 217 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 213 | # CONFIG_KEXEC is not set | 218 | # CONFIG_KEXEC is not set |
| 219 | # CONFIG_CRASH_DUMP is not set | ||
| 214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 220 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 221 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 216 | CONFIG_SELECT_MEMORY_MODEL=y | 222 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -222,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | 230 | CONFIG_MIGRATION=y |
| 225 | # CONFIG_RESOURCES_64BIT is not set | ||
| 226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 231 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 227 | CONFIG_ZONE_DMA_FLAG=1 | 232 | CONFIG_ZONE_DMA_FLAG=1 |
| 228 | CONFIG_BOUNCE=y | 233 | CONFIG_BOUNCE=y |
| 229 | CONFIG_VIRT_TO_BUS=y | 234 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_UNEVICTABLE_LRU=y | 235 | CONFIG_UNEVICTABLE_LRU=y |
| 236 | CONFIG_PPC_4K_PAGES=y | ||
| 237 | # CONFIG_PPC_16K_PAGES is not set | ||
| 238 | # CONFIG_PPC_64K_PAGES is not set | ||
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 232 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 233 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -268,6 +276,7 @@ CONFIG_NET=y | |||
| 268 | # | 276 | # |
| 269 | # Networking options | 277 | # Networking options |
| 270 | # | 278 | # |
| 279 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 271 | CONFIG_PACKET=y | 280 | CONFIG_PACKET=y |
| 272 | # CONFIG_PACKET_MMAP is not set | 281 | # CONFIG_PACKET_MMAP is not set |
| 273 | CONFIG_UNIX=y | 282 | CONFIG_UNIX=y |
| @@ -324,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 324 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
| 325 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
| 326 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_DCB is not set | ||
| 327 | 337 | ||
| 328 | # | 338 | # |
| 329 | # Network testing | 339 | # Network testing |
| @@ -336,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 336 | # CONFIG_AF_RXRPC is not set | 346 | # CONFIG_AF_RXRPC is not set |
| 337 | # CONFIG_PHONET is not set | 347 | # CONFIG_PHONET is not set |
| 338 | # CONFIG_WIRELESS is not set | 348 | # CONFIG_WIRELESS is not set |
| 349 | # CONFIG_WIMAX is not set | ||
| 339 | # CONFIG_RFKILL is not set | 350 | # CONFIG_RFKILL is not set |
| 340 | # CONFIG_NET_9P is not set | 351 | # CONFIG_NET_9P is not set |
| 341 | 352 | ||
| @@ -427,6 +438,12 @@ CONFIG_MTD_ROM=y | |||
| 427 | # CONFIG_MTD_ONENAND is not set | 438 | # CONFIG_MTD_ONENAND is not set |
| 428 | 439 | ||
| 429 | # | 440 | # |
| 441 | # LPDDR flash memory drivers | ||
| 442 | # | ||
| 443 | # CONFIG_MTD_LPDDR is not set | ||
| 444 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 445 | |||
| 446 | # | ||
| 430 | # UBI - Unsorted block images | 447 | # UBI - Unsorted block images |
| 431 | # | 448 | # |
| 432 | # CONFIG_MTD_UBI is not set | 449 | # CONFIG_MTD_UBI is not set |
| @@ -447,10 +464,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 447 | # CONFIG_ATA_OVER_ETH is not set | 464 | # CONFIG_ATA_OVER_ETH is not set |
| 448 | # CONFIG_BLK_DEV_HD is not set | 465 | # CONFIG_BLK_DEV_HD is not set |
| 449 | CONFIG_MISC_DEVICES=y | 466 | CONFIG_MISC_DEVICES=y |
| 450 | # CONFIG_EEPROM_93CX6 is not set | ||
| 451 | # CONFIG_ICS932S401 is not set | 467 | # CONFIG_ICS932S401 is not set |
| 452 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 453 | # CONFIG_C2PORT is not set | 469 | # CONFIG_C2PORT is not set |
| 470 | |||
| 471 | # | ||
| 472 | # EEPROM support | ||
| 473 | # | ||
| 474 | # CONFIG_EEPROM_AT24 is not set | ||
| 475 | CONFIG_EEPROM_LEGACY=y | ||
| 476 | # CONFIG_EEPROM_93CX6 is not set | ||
| 454 | CONFIG_HAVE_IDE=y | 477 | CONFIG_HAVE_IDE=y |
| 455 | # CONFIG_IDE is not set | 478 | # CONFIG_IDE is not set |
| 456 | 479 | ||
| @@ -492,6 +515,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 492 | # CONFIG_SCSI_SRP_ATTRS is not set | 515 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 493 | CONFIG_SCSI_LOWLEVEL=y | 516 | CONFIG_SCSI_LOWLEVEL=y |
| 494 | # CONFIG_ISCSI_TCP is not set | 517 | # CONFIG_ISCSI_TCP is not set |
| 518 | # CONFIG_LIBFC is not set | ||
| 495 | # CONFIG_SCSI_DEBUG is not set | 519 | # CONFIG_SCSI_DEBUG is not set |
| 496 | # CONFIG_SCSI_DH is not set | 520 | # CONFIG_SCSI_DH is not set |
| 497 | CONFIG_ATA=y | 521 | CONFIG_ATA=y |
| @@ -525,6 +549,9 @@ CONFIG_SMSC_PHY=y | |||
| 525 | CONFIG_BROADCOM_PHY=y | 549 | CONFIG_BROADCOM_PHY=y |
| 526 | CONFIG_ICPLUS_PHY=y | 550 | CONFIG_ICPLUS_PHY=y |
| 527 | # CONFIG_REALTEK_PHY is not set | 551 | # CONFIG_REALTEK_PHY is not set |
| 552 | # CONFIG_NATIONAL_PHY is not set | ||
| 553 | # CONFIG_STE10XP is not set | ||
| 554 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 528 | # CONFIG_FIXED_PHY is not set | 555 | # CONFIG_FIXED_PHY is not set |
| 529 | CONFIG_MDIO_BITBANG=y | 556 | CONFIG_MDIO_BITBANG=y |
| 530 | CONFIG_NET_ETHERNET=y | 557 | CONFIG_NET_ETHERNET=y |
| @@ -548,6 +575,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 548 | # CONFIG_WLAN_PRE80211 is not set | 575 | # CONFIG_WLAN_PRE80211 is not set |
| 549 | # CONFIG_WLAN_80211 is not set | 576 | # CONFIG_WLAN_80211 is not set |
| 550 | # CONFIG_IWLWIFI_LEDS is not set | 577 | # CONFIG_IWLWIFI_LEDS is not set |
| 578 | |||
| 579 | # | ||
| 580 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 581 | # | ||
| 551 | # CONFIG_WAN is not set | 582 | # CONFIG_WAN is not set |
| 552 | # CONFIG_PPP is not set | 583 | # CONFIG_PPP is not set |
| 553 | # CONFIG_SLIP is not set | 584 | # CONFIG_SLIP is not set |
| @@ -590,8 +621,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
| 590 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 621 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
| 591 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 622 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
| 592 | CONFIG_UNIX98_PTYS=y | 623 | CONFIG_UNIX98_PTYS=y |
| 624 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 593 | CONFIG_LEGACY_PTYS=y | 625 | CONFIG_LEGACY_PTYS=y |
| 594 | CONFIG_LEGACY_PTY_COUNT=256 | 626 | CONFIG_LEGACY_PTY_COUNT=256 |
| 627 | # CONFIG_HVC_UDBG is not set | ||
| 595 | # CONFIG_IPMI_HANDLER is not set | 628 | # CONFIG_IPMI_HANDLER is not set |
| 596 | # CONFIG_HW_RANDOM is not set | 629 | # CONFIG_HW_RANDOM is not set |
| 597 | # CONFIG_NVRAM is not set | 630 | # CONFIG_NVRAM is not set |
| @@ -629,8 +662,6 @@ CONFIG_I2C_MPC=y | |||
| 629 | # Miscellaneous I2C Chip support | 662 | # Miscellaneous I2C Chip support |
| 630 | # | 663 | # |
| 631 | # CONFIG_DS1682 is not set | 664 | # CONFIG_DS1682 is not set |
| 632 | # CONFIG_EEPROM_AT24 is not set | ||
| 633 | CONFIG_EEPROM_LEGACY=y | ||
| 634 | # CONFIG_SENSORS_PCF8574 is not set | 665 | # CONFIG_SENSORS_PCF8574 is not set |
| 635 | # CONFIG_PCF8575 is not set | 666 | # CONFIG_PCF8575 is not set |
| 636 | # CONFIG_SENSORS_PCA9539 is not set | 667 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -659,6 +690,7 @@ CONFIG_HWMON=y | |||
| 659 | # CONFIG_SENSORS_ADT7462 is not set | 690 | # CONFIG_SENSORS_ADT7462 is not set |
| 660 | # CONFIG_SENSORS_ADT7470 is not set | 691 | # CONFIG_SENSORS_ADT7470 is not set |
| 661 | # CONFIG_SENSORS_ADT7473 is not set | 692 | # CONFIG_SENSORS_ADT7473 is not set |
| 693 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 662 | # CONFIG_SENSORS_ATXP1 is not set | 694 | # CONFIG_SENSORS_ATXP1 is not set |
| 663 | # CONFIG_SENSORS_DS1621 is not set | 695 | # CONFIG_SENSORS_DS1621 is not set |
| 664 | # CONFIG_SENSORS_F71805F is not set | 696 | # CONFIG_SENSORS_F71805F is not set |
| @@ -678,6 +710,7 @@ CONFIG_HWMON=y | |||
| 678 | # CONFIG_SENSORS_LM90 is not set | 710 | # CONFIG_SENSORS_LM90 is not set |
| 679 | # CONFIG_SENSORS_LM92 is not set | 711 | # CONFIG_SENSORS_LM92 is not set |
| 680 | # CONFIG_SENSORS_LM93 is not set | 712 | # CONFIG_SENSORS_LM93 is not set |
| 713 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 681 | # CONFIG_SENSORS_MAX1619 is not set | 714 | # CONFIG_SENSORS_MAX1619 is not set |
| 682 | # CONFIG_SENSORS_MAX6650 is not set | 715 | # CONFIG_SENSORS_MAX6650 is not set |
| 683 | # CONFIG_SENSORS_PC87360 is not set | 716 | # CONFIG_SENSORS_PC87360 is not set |
| @@ -721,10 +754,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 721 | # CONFIG_MFD_CORE is not set | 754 | # CONFIG_MFD_CORE is not set |
| 722 | # CONFIG_MFD_SM501 is not set | 755 | # CONFIG_MFD_SM501 is not set |
| 723 | # CONFIG_HTC_PASIC3 is not set | 756 | # CONFIG_HTC_PASIC3 is not set |
| 757 | # CONFIG_TWL4030_CORE is not set | ||
| 724 | # CONFIG_MFD_TMIO is not set | 758 | # CONFIG_MFD_TMIO is not set |
| 725 | # CONFIG_PMIC_DA903X is not set | 759 | # CONFIG_PMIC_DA903X is not set |
| 726 | # CONFIG_MFD_WM8400 is not set | 760 | # CONFIG_MFD_WM8400 is not set |
| 727 | # CONFIG_MFD_WM8350_I2C is not set | 761 | # CONFIG_MFD_WM8350_I2C is not set |
| 762 | # CONFIG_MFD_PCF50633 is not set | ||
| 728 | # CONFIG_REGULATOR is not set | 763 | # CONFIG_REGULATOR is not set |
| 729 | 764 | ||
| 730 | # | 765 | # |
| @@ -835,7 +870,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 835 | # CONFIG_DMADEVICES is not set | 870 | # CONFIG_DMADEVICES is not set |
| 836 | # CONFIG_UIO is not set | 871 | # CONFIG_UIO is not set |
| 837 | # CONFIG_STAGING is not set | 872 | # CONFIG_STAGING is not set |
| 838 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 839 | 873 | ||
| 840 | # | 874 | # |
| 841 | # File systems | 875 | # File systems |
| @@ -856,6 +890,7 @@ CONFIG_FS_MBCACHE=y | |||
| 856 | CONFIG_FILE_LOCKING=y | 890 | CONFIG_FILE_LOCKING=y |
| 857 | # CONFIG_XFS_FS is not set | 891 | # CONFIG_XFS_FS is not set |
| 858 | # CONFIG_OCFS2_FS is not set | 892 | # CONFIG_OCFS2_FS is not set |
| 893 | # CONFIG_BTRFS_FS is not set | ||
| 859 | CONFIG_DNOTIFY=y | 894 | CONFIG_DNOTIFY=y |
| 860 | CONFIG_INOTIFY=y | 895 | CONFIG_INOTIFY=y |
| 861 | CONFIG_INOTIFY_USER=y | 896 | CONFIG_INOTIFY_USER=y |
| @@ -892,10 +927,7 @@ CONFIG_TMPFS=y | |||
| 892 | # CONFIG_TMPFS_POSIX_ACL is not set | 927 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 893 | # CONFIG_HUGETLB_PAGE is not set | 928 | # CONFIG_HUGETLB_PAGE is not set |
| 894 | # CONFIG_CONFIGFS_FS is not set | 929 | # CONFIG_CONFIGFS_FS is not set |
| 895 | 930 | CONFIG_MISC_FILESYSTEMS=y | |
| 896 | # | ||
| 897 | # Miscellaneous filesystems | ||
| 898 | # | ||
| 899 | # CONFIG_ADFS_FS is not set | 931 | # CONFIG_ADFS_FS is not set |
| 900 | # CONFIG_AFFS_FS is not set | 932 | # CONFIG_AFFS_FS is not set |
| 901 | # CONFIG_HFS_FS is not set | 933 | # CONFIG_HFS_FS is not set |
| @@ -915,6 +947,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 915 | CONFIG_JFFS2_RTIME=y | 947 | CONFIG_JFFS2_RTIME=y |
| 916 | # CONFIG_JFFS2_RUBIN is not set | 948 | # CONFIG_JFFS2_RUBIN is not set |
| 917 | CONFIG_CRAMFS=y | 949 | CONFIG_CRAMFS=y |
| 950 | # CONFIG_SQUASHFS is not set | ||
| 918 | # CONFIG_VXFS_FS is not set | 951 | # CONFIG_VXFS_FS is not set |
| 919 | # CONFIG_MINIX_FS is not set | 952 | # CONFIG_MINIX_FS is not set |
| 920 | # CONFIG_OMFS_FS is not set | 953 | # CONFIG_OMFS_FS is not set |
| @@ -1011,6 +1044,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1011 | # Library routines | 1044 | # Library routines |
| 1012 | # | 1045 | # |
| 1013 | CONFIG_BITREVERSE=y | 1046 | CONFIG_BITREVERSE=y |
| 1047 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1014 | # CONFIG_CRC_CCITT is not set | 1048 | # CONFIG_CRC_CCITT is not set |
| 1015 | # CONFIG_CRC16 is not set | 1049 | # CONFIG_CRC16 is not set |
| 1016 | # CONFIG_CRC_T10DIF is not set | 1050 | # CONFIG_CRC_T10DIF is not set |
| @@ -1062,6 +1096,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1062 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1096 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1063 | # CONFIG_DEBUG_LIST is not set | 1097 | # CONFIG_DEBUG_LIST is not set |
| 1064 | # CONFIG_DEBUG_SG is not set | 1098 | # CONFIG_DEBUG_SG is not set |
| 1099 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1065 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1100 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1066 | # CONFIG_RCU_TORTURE_TEST is not set | 1101 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1067 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1102 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -1070,6 +1105,8 @@ CONFIG_DEBUG_INFO=y | |||
| 1070 | # CONFIG_FAULT_INJECTION is not set | 1105 | # CONFIG_FAULT_INJECTION is not set |
| 1071 | # CONFIG_LATENCYTOP is not set | 1106 | # CONFIG_LATENCYTOP is not set |
| 1072 | CONFIG_HAVE_FUNCTION_TRACER=y | 1107 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1108 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1109 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1073 | 1110 | ||
| 1074 | # | 1111 | # |
| 1075 | # Tracers | 1112 | # Tracers |
| @@ -1078,11 +1115,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1078 | # CONFIG_SCHED_TRACER is not set | 1115 | # CONFIG_SCHED_TRACER is not set |
| 1079 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1116 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1080 | # CONFIG_BOOT_TRACER is not set | 1117 | # CONFIG_BOOT_TRACER is not set |
| 1118 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1081 | # CONFIG_STACK_TRACER is not set | 1119 | # CONFIG_STACK_TRACER is not set |
| 1082 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1120 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1083 | # CONFIG_SAMPLES is not set | 1121 | # CONFIG_SAMPLES is not set |
| 1084 | CONFIG_HAVE_ARCH_KGDB=y | 1122 | CONFIG_HAVE_ARCH_KGDB=y |
| 1085 | # CONFIG_KGDB is not set | 1123 | # CONFIG_KGDB is not set |
| 1124 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1086 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1125 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1087 | # CONFIG_DEBUG_STACK_USAGE is not set | 1126 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1088 | # CONFIG_DEBUG_PAGEALLOC is not set | 1127 | # CONFIG_DEBUG_PAGEALLOC is not set |
| @@ -1109,11 +1148,15 @@ CONFIG_CRYPTO=y | |||
| 1109 | # | 1148 | # |
| 1110 | # CONFIG_CRYPTO_FIPS is not set | 1149 | # CONFIG_CRYPTO_FIPS is not set |
| 1111 | CONFIG_CRYPTO_ALGAPI=y | 1150 | CONFIG_CRYPTO_ALGAPI=y |
| 1112 | CONFIG_CRYPTO_AEAD=y | 1151 | CONFIG_CRYPTO_ALGAPI2=y |
| 1152 | CONFIG_CRYPTO_AEAD2=y | ||
| 1113 | CONFIG_CRYPTO_BLKCIPHER=y | 1153 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1154 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1114 | CONFIG_CRYPTO_HASH=y | 1155 | CONFIG_CRYPTO_HASH=y |
| 1115 | CONFIG_CRYPTO_RNG=y | 1156 | CONFIG_CRYPTO_HASH2=y |
| 1157 | CONFIG_CRYPTO_RNG2=y | ||
| 1116 | CONFIG_CRYPTO_MANAGER=y | 1158 | CONFIG_CRYPTO_MANAGER=y |
| 1159 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1117 | # CONFIG_CRYPTO_GF128MUL is not set | 1160 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1118 | # CONFIG_CRYPTO_NULL is not set | 1161 | # CONFIG_CRYPTO_NULL is not set |
| 1119 | # CONFIG_CRYPTO_CRYPTD is not set | 1162 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index b21b8e8c3a78..00944c09a0ae 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:13:16 2008 | 4 | # Mon Jan 26 21:41:33 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -72,15 +72,24 @@ CONFIG_POSIX_MQUEUE=y | |||
| 72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
| 74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
| 75 | |||
| 76 | # | ||
| 77 | # RCU Subsystem | ||
| 78 | # | ||
| 79 | CONFIG_CLASSIC_RCU=y | ||
| 80 | # CONFIG_TREE_RCU is not set | ||
| 81 | # CONFIG_PREEMPT_RCU is not set | ||
| 82 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 75 | CONFIG_IKCONFIG=y | 84 | CONFIG_IKCONFIG=y |
| 76 | CONFIG_IKCONFIG_PROC=y | 85 | CONFIG_IKCONFIG_PROC=y |
| 77 | CONFIG_LOG_BUF_SHIFT=14 | 86 | CONFIG_LOG_BUF_SHIFT=14 |
| 78 | # CONFIG_CGROUPS is not set | ||
| 79 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
| 80 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
| 81 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
| 82 | CONFIG_USER_SCHED=y | 90 | CONFIG_USER_SCHED=y |
| 83 | # CONFIG_CGROUP_SCHED is not set | 91 | # CONFIG_CGROUP_SCHED is not set |
| 92 | # CONFIG_CGROUPS is not set | ||
| 84 | CONFIG_SYSFS_DEPRECATED=y | 93 | CONFIG_SYSFS_DEPRECATED=y |
| 85 | CONFIG_SYSFS_DEPRECATED_V2=y | 94 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 86 | # CONFIG_RELAY is not set | 95 | # CONFIG_RELAY is not set |
| @@ -112,7 +121,6 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_SLUB is not set | 121 | # CONFIG_SLUB is not set |
| 113 | # CONFIG_SLOB is not set | 122 | # CONFIG_SLOB is not set |
| 114 | # CONFIG_PROFILING is not set | 123 | # CONFIG_PROFILING is not set |
| 115 | # CONFIG_MARKERS is not set | ||
| 116 | CONFIG_HAVE_OPROFILE=y | 124 | CONFIG_HAVE_OPROFILE=y |
| 117 | # CONFIG_KPROBES is not set | 125 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 126 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| @@ -124,7 +132,6 @@ CONFIG_HAVE_CLK=y | |||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 125 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | ||
| 128 | CONFIG_BASE_SMALL=0 | 135 | CONFIG_BASE_SMALL=0 |
| 129 | CONFIG_MODULES=y | 136 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | 137 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -132,11 +139,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 132 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 133 | # CONFIG_MODVERSIONS is not set | 140 | # CONFIG_MODVERSIONS is not set |
| 134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 141 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 135 | CONFIG_KMOD=y | ||
| 136 | CONFIG_BLOCK=y | 142 | CONFIG_BLOCK=y |
| 137 | # CONFIG_LBD is not set | 143 | # CONFIG_LBD is not set |
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | ||
| 140 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 141 | # CONFIG_BLK_DEV_INTEGRITY is not set | 146 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 142 | 147 | ||
| @@ -152,7 +157,6 @@ CONFIG_IOSCHED_NOOP=y | |||
| 152 | # CONFIG_DEFAULT_CFQ is not set | 157 | # CONFIG_DEFAULT_CFQ is not set |
| 153 | CONFIG_DEFAULT_NOOP=y | 158 | CONFIG_DEFAULT_NOOP=y |
| 154 | CONFIG_DEFAULT_IOSCHED="noop" | 159 | CONFIG_DEFAULT_IOSCHED="noop" |
| 155 | CONFIG_CLASSIC_RCU=y | ||
| 156 | # CONFIG_FREEZER is not set | 160 | # CONFIG_FREEZER is not set |
| 157 | 161 | ||
| 158 | # | 162 | # |
| @@ -191,9 +195,9 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 191 | # CONFIG_TAU is not set | 195 | # CONFIG_TAU is not set |
| 192 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
| 193 | CONFIG_PPC_BESTCOMM=y | 197 | CONFIG_PPC_BESTCOMM=y |
| 194 | CONFIG_PPC_BESTCOMM_ATA=y | 198 | CONFIG_PPC_BESTCOMM_ATA=m |
| 195 | CONFIG_PPC_BESTCOMM_FEC=y | 199 | CONFIG_PPC_BESTCOMM_FEC=y |
| 196 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 200 | # CONFIG_SIMPLE_GPIO is not set |
| 197 | 201 | ||
| 198 | # | 202 | # |
| 199 | # Kernel options | 203 | # Kernel options |
| @@ -212,7 +216,6 @@ CONFIG_SCHED_HRTICK=y | |||
| 212 | # CONFIG_PREEMPT_NONE is not set | 216 | # CONFIG_PREEMPT_NONE is not set |
| 213 | # CONFIG_PREEMPT_VOLUNTARY is not set | 217 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 214 | CONFIG_PREEMPT=y | 218 | CONFIG_PREEMPT=y |
| 215 | # CONFIG_PREEMPT_RCU is not set | ||
| 216 | CONFIG_BINFMT_ELF=y | 219 | CONFIG_BINFMT_ELF=y |
| 217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 220 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 218 | # CONFIG_HAVE_AOUT is not set | 221 | # CONFIG_HAVE_AOUT is not set |
| @@ -222,6 +225,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 222 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 225 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 223 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 226 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 224 | # CONFIG_KEXEC is not set | 227 | # CONFIG_KEXEC is not set |
| 228 | # CONFIG_CRASH_DUMP is not set | ||
| 225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 229 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 230 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 227 | CONFIG_SELECT_MEMORY_MODEL=y | 231 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -233,12 +237,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 233 | CONFIG_PAGEFLAGS_EXTENDED=y | 237 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 238 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 235 | CONFIG_MIGRATION=y | 239 | CONFIG_MIGRATION=y |
| 236 | # CONFIG_RESOURCES_64BIT is not set | ||
| 237 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 240 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 238 | CONFIG_ZONE_DMA_FLAG=1 | 241 | CONFIG_ZONE_DMA_FLAG=1 |
| 239 | CONFIG_BOUNCE=y | 242 | CONFIG_BOUNCE=y |
| 240 | CONFIG_VIRT_TO_BUS=y | 243 | CONFIG_VIRT_TO_BUS=y |
| 241 | CONFIG_UNEVICTABLE_LRU=y | 244 | CONFIG_UNEVICTABLE_LRU=y |
| 245 | CONFIG_PPC_4K_PAGES=y | ||
| 246 | # CONFIG_PPC_16K_PAGES is not set | ||
| 247 | # CONFIG_PPC_64K_PAGES is not set | ||
| 242 | CONFIG_FORCE_MAX_ZONEORDER=11 | 248 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 243 | CONFIG_PROC_DEVICETREE=y | 249 | CONFIG_PROC_DEVICETREE=y |
| 244 | # CONFIG_CMDLINE_BOOL is not set | 250 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -261,6 +267,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 261 | CONFIG_ARCH_SUPPORTS_MSI=y | 267 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 262 | # CONFIG_PCI_MSI is not set | 268 | # CONFIG_PCI_MSI is not set |
| 263 | CONFIG_PCI_LEGACY=y | 269 | CONFIG_PCI_LEGACY=y |
| 270 | # CONFIG_PCI_STUB is not set | ||
| 264 | # CONFIG_PCCARD is not set | 271 | # CONFIG_PCCARD is not set |
| 265 | # CONFIG_HOTPLUG_PCI is not set | 272 | # CONFIG_HOTPLUG_PCI is not set |
| 266 | # CONFIG_HAS_RAPIDIO is not set | 273 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -283,6 +290,7 @@ CONFIG_NET=y | |||
| 283 | # | 290 | # |
| 284 | # Networking options | 291 | # Networking options |
| 285 | # | 292 | # |
| 293 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 286 | CONFIG_PACKET=y | 294 | CONFIG_PACKET=y |
| 287 | # CONFIG_PACKET_MMAP is not set | 295 | # CONFIG_PACKET_MMAP is not set |
| 288 | CONFIG_UNIX=y | 296 | CONFIG_UNIX=y |
| @@ -333,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_ECONET is not set | 341 | # CONFIG_ECONET is not set |
| 334 | # CONFIG_WAN_ROUTER is not set | 342 | # CONFIG_WAN_ROUTER is not set |
| 335 | # CONFIG_NET_SCHED is not set | 343 | # CONFIG_NET_SCHED is not set |
| 344 | # CONFIG_DCB is not set | ||
| 336 | 345 | ||
| 337 | # | 346 | # |
| 338 | # Network testing | 347 | # Network testing |
| @@ -345,6 +354,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 345 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
| 346 | # CONFIG_PHONET is not set | 355 | # CONFIG_PHONET is not set |
| 347 | # CONFIG_WIRELESS is not set | 356 | # CONFIG_WIRELESS is not set |
| 357 | # CONFIG_WIMAX is not set | ||
| 348 | # CONFIG_RFKILL is not set | 358 | # CONFIG_RFKILL is not set |
| 349 | # CONFIG_NET_9P is not set | 359 | # CONFIG_NET_9P is not set |
| 350 | 360 | ||
| @@ -365,6 +375,7 @@ CONFIG_MTD=y | |||
| 365 | # CONFIG_MTD_DEBUG is not set | 375 | # CONFIG_MTD_DEBUG is not set |
| 366 | # CONFIG_MTD_CONCAT is not set | 376 | # CONFIG_MTD_CONCAT is not set |
| 367 | CONFIG_MTD_PARTITIONS=y | 377 | CONFIG_MTD_PARTITIONS=y |
| 378 | # CONFIG_MTD_TESTS is not set | ||
| 368 | # CONFIG_MTD_REDBOOT_PARTS is not set | 379 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 369 | CONFIG_MTD_CMDLINE_PARTS=y | 380 | CONFIG_MTD_CMDLINE_PARTS=y |
| 370 | # CONFIG_MTD_OF_PARTS is not set | 381 | # CONFIG_MTD_OF_PARTS is not set |
| @@ -413,9 +424,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 413 | # | 424 | # |
| 414 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 425 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 415 | CONFIG_MTD_PHYSMAP=y | 426 | CONFIG_MTD_PHYSMAP=y |
| 416 | CONFIG_MTD_PHYSMAP_START=0x0 | 427 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
| 417 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 418 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | ||
| 419 | # CONFIG_MTD_PHYSMAP_OF is not set | 428 | # CONFIG_MTD_PHYSMAP_OF is not set |
| 420 | # CONFIG_MTD_INTEL_VR_NOR is not set | 429 | # CONFIG_MTD_INTEL_VR_NOR is not set |
| 421 | # CONFIG_MTD_PLATRAM is not set | 430 | # CONFIG_MTD_PLATRAM is not set |
| @@ -439,6 +448,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 439 | # CONFIG_MTD_ONENAND is not set | 448 | # CONFIG_MTD_ONENAND is not set |
| 440 | 449 | ||
| 441 | # | 450 | # |
| 451 | # LPDDR flash memory drivers | ||
| 452 | # | ||
| 453 | # CONFIG_MTD_LPDDR is not set | ||
| 454 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 455 | |||
| 456 | # | ||
| 442 | # UBI - Unsorted block images | 457 | # UBI - Unsorted block images |
| 443 | # | 458 | # |
| 444 | # CONFIG_MTD_UBI is not set | 459 | # CONFIG_MTD_UBI is not set |
| @@ -587,6 +602,9 @@ CONFIG_PHYLIB=y | |||
| 587 | # CONFIG_BROADCOM_PHY is not set | 602 | # CONFIG_BROADCOM_PHY is not set |
| 588 | # CONFIG_ICPLUS_PHY is not set | 603 | # CONFIG_ICPLUS_PHY is not set |
| 589 | # CONFIG_REALTEK_PHY is not set | 604 | # CONFIG_REALTEK_PHY is not set |
| 605 | # CONFIG_NATIONAL_PHY is not set | ||
| 606 | # CONFIG_STE10XP is not set | ||
| 607 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 590 | # CONFIG_FIXED_PHY is not set | 608 | # CONFIG_FIXED_PHY is not set |
| 591 | # CONFIG_MDIO_BITBANG is not set | 609 | # CONFIG_MDIO_BITBANG is not set |
| 592 | CONFIG_NET_ETHERNET=y | 610 | CONFIG_NET_ETHERNET=y |
| @@ -621,6 +639,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 621 | # CONFIG_IWLWIFI_LEDS is not set | 639 | # CONFIG_IWLWIFI_LEDS is not set |
| 622 | 640 | ||
| 623 | # | 641 | # |
| 642 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 643 | # | ||
| 644 | |||
| 645 | # | ||
| 624 | # USB Network Adapters | 646 | # USB Network Adapters |
| 625 | # | 647 | # |
| 626 | # CONFIG_USB_CATC is not set | 648 | # CONFIG_USB_CATC is not set |
| @@ -675,7 +697,9 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
| 675 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 | 697 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 |
| 676 | # CONFIG_SERIAL_JSM is not set | 698 | # CONFIG_SERIAL_JSM is not set |
| 677 | CONFIG_UNIX98_PTYS=y | 699 | CONFIG_UNIX98_PTYS=y |
| 700 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 678 | # CONFIG_LEGACY_PTYS is not set | 701 | # CONFIG_LEGACY_PTYS is not set |
| 702 | # CONFIG_HVC_UDBG is not set | ||
| 679 | # CONFIG_IPMI_HANDLER is not set | 703 | # CONFIG_IPMI_HANDLER is not set |
| 680 | CONFIG_HW_RANDOM=y | 704 | CONFIG_HW_RANDOM=y |
| 681 | # CONFIG_NVRAM is not set | 705 | # CONFIG_NVRAM is not set |
| @@ -740,8 +764,6 @@ CONFIG_I2C_MPC=y | |||
| 740 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| 741 | # | 765 | # |
| 742 | # CONFIG_DS1682 is not set | 766 | # CONFIG_DS1682 is not set |
| 743 | # CONFIG_EEPROM_AT24 is not set | ||
| 744 | CONFIG_EEPROM_LEGACY=m | ||
| 745 | # CONFIG_SENSORS_PCF8574 is not set | 767 | # CONFIG_SENSORS_PCF8574 is not set |
| 746 | # CONFIG_PCF8575 is not set | 768 | # CONFIG_PCF8575 is not set |
| 747 | # CONFIG_SENSORS_PCA9539 is not set | 769 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -774,10 +796,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 774 | # CONFIG_MFD_CORE is not set | 796 | # CONFIG_MFD_CORE is not set |
| 775 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
| 776 | # CONFIG_HTC_PASIC3 is not set | 798 | # CONFIG_HTC_PASIC3 is not set |
| 799 | # CONFIG_TWL4030_CORE is not set | ||
| 777 | # CONFIG_MFD_TMIO is not set | 800 | # CONFIG_MFD_TMIO is not set |
| 778 | # CONFIG_PMIC_DA903X is not set | 801 | # CONFIG_PMIC_DA903X is not set |
| 779 | # CONFIG_MFD_WM8400 is not set | 802 | # CONFIG_MFD_WM8400 is not set |
| 780 | # CONFIG_MFD_WM8350_I2C is not set | 803 | # CONFIG_MFD_WM8350_I2C is not set |
| 804 | # CONFIG_MFD_PCF50633 is not set | ||
| 781 | # CONFIG_REGULATOR is not set | 805 | # CONFIG_REGULATOR is not set |
| 782 | 806 | ||
| 783 | # | 807 | # |
| @@ -837,6 +861,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 837 | # | 861 | # |
| 838 | # CONFIG_USB_C67X00_HCD is not set | 862 | # CONFIG_USB_C67X00_HCD is not set |
| 839 | # CONFIG_USB_EHCI_HCD is not set | 863 | # CONFIG_USB_EHCI_HCD is not set |
| 864 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 840 | # CONFIG_USB_ISP116X_HCD is not set | 865 | # CONFIG_USB_ISP116X_HCD is not set |
| 841 | # CONFIG_USB_ISP1760_HCD is not set | 866 | # CONFIG_USB_ISP1760_HCD is not set |
| 842 | CONFIG_USB_OHCI_HCD=m | 867 | CONFIG_USB_OHCI_HCD=m |
| @@ -864,18 +889,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 864 | # CONFIG_USB_TMC is not set | 889 | # CONFIG_USB_TMC is not set |
| 865 | 890 | ||
| 866 | # | 891 | # |
| 867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 892 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 868 | # | 893 | # |
| 869 | 894 | ||
| 870 | # | 895 | # |
| 871 | # may also be needed; see USB_STORAGE Help for more information | 896 | # see USB_STORAGE Help for more information |
| 872 | # | 897 | # |
| 873 | CONFIG_USB_STORAGE=m | 898 | CONFIG_USB_STORAGE=m |
| 874 | # CONFIG_USB_STORAGE_DEBUG is not set | 899 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 875 | # CONFIG_USB_STORAGE_DATAFAB is not set | 900 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 876 | # CONFIG_USB_STORAGE_FREECOM is not set | 901 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 877 | # CONFIG_USB_STORAGE_ISD200 is not set | 902 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 878 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 879 | # CONFIG_USB_STORAGE_USBAT is not set | 903 | # CONFIG_USB_STORAGE_USBAT is not set |
| 880 | # CONFIG_USB_STORAGE_SDDR09 is not set | 904 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 881 | # CONFIG_USB_STORAGE_SDDR55 is not set | 905 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| @@ -921,6 +945,10 @@ CONFIG_USB_STORAGE=m | |||
| 921 | # CONFIG_USB_ISIGHTFW is not set | 945 | # CONFIG_USB_ISIGHTFW is not set |
| 922 | # CONFIG_USB_VST is not set | 946 | # CONFIG_USB_VST is not set |
| 923 | # CONFIG_USB_GADGET is not set | 947 | # CONFIG_USB_GADGET is not set |
| 948 | |||
| 949 | # | ||
| 950 | # OTG and related infrastructure | ||
| 951 | # | ||
| 924 | # CONFIG_UWB is not set | 952 | # CONFIG_UWB is not set |
| 925 | # CONFIG_MMC is not set | 953 | # CONFIG_MMC is not set |
| 926 | # CONFIG_MEMSTICK is not set | 954 | # CONFIG_MEMSTICK is not set |
| @@ -983,7 +1011,6 @@ CONFIG_RTC_DRV_PCF8563=m | |||
| 983 | # CONFIG_DMADEVICES is not set | 1011 | # CONFIG_DMADEVICES is not set |
| 984 | # CONFIG_UIO is not set | 1012 | # CONFIG_UIO is not set |
| 985 | # CONFIG_STAGING is not set | 1013 | # CONFIG_STAGING is not set |
| 986 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 987 | 1014 | ||
| 988 | # | 1015 | # |
| 989 | # File systems | 1016 | # File systems |
| @@ -1004,6 +1031,7 @@ CONFIG_FS_MBCACHE=m | |||
| 1004 | CONFIG_FILE_LOCKING=y | 1031 | CONFIG_FILE_LOCKING=y |
| 1005 | # CONFIG_XFS_FS is not set | 1032 | # CONFIG_XFS_FS is not set |
| 1006 | # CONFIG_OCFS2_FS is not set | 1033 | # CONFIG_OCFS2_FS is not set |
| 1034 | # CONFIG_BTRFS_FS is not set | ||
| 1007 | # CONFIG_DNOTIFY is not set | 1035 | # CONFIG_DNOTIFY is not set |
| 1008 | # CONFIG_INOTIFY is not set | 1036 | # CONFIG_INOTIFY is not set |
| 1009 | # CONFIG_QUOTA is not set | 1037 | # CONFIG_QUOTA is not set |
| @@ -1039,10 +1067,7 @@ CONFIG_TMPFS=y | |||
| 1039 | # CONFIG_TMPFS_POSIX_ACL is not set | 1067 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1040 | # CONFIG_HUGETLB_PAGE is not set | 1068 | # CONFIG_HUGETLB_PAGE is not set |
| 1041 | # CONFIG_CONFIGFS_FS is not set | 1069 | # CONFIG_CONFIGFS_FS is not set |
| 1042 | 1070 | CONFIG_MISC_FILESYSTEMS=y | |
| 1043 | # | ||
| 1044 | # Miscellaneous filesystems | ||
| 1045 | # | ||
| 1046 | # CONFIG_ADFS_FS is not set | 1071 | # CONFIG_ADFS_FS is not set |
| 1047 | # CONFIG_AFFS_FS is not set | 1072 | # CONFIG_AFFS_FS is not set |
| 1048 | # CONFIG_HFS_FS is not set | 1073 | # CONFIG_HFS_FS is not set |
| @@ -1062,6 +1087,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1062 | CONFIG_JFFS2_RTIME=y | 1087 | CONFIG_JFFS2_RTIME=y |
| 1063 | # CONFIG_JFFS2_RUBIN is not set | 1088 | # CONFIG_JFFS2_RUBIN is not set |
| 1064 | # CONFIG_CRAMFS is not set | 1089 | # CONFIG_CRAMFS is not set |
| 1090 | # CONFIG_SQUASHFS is not set | ||
| 1065 | # CONFIG_VXFS_FS is not set | 1091 | # CONFIG_VXFS_FS is not set |
| 1066 | # CONFIG_MINIX_FS is not set | 1092 | # CONFIG_MINIX_FS is not set |
| 1067 | # CONFIG_OMFS_FS is not set | 1093 | # CONFIG_OMFS_FS is not set |
| @@ -1141,6 +1167,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1141 | # Library routines | 1167 | # Library routines |
| 1142 | # | 1168 | # |
| 1143 | CONFIG_BITREVERSE=y | 1169 | CONFIG_BITREVERSE=y |
| 1170 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1144 | # CONFIG_CRC_CCITT is not set | 1171 | # CONFIG_CRC_CCITT is not set |
| 1145 | # CONFIG_CRC16 is not set | 1172 | # CONFIG_CRC16 is not set |
| 1146 | # CONFIG_CRC_T10DIF is not set | 1173 | # CONFIG_CRC_T10DIF is not set |
| @@ -1173,6 +1200,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1173 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1200 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1174 | # CONFIG_LATENCYTOP is not set | 1201 | # CONFIG_LATENCYTOP is not set |
| 1175 | CONFIG_HAVE_FUNCTION_TRACER=y | 1202 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1203 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1204 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1176 | 1205 | ||
| 1177 | # | 1206 | # |
| 1178 | # Tracers | 1207 | # Tracers |
| @@ -1180,6 +1209,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1180 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1209 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1181 | # CONFIG_SAMPLES is not set | 1210 | # CONFIG_SAMPLES is not set |
| 1182 | CONFIG_HAVE_ARCH_KGDB=y | 1211 | CONFIG_HAVE_ARCH_KGDB=y |
| 1212 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1183 | # CONFIG_IRQSTACKS is not set | 1213 | # CONFIG_IRQSTACKS is not set |
| 1184 | # CONFIG_BOOTX_TEXT is not set | 1214 | # CONFIG_BOOTX_TEXT is not set |
| 1185 | # CONFIG_PPC_EARLY_DEBUG is not set | 1215 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index 79954579f5ec..65237ad6f07e 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:09:30 2008 | 4 | # Mon Jan 26 21:42:58 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | |||
| 75 | # | ||
| 76 | # RCU Subsystem | ||
| 77 | # | ||
| 78 | CONFIG_CLASSIC_RCU=y | ||
| 79 | # CONFIG_TREE_RCU is not set | ||
| 80 | # CONFIG_PREEMPT_RCU is not set | ||
| 81 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | ||
| 77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
| 78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
| 79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
| 80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
| 81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
| 90 | # CONFIG_CGROUPS is not set | ||
| 82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
| 83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
| @@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
| 110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
| 111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
| 112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | ||
| 114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -121,7 +129,6 @@ CONFIG_HAVE_CLK=y | |||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | ||
| 125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
| 126 | CONFIG_MODULES=y | 133 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | 134 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -129,11 +136,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 130 | CONFIG_MODVERSIONS=y | 137 | CONFIG_MODVERSIONS=y |
| 131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 132 | CONFIG_KMOD=y | ||
| 133 | CONFIG_BLOCK=y | 139 | CONFIG_BLOCK=y |
| 134 | # CONFIG_LBD is not set | 140 | # CONFIG_LBD is not set |
| 135 | # CONFIG_BLK_DEV_IO_TRACE is not set | 141 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 136 | # CONFIG_LSF is not set | ||
| 137 | # CONFIG_BLK_DEV_BSG is not set | 142 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 143 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 139 | 144 | ||
| @@ -149,7 +154,6 @@ CONFIG_DEFAULT_AS=y | |||
| 149 | # CONFIG_DEFAULT_CFQ is not set | 154 | # CONFIG_DEFAULT_CFQ is not set |
| 150 | # CONFIG_DEFAULT_NOOP is not set | 155 | # CONFIG_DEFAULT_NOOP is not set |
| 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 152 | CONFIG_CLASSIC_RCU=y | ||
| 153 | # CONFIG_FREEZER is not set | 157 | # CONFIG_FREEZER is not set |
| 154 | 158 | ||
| 155 | # | 159 | # |
| @@ -188,9 +192,9 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
| 188 | # CONFIG_TAU is not set | 192 | # CONFIG_TAU is not set |
| 189 | # CONFIG_FSL_ULI1575 is not set | 193 | # CONFIG_FSL_ULI1575 is not set |
| 190 | CONFIG_PPC_BESTCOMM=y | 194 | CONFIG_PPC_BESTCOMM=y |
| 191 | # CONFIG_PPC_BESTCOMM_ATA is not set | 195 | CONFIG_PPC_BESTCOMM_ATA=y |
| 192 | CONFIG_PPC_BESTCOMM_FEC=y | 196 | CONFIG_PPC_BESTCOMM_FEC=y |
| 193 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 197 | # CONFIG_SIMPLE_GPIO is not set |
| 194 | 198 | ||
| 195 | # | 199 | # |
| 196 | # Kernel options | 200 | # Kernel options |
| @@ -217,6 +221,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 217 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 221 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 218 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 219 | # CONFIG_KEXEC is not set | 223 | # CONFIG_KEXEC is not set |
| 224 | # CONFIG_CRASH_DUMP is not set | ||
| 220 | CONFIG_ARCH_FLATMEM_ENABLE=y | 225 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 221 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 226 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 222 | CONFIG_SELECT_MEMORY_MODEL=y | 227 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -228,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 228 | CONFIG_PAGEFLAGS_EXTENDED=y | 233 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 230 | CONFIG_MIGRATION=y | 235 | CONFIG_MIGRATION=y |
| 231 | # CONFIG_RESOURCES_64BIT is not set | ||
| 232 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 236 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 233 | CONFIG_ZONE_DMA_FLAG=1 | 237 | CONFIG_ZONE_DMA_FLAG=1 |
| 234 | CONFIG_BOUNCE=y | 238 | CONFIG_BOUNCE=y |
| 235 | CONFIG_VIRT_TO_BUS=y | 239 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_UNEVICTABLE_LRU=y | 240 | CONFIG_UNEVICTABLE_LRU=y |
| 241 | CONFIG_PPC_4K_PAGES=y | ||
| 242 | # CONFIG_PPC_16K_PAGES is not set | ||
| 243 | # CONFIG_PPC_64K_PAGES is not set | ||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 244 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 238 | CONFIG_PROC_DEVICETREE=y | 245 | CONFIG_PROC_DEVICETREE=y |
| 239 | # CONFIG_CMDLINE_BOOL is not set | 246 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -274,6 +281,7 @@ CONFIG_NET=y | |||
| 274 | # | 281 | # |
| 275 | # Networking options | 282 | # Networking options |
| 276 | # | 283 | # |
| 284 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 277 | CONFIG_PACKET=y | 285 | CONFIG_PACKET=y |
| 278 | # CONFIG_PACKET_MMAP is not set | 286 | # CONFIG_PACKET_MMAP is not set |
| 279 | CONFIG_UNIX=y | 287 | CONFIG_UNIX=y |
| @@ -330,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 330 | # CONFIG_ECONET is not set | 338 | # CONFIG_ECONET is not set |
| 331 | # CONFIG_WAN_ROUTER is not set | 339 | # CONFIG_WAN_ROUTER is not set |
| 332 | # CONFIG_NET_SCHED is not set | 340 | # CONFIG_NET_SCHED is not set |
| 341 | # CONFIG_DCB is not set | ||
| 333 | 342 | ||
| 334 | # | 343 | # |
| 335 | # Network testing | 344 | # Network testing |
| @@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 342 | # CONFIG_AF_RXRPC is not set | 351 | # CONFIG_AF_RXRPC is not set |
| 343 | # CONFIG_PHONET is not set | 352 | # CONFIG_PHONET is not set |
| 344 | # CONFIG_WIRELESS is not set | 353 | # CONFIG_WIRELESS is not set |
| 354 | # CONFIG_WIMAX is not set | ||
| 345 | # CONFIG_RFKILL is not set | 355 | # CONFIG_RFKILL is not set |
| 346 | # CONFIG_NET_9P is not set | 356 | # CONFIG_NET_9P is not set |
| 347 | 357 | ||
| @@ -364,6 +374,7 @@ CONFIG_MTD=y | |||
| 364 | # CONFIG_MTD_DEBUG is not set | 374 | # CONFIG_MTD_DEBUG is not set |
| 365 | CONFIG_MTD_CONCAT=y | 375 | CONFIG_MTD_CONCAT=y |
| 366 | CONFIG_MTD_PARTITIONS=y | 376 | CONFIG_MTD_PARTITIONS=y |
| 377 | # CONFIG_MTD_TESTS is not set | ||
| 367 | # CONFIG_MTD_REDBOOT_PARTS is not set | 378 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 368 | CONFIG_MTD_CMDLINE_PARTS=y | 379 | CONFIG_MTD_CMDLINE_PARTS=y |
| 369 | # CONFIG_MTD_OF_PARTS is not set | 380 | # CONFIG_MTD_OF_PARTS is not set |
| @@ -433,6 +444,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 433 | # CONFIG_MTD_ONENAND is not set | 444 | # CONFIG_MTD_ONENAND is not set |
| 434 | 445 | ||
| 435 | # | 446 | # |
| 447 | # LPDDR flash memory drivers | ||
| 448 | # | ||
| 449 | # CONFIG_MTD_LPDDR is not set | ||
| 450 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 451 | |||
| 452 | # | ||
| 436 | # UBI - Unsorted block images | 453 | # UBI - Unsorted block images |
| 437 | # | 454 | # |
| 438 | # CONFIG_MTD_UBI is not set | 455 | # CONFIG_MTD_UBI is not set |
| @@ -496,6 +513,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 496 | # CONFIG_SCSI_SRP_ATTRS is not set | 513 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 497 | CONFIG_SCSI_LOWLEVEL=y | 514 | CONFIG_SCSI_LOWLEVEL=y |
| 498 | # CONFIG_ISCSI_TCP is not set | 515 | # CONFIG_ISCSI_TCP is not set |
| 516 | # CONFIG_LIBFC is not set | ||
| 499 | # CONFIG_SCSI_DEBUG is not set | 517 | # CONFIG_SCSI_DEBUG is not set |
| 500 | # CONFIG_SCSI_DH is not set | 518 | # CONFIG_SCSI_DH is not set |
| 501 | CONFIG_ATA=y | 519 | CONFIG_ATA=y |
| @@ -530,6 +548,9 @@ CONFIG_LXT_PHY=y | |||
| 530 | # CONFIG_BROADCOM_PHY is not set | 548 | # CONFIG_BROADCOM_PHY is not set |
| 531 | # CONFIG_ICPLUS_PHY is not set | 549 | # CONFIG_ICPLUS_PHY is not set |
| 532 | # CONFIG_REALTEK_PHY is not set | 550 | # CONFIG_REALTEK_PHY is not set |
| 551 | # CONFIG_NATIONAL_PHY is not set | ||
| 552 | # CONFIG_STE10XP is not set | ||
| 553 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 533 | # CONFIG_FIXED_PHY is not set | 554 | # CONFIG_FIXED_PHY is not set |
| 534 | # CONFIG_MDIO_BITBANG is not set | 555 | # CONFIG_MDIO_BITBANG is not set |
| 535 | CONFIG_NET_ETHERNET=y | 556 | CONFIG_NET_ETHERNET=y |
| @@ -555,6 +576,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 555 | # CONFIG_IWLWIFI_LEDS is not set | 576 | # CONFIG_IWLWIFI_LEDS is not set |
| 556 | 577 | ||
| 557 | # | 578 | # |
| 579 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 580 | # | ||
| 581 | |||
| 582 | # | ||
| 558 | # USB Network Adapters | 583 | # USB Network Adapters |
| 559 | # | 584 | # |
| 560 | # CONFIG_USB_CATC is not set | 585 | # CONFIG_USB_CATC is not set |
| @@ -604,8 +629,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
| 604 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 629 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
| 605 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 630 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
| 606 | CONFIG_UNIX98_PTYS=y | 631 | CONFIG_UNIX98_PTYS=y |
| 632 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 607 | CONFIG_LEGACY_PTYS=y | 633 | CONFIG_LEGACY_PTYS=y |
| 608 | CONFIG_LEGACY_PTY_COUNT=256 | 634 | CONFIG_LEGACY_PTY_COUNT=256 |
| 635 | # CONFIG_HVC_UDBG is not set | ||
| 609 | # CONFIG_IPMI_HANDLER is not set | 636 | # CONFIG_IPMI_HANDLER is not set |
| 610 | # CONFIG_HW_RANDOM is not set | 637 | # CONFIG_HW_RANDOM is not set |
| 611 | # CONFIG_NVRAM is not set | 638 | # CONFIG_NVRAM is not set |
| @@ -645,8 +672,6 @@ CONFIG_I2C_MPC=y | |||
| 645 | # Miscellaneous I2C Chip support | 672 | # Miscellaneous I2C Chip support |
| 646 | # | 673 | # |
| 647 | # CONFIG_DS1682 is not set | 674 | # CONFIG_DS1682 is not set |
| 648 | # CONFIG_EEPROM_AT24 is not set | ||
| 649 | # CONFIG_EEPROM_LEGACY is not set | ||
| 650 | # CONFIG_SENSORS_PCF8574 is not set | 675 | # CONFIG_SENSORS_PCF8574 is not set |
| 651 | # CONFIG_PCF8575 is not set | 676 | # CONFIG_PCF8575 is not set |
| 652 | # CONFIG_SENSORS_PCA9539 is not set | 677 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -675,6 +700,7 @@ CONFIG_HWMON=y | |||
| 675 | # CONFIG_SENSORS_ADT7462 is not set | 700 | # CONFIG_SENSORS_ADT7462 is not set |
| 676 | # CONFIG_SENSORS_ADT7470 is not set | 701 | # CONFIG_SENSORS_ADT7470 is not set |
| 677 | # CONFIG_SENSORS_ADT7473 is not set | 702 | # CONFIG_SENSORS_ADT7473 is not set |
| 703 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 678 | # CONFIG_SENSORS_ATXP1 is not set | 704 | # CONFIG_SENSORS_ATXP1 is not set |
| 679 | # CONFIG_SENSORS_DS1621 is not set | 705 | # CONFIG_SENSORS_DS1621 is not set |
| 680 | # CONFIG_SENSORS_F71805F is not set | 706 | # CONFIG_SENSORS_F71805F is not set |
| @@ -694,6 +720,7 @@ CONFIG_HWMON=y | |||
| 694 | # CONFIG_SENSORS_LM90 is not set | 720 | # CONFIG_SENSORS_LM90 is not set |
| 695 | # CONFIG_SENSORS_LM92 is not set | 721 | # CONFIG_SENSORS_LM92 is not set |
| 696 | # CONFIG_SENSORS_LM93 is not set | 722 | # CONFIG_SENSORS_LM93 is not set |
| 723 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 697 | # CONFIG_SENSORS_MAX1619 is not set | 724 | # CONFIG_SENSORS_MAX1619 is not set |
| 698 | # CONFIG_SENSORS_MAX6650 is not set | 725 | # CONFIG_SENSORS_MAX6650 is not set |
| 699 | # CONFIG_SENSORS_PC87360 is not set | 726 | # CONFIG_SENSORS_PC87360 is not set |
| @@ -742,10 +769,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 742 | # CONFIG_MFD_CORE is not set | 769 | # CONFIG_MFD_CORE is not set |
| 743 | # CONFIG_MFD_SM501 is not set | 770 | # CONFIG_MFD_SM501 is not set |
| 744 | # CONFIG_HTC_PASIC3 is not set | 771 | # CONFIG_HTC_PASIC3 is not set |
| 772 | # CONFIG_TWL4030_CORE is not set | ||
| 745 | # CONFIG_MFD_TMIO is not set | 773 | # CONFIG_MFD_TMIO is not set |
| 746 | # CONFIG_PMIC_DA903X is not set | 774 | # CONFIG_PMIC_DA903X is not set |
| 747 | # CONFIG_MFD_WM8400 is not set | 775 | # CONFIG_MFD_WM8400 is not set |
| 748 | # CONFIG_MFD_WM8350_I2C is not set | 776 | # CONFIG_MFD_WM8350_I2C is not set |
| 777 | # CONFIG_MFD_PCF50633 is not set | ||
| 749 | # CONFIG_REGULATOR is not set | 778 | # CONFIG_REGULATOR is not set |
| 750 | 779 | ||
| 751 | # | 780 | # |
| @@ -803,6 +832,7 @@ CONFIG_USB_MON=y | |||
| 803 | # USB Host Controller Drivers | 832 | # USB Host Controller Drivers |
| 804 | # | 833 | # |
| 805 | # CONFIG_USB_C67X00_HCD is not set | 834 | # CONFIG_USB_C67X00_HCD is not set |
| 835 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 806 | # CONFIG_USB_ISP116X_HCD is not set | 836 | # CONFIG_USB_ISP116X_HCD is not set |
| 807 | # CONFIG_USB_ISP1760_HCD is not set | 837 | # CONFIG_USB_ISP1760_HCD is not set |
| 808 | CONFIG_USB_OHCI_HCD=y | 838 | CONFIG_USB_OHCI_HCD=y |
| @@ -827,18 +857,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 827 | # CONFIG_USB_TMC is not set | 857 | # CONFIG_USB_TMC is not set |
| 828 | 858 | ||
| 829 | # | 859 | # |
| 830 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 860 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 831 | # | 861 | # |
| 832 | 862 | ||
| 833 | # | 863 | # |
| 834 | # may also be needed; see USB_STORAGE Help for more information | 864 | # see USB_STORAGE Help for more information |
| 835 | # | 865 | # |
| 836 | CONFIG_USB_STORAGE=y | 866 | CONFIG_USB_STORAGE=y |
| 837 | # CONFIG_USB_STORAGE_DEBUG is not set | 867 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 838 | # CONFIG_USB_STORAGE_DATAFAB is not set | 868 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 839 | # CONFIG_USB_STORAGE_FREECOM is not set | 869 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 840 | # CONFIG_USB_STORAGE_ISD200 is not set | 870 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 841 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 842 | # CONFIG_USB_STORAGE_USBAT is not set | 871 | # CONFIG_USB_STORAGE_USBAT is not set |
| 843 | # CONFIG_USB_STORAGE_SDDR09 is not set | 872 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 844 | # CONFIG_USB_STORAGE_SDDR55 is not set | 873 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| @@ -884,6 +913,10 @@ CONFIG_USB_STORAGE=y | |||
| 884 | # CONFIG_USB_ISIGHTFW is not set | 913 | # CONFIG_USB_ISIGHTFW is not set |
| 885 | # CONFIG_USB_VST is not set | 914 | # CONFIG_USB_VST is not set |
| 886 | # CONFIG_USB_GADGET is not set | 915 | # CONFIG_USB_GADGET is not set |
| 916 | |||
| 917 | # | ||
| 918 | # OTG and related infrastructure | ||
| 919 | # | ||
| 887 | # CONFIG_MMC is not set | 920 | # CONFIG_MMC is not set |
| 888 | # CONFIG_MEMSTICK is not set | 921 | # CONFIG_MEMSTICK is not set |
| 889 | # CONFIG_NEW_LEDS is not set | 922 | # CONFIG_NEW_LEDS is not set |
| @@ -947,7 +980,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 947 | # CONFIG_DMADEVICES is not set | 980 | # CONFIG_DMADEVICES is not set |
| 948 | # CONFIG_UIO is not set | 981 | # CONFIG_UIO is not set |
| 949 | # CONFIG_STAGING is not set | 982 | # CONFIG_STAGING is not set |
| 950 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 951 | 983 | ||
| 952 | # | 984 | # |
| 953 | # File systems | 985 | # File systems |
| @@ -968,6 +1000,7 @@ CONFIG_FS_MBCACHE=y | |||
| 968 | CONFIG_FILE_LOCKING=y | 1000 | CONFIG_FILE_LOCKING=y |
| 969 | # CONFIG_XFS_FS is not set | 1001 | # CONFIG_XFS_FS is not set |
| 970 | # CONFIG_OCFS2_FS is not set | 1002 | # CONFIG_OCFS2_FS is not set |
| 1003 | # CONFIG_BTRFS_FS is not set | ||
| 971 | CONFIG_DNOTIFY=y | 1004 | CONFIG_DNOTIFY=y |
| 972 | CONFIG_INOTIFY=y | 1005 | CONFIG_INOTIFY=y |
| 973 | CONFIG_INOTIFY_USER=y | 1006 | CONFIG_INOTIFY_USER=y |
| @@ -1004,10 +1037,7 @@ CONFIG_TMPFS=y | |||
| 1004 | # CONFIG_TMPFS_POSIX_ACL is not set | 1037 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1005 | # CONFIG_HUGETLB_PAGE is not set | 1038 | # CONFIG_HUGETLB_PAGE is not set |
| 1006 | # CONFIG_CONFIGFS_FS is not set | 1039 | # CONFIG_CONFIGFS_FS is not set |
| 1007 | 1040 | CONFIG_MISC_FILESYSTEMS=y | |
| 1008 | # | ||
| 1009 | # Miscellaneous filesystems | ||
| 1010 | # | ||
| 1011 | # CONFIG_ADFS_FS is not set | 1041 | # CONFIG_ADFS_FS is not set |
| 1012 | # CONFIG_AFFS_FS is not set | 1042 | # CONFIG_AFFS_FS is not set |
| 1013 | # CONFIG_HFS_FS is not set | 1043 | # CONFIG_HFS_FS is not set |
| @@ -1027,6 +1057,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1027 | CONFIG_JFFS2_RTIME=y | 1057 | CONFIG_JFFS2_RTIME=y |
| 1028 | # CONFIG_JFFS2_RUBIN is not set | 1058 | # CONFIG_JFFS2_RUBIN is not set |
| 1029 | CONFIG_CRAMFS=y | 1059 | CONFIG_CRAMFS=y |
| 1060 | # CONFIG_SQUASHFS is not set | ||
| 1030 | # CONFIG_VXFS_FS is not set | 1061 | # CONFIG_VXFS_FS is not set |
| 1031 | # CONFIG_MINIX_FS is not set | 1062 | # CONFIG_MINIX_FS is not set |
| 1032 | # CONFIG_OMFS_FS is not set | 1063 | # CONFIG_OMFS_FS is not set |
| @@ -1123,6 +1154,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1123 | # Library routines | 1154 | # Library routines |
| 1124 | # | 1155 | # |
| 1125 | CONFIG_BITREVERSE=y | 1156 | CONFIG_BITREVERSE=y |
| 1157 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1126 | # CONFIG_CRC_CCITT is not set | 1158 | # CONFIG_CRC_CCITT is not set |
| 1127 | # CONFIG_CRC16 is not set | 1159 | # CONFIG_CRC16 is not set |
| 1128 | # CONFIG_CRC_T10DIF is not set | 1160 | # CONFIG_CRC_T10DIF is not set |
| @@ -1174,6 +1206,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1174 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1206 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1175 | # CONFIG_DEBUG_LIST is not set | 1207 | # CONFIG_DEBUG_LIST is not set |
| 1176 | # CONFIG_DEBUG_SG is not set | 1208 | # CONFIG_DEBUG_SG is not set |
| 1209 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1177 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1210 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1178 | # CONFIG_RCU_TORTURE_TEST is not set | 1211 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1179 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1212 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -1182,6 +1215,8 @@ CONFIG_DEBUG_INFO=y | |||
| 1182 | # CONFIG_FAULT_INJECTION is not set | 1215 | # CONFIG_FAULT_INJECTION is not set |
| 1183 | # CONFIG_LATENCYTOP is not set | 1216 | # CONFIG_LATENCYTOP is not set |
| 1184 | CONFIG_HAVE_FUNCTION_TRACER=y | 1217 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1218 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1219 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1185 | 1220 | ||
| 1186 | # | 1221 | # |
| 1187 | # Tracers | 1222 | # Tracers |
| @@ -1190,11 +1225,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1190 | # CONFIG_SCHED_TRACER is not set | 1225 | # CONFIG_SCHED_TRACER is not set |
| 1191 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1226 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1192 | # CONFIG_BOOT_TRACER is not set | 1227 | # CONFIG_BOOT_TRACER is not set |
| 1228 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1193 | # CONFIG_STACK_TRACER is not set | 1229 | # CONFIG_STACK_TRACER is not set |
| 1194 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1230 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1195 | # CONFIG_SAMPLES is not set | 1231 | # CONFIG_SAMPLES is not set |
| 1196 | CONFIG_HAVE_ARCH_KGDB=y | 1232 | CONFIG_HAVE_ARCH_KGDB=y |
| 1197 | # CONFIG_KGDB is not set | 1233 | # CONFIG_KGDB is not set |
| 1234 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1198 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1235 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1199 | # CONFIG_DEBUG_STACK_USAGE is not set | 1236 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1200 | # CONFIG_DEBUG_PAGEALLOC is not set | 1237 | # CONFIG_DEBUG_PAGEALLOC is not set |
| @@ -1221,11 +1258,15 @@ CONFIG_CRYPTO=y | |||
| 1221 | # | 1258 | # |
| 1222 | # CONFIG_CRYPTO_FIPS is not set | 1259 | # CONFIG_CRYPTO_FIPS is not set |
| 1223 | CONFIG_CRYPTO_ALGAPI=y | 1260 | CONFIG_CRYPTO_ALGAPI=y |
| 1224 | CONFIG_CRYPTO_AEAD=y | 1261 | CONFIG_CRYPTO_ALGAPI2=y |
| 1262 | CONFIG_CRYPTO_AEAD2=y | ||
| 1225 | CONFIG_CRYPTO_BLKCIPHER=y | 1263 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1264 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1226 | CONFIG_CRYPTO_HASH=y | 1265 | CONFIG_CRYPTO_HASH=y |
| 1227 | CONFIG_CRYPTO_RNG=y | 1266 | CONFIG_CRYPTO_HASH2=y |
| 1267 | CONFIG_CRYPTO_RNG2=y | ||
| 1228 | CONFIG_CRYPTO_MANAGER=y | 1268 | CONFIG_CRYPTO_MANAGER=y |
| 1269 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1229 | # CONFIG_CRYPTO_GF128MUL is not set | 1270 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1230 | # CONFIG_CRYPTO_NULL is not set | 1271 | # CONFIG_CRYPTO_NULL is not set |
| 1231 | # CONFIG_CRYPTO_CRYPTD is not set | 1272 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 5ff3de205d6a..81afc8b373d7 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
| 4 | # Thu Nov 13 02:09:07 2008 | 4 | # Mon Jan 26 21:40:44 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
| 45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
| 46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
| 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
| 49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
| @@ -72,10 +72,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
| 74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
| 75 | |||
| 76 | # | ||
| 77 | # RCU Subsystem | ||
| 78 | # | ||
| 79 | CONFIG_CLASSIC_RCU=y | ||
| 80 | # CONFIG_TREE_RCU is not set | ||
| 81 | # CONFIG_PREEMPT_RCU is not set | ||
| 82 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 75 | # CONFIG_IKCONFIG is not set | 84 | # CONFIG_IKCONFIG is not set |
| 76 | CONFIG_LOG_BUF_SHIFT=14 | 85 | CONFIG_LOG_BUF_SHIFT=14 |
| 77 | # CONFIG_CGROUPS is not set | ||
| 78 | # CONFIG_GROUP_SCHED is not set | 86 | # CONFIG_GROUP_SCHED is not set |
| 87 | # CONFIG_CGROUPS is not set | ||
| 79 | CONFIG_SYSFS_DEPRECATED=y | 88 | CONFIG_SYSFS_DEPRECATED=y |
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | 89 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 81 | # CONFIG_RELAY is not set | 90 | # CONFIG_RELAY is not set |
| @@ -108,7 +117,6 @@ CONFIG_SLUB_DEBUG=y | |||
| 108 | CONFIG_SLUB=y | 117 | CONFIG_SLUB=y |
| 109 | # CONFIG_SLOB is not set | 118 | # CONFIG_SLOB is not set |
| 110 | # CONFIG_PROFILING is not set | 119 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | ||
| 112 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 114 | CONFIG_HAVE_IOREMAP_PROT=y | 122 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -119,7 +127,6 @@ CONFIG_HAVE_CLK=y | |||
| 119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 120 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| 122 | # CONFIG_TINY_SHMEM is not set | ||
| 123 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
| 124 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
| 125 | # CONFIG_MODULE_FORCE_LOAD is not set | 132 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -127,11 +134,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 127 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 134 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 128 | # CONFIG_MODVERSIONS is not set | 135 | # CONFIG_MODVERSIONS is not set |
| 129 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 136 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 130 | CONFIG_KMOD=y | ||
| 131 | CONFIG_BLOCK=y | 137 | CONFIG_BLOCK=y |
| 132 | # CONFIG_LBD is not set | 138 | # CONFIG_LBD is not set |
| 133 | # CONFIG_BLK_DEV_IO_TRACE is not set | 139 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 134 | # CONFIG_LSF is not set | ||
| 135 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
| 136 | # CONFIG_BLK_DEV_INTEGRITY is not set | 141 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 137 | 142 | ||
| @@ -147,7 +152,6 @@ CONFIG_DEFAULT_AS=y | |||
| 147 | # CONFIG_DEFAULT_CFQ is not set | 152 | # CONFIG_DEFAULT_CFQ is not set |
| 148 | # CONFIG_DEFAULT_NOOP is not set | 153 | # CONFIG_DEFAULT_NOOP is not set |
| 149 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 154 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 150 | CONFIG_CLASSIC_RCU=y | ||
| 151 | CONFIG_FREEZER=y | 155 | CONFIG_FREEZER=y |
| 152 | 156 | ||
| 153 | # | 157 | # |
| @@ -192,7 +196,7 @@ CONFIG_RTAS_PROC=y | |||
| 192 | CONFIG_PPC_BESTCOMM=y | 196 | CONFIG_PPC_BESTCOMM=y |
| 193 | CONFIG_PPC_BESTCOMM_ATA=y | 197 | CONFIG_PPC_BESTCOMM_ATA=y |
| 194 | CONFIG_PPC_BESTCOMM_FEC=y | 198 | CONFIG_PPC_BESTCOMM_FEC=y |
| 195 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 199 | # CONFIG_SIMPLE_GPIO is not set |
| 196 | 200 | ||
| 197 | # | 201 | # |
| 198 | # Kernel options | 202 | # Kernel options |
| @@ -220,6 +224,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 224 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 222 | # CONFIG_KEXEC is not set | 226 | # CONFIG_KEXEC is not set |
| 227 | # CONFIG_CRASH_DUMP is not set | ||
| 223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 228 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 229 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 225 | CONFIG_SELECT_MEMORY_MODEL=y | 230 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -231,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | 236 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 237 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 233 | CONFIG_MIGRATION=y | 238 | CONFIG_MIGRATION=y |
| 234 | # CONFIG_RESOURCES_64BIT is not set | ||
| 235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 239 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 236 | CONFIG_ZONE_DMA_FLAG=1 | 240 | CONFIG_ZONE_DMA_FLAG=1 |
| 237 | CONFIG_BOUNCE=y | 241 | CONFIG_BOUNCE=y |
| 238 | CONFIG_VIRT_TO_BUS=y | 242 | CONFIG_VIRT_TO_BUS=y |
| 239 | CONFIG_UNEVICTABLE_LRU=y | 243 | CONFIG_UNEVICTABLE_LRU=y |
| 244 | CONFIG_PPC_4K_PAGES=y | ||
| 245 | # CONFIG_PPC_16K_PAGES is not set | ||
| 246 | # CONFIG_PPC_64K_PAGES is not set | ||
| 240 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 241 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
| 242 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -264,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 264 | # CONFIG_PCI_MSI is not set | 271 | # CONFIG_PCI_MSI is not set |
| 265 | CONFIG_PCI_LEGACY=y | 272 | CONFIG_PCI_LEGACY=y |
| 266 | # CONFIG_PCI_DEBUG is not set | 273 | # CONFIG_PCI_DEBUG is not set |
| 274 | # CONFIG_PCI_STUB is not set | ||
| 267 | # CONFIG_PCCARD is not set | 275 | # CONFIG_PCCARD is not set |
| 268 | # CONFIG_HOTPLUG_PCI is not set | 276 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | # CONFIG_HAS_RAPIDIO is not set | 277 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -286,6 +294,7 @@ CONFIG_NET=y | |||
| 286 | # | 294 | # |
| 287 | # Networking options | 295 | # Networking options |
| 288 | # | 296 | # |
| 297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 289 | CONFIG_PACKET=y | 298 | CONFIG_PACKET=y |
| 290 | # CONFIG_PACKET_MMAP is not set | 299 | # CONFIG_PACKET_MMAP is not set |
| 291 | CONFIG_UNIX=y | 300 | CONFIG_UNIX=y |
| @@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 342 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
| 343 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
| 344 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
| 354 | # CONFIG_DCB is not set | ||
| 345 | 355 | ||
| 346 | # | 356 | # |
| 347 | # Network testing | 357 | # Network testing |
| @@ -354,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 354 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
| 355 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
| 356 | # CONFIG_WIRELESS is not set | 366 | # CONFIG_WIRELESS is not set |
| 367 | # CONFIG_WIMAX is not set | ||
| 357 | # CONFIG_RFKILL is not set | 368 | # CONFIG_RFKILL is not set |
| 358 | # CONFIG_NET_9P is not set | 369 | # CONFIG_NET_9P is not set |
| 359 | 370 | ||
| @@ -376,6 +387,7 @@ CONFIG_MTD=y | |||
| 376 | # CONFIG_MTD_DEBUG is not set | 387 | # CONFIG_MTD_DEBUG is not set |
| 377 | CONFIG_MTD_CONCAT=y | 388 | CONFIG_MTD_CONCAT=y |
| 378 | CONFIG_MTD_PARTITIONS=y | 389 | CONFIG_MTD_PARTITIONS=y |
| 390 | # CONFIG_MTD_TESTS is not set | ||
| 379 | # CONFIG_MTD_REDBOOT_PARTS is not set | 391 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 380 | CONFIG_MTD_CMDLINE_PARTS=y | 392 | CONFIG_MTD_CMDLINE_PARTS=y |
| 381 | # CONFIG_MTD_OF_PARTS is not set | 393 | # CONFIG_MTD_OF_PARTS is not set |
| @@ -447,6 +459,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 447 | # CONFIG_MTD_ONENAND is not set | 459 | # CONFIG_MTD_ONENAND is not set |
| 448 | 460 | ||
| 449 | # | 461 | # |
| 462 | # LPDDR flash memory drivers | ||
| 463 | # | ||
| 464 | # CONFIG_MTD_LPDDR is not set | ||
| 465 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 466 | |||
| 467 | # | ||
| 450 | # UBI - Unsorted block images | 468 | # UBI - Unsorted block images |
| 451 | # | 469 | # |
| 452 | # CONFIG_MTD_UBI is not set | 470 | # CONFIG_MTD_UBI is not set |
| @@ -474,13 +492,19 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 474 | # CONFIG_BLK_DEV_HD is not set | 492 | # CONFIG_BLK_DEV_HD is not set |
| 475 | CONFIG_MISC_DEVICES=y | 493 | CONFIG_MISC_DEVICES=y |
| 476 | # CONFIG_PHANTOM is not set | 494 | # CONFIG_PHANTOM is not set |
| 477 | # CONFIG_EEPROM_93CX6 is not set | ||
| 478 | # CONFIG_SGI_IOC4 is not set | 495 | # CONFIG_SGI_IOC4 is not set |
| 479 | # CONFIG_TIFM_CORE is not set | 496 | # CONFIG_TIFM_CORE is not set |
| 480 | # CONFIG_ICS932S401 is not set | 497 | # CONFIG_ICS932S401 is not set |
| 481 | # CONFIG_ENCLOSURE_SERVICES is not set | 498 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 482 | # CONFIG_HP_ILO is not set | 499 | # CONFIG_HP_ILO is not set |
| 483 | # CONFIG_C2PORT is not set | 500 | # CONFIG_C2PORT is not set |
| 501 | |||
| 502 | # | ||
| 503 | # EEPROM support | ||
| 504 | # | ||
| 505 | # CONFIG_EEPROM_AT24 is not set | ||
| 506 | # CONFIG_EEPROM_LEGACY is not set | ||
| 507 | # CONFIG_EEPROM_93CX6 is not set | ||
| 484 | CONFIG_HAVE_IDE=y | 508 | CONFIG_HAVE_IDE=y |
| 485 | # CONFIG_IDE is not set | 509 | # CONFIG_IDE is not set |
| 486 | 510 | ||
| @@ -539,6 +563,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 539 | # CONFIG_MEGARAID_SAS is not set | 563 | # CONFIG_MEGARAID_SAS is not set |
| 540 | # CONFIG_SCSI_HPTIOP is not set | 564 | # CONFIG_SCSI_HPTIOP is not set |
| 541 | # CONFIG_SCSI_BUSLOGIC is not set | 565 | # CONFIG_SCSI_BUSLOGIC is not set |
| 566 | # CONFIG_LIBFC is not set | ||
| 567 | # CONFIG_FCOE is not set | ||
| 542 | # CONFIG_SCSI_DMX3191D is not set | 568 | # CONFIG_SCSI_DMX3191D is not set |
| 543 | # CONFIG_SCSI_EATA is not set | 569 | # CONFIG_SCSI_EATA is not set |
| 544 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 570 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -659,6 +685,9 @@ CONFIG_PHYLIB=y | |||
| 659 | # CONFIG_BROADCOM_PHY is not set | 685 | # CONFIG_BROADCOM_PHY is not set |
| 660 | # CONFIG_ICPLUS_PHY is not set | 686 | # CONFIG_ICPLUS_PHY is not set |
| 661 | # CONFIG_REALTEK_PHY is not set | 687 | # CONFIG_REALTEK_PHY is not set |
| 688 | # CONFIG_NATIONAL_PHY is not set | ||
| 689 | # CONFIG_STE10XP is not set | ||
| 690 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 662 | # CONFIG_FIXED_PHY is not set | 691 | # CONFIG_FIXED_PHY is not set |
| 663 | # CONFIG_MDIO_BITBANG is not set | 692 | # CONFIG_MDIO_BITBANG is not set |
| 664 | CONFIG_NET_ETHERNET=y | 693 | CONFIG_NET_ETHERNET=y |
| @@ -693,6 +722,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 693 | # CONFIG_IWLWIFI_LEDS is not set | 722 | # CONFIG_IWLWIFI_LEDS is not set |
| 694 | 723 | ||
| 695 | # | 724 | # |
| 725 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 726 | # | ||
| 727 | |||
| 728 | # | ||
| 696 | # USB Network Adapters | 729 | # USB Network Adapters |
| 697 | # | 730 | # |
| 698 | # CONFIG_USB_CATC is not set | 731 | # CONFIG_USB_CATC is not set |
| @@ -774,9 +807,11 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
| 774 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 807 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
| 775 | # CONFIG_SERIAL_JSM is not set | 808 | # CONFIG_SERIAL_JSM is not set |
| 776 | CONFIG_UNIX98_PTYS=y | 809 | CONFIG_UNIX98_PTYS=y |
| 810 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 777 | CONFIG_LEGACY_PTYS=y | 811 | CONFIG_LEGACY_PTYS=y |
| 778 | CONFIG_LEGACY_PTY_COUNT=256 | 812 | CONFIG_LEGACY_PTY_COUNT=256 |
| 779 | # CONFIG_HVC_RTAS is not set | 813 | # CONFIG_HVC_RTAS is not set |
| 814 | # CONFIG_HVC_UDBG is not set | ||
| 780 | # CONFIG_IPMI_HANDLER is not set | 815 | # CONFIG_IPMI_HANDLER is not set |
| 781 | # CONFIG_HW_RANDOM is not set | 816 | # CONFIG_HW_RANDOM is not set |
| 782 | # CONFIG_NVRAM is not set | 817 | # CONFIG_NVRAM is not set |
| @@ -844,8 +879,6 @@ CONFIG_I2C_MPC=y | |||
| 844 | # Miscellaneous I2C Chip support | 879 | # Miscellaneous I2C Chip support |
| 845 | # | 880 | # |
| 846 | # CONFIG_DS1682 is not set | 881 | # CONFIG_DS1682 is not set |
| 847 | # CONFIG_EEPROM_AT24 is not set | ||
| 848 | # CONFIG_EEPROM_LEGACY is not set | ||
| 849 | # CONFIG_SENSORS_PCF8574 is not set | 882 | # CONFIG_SENSORS_PCF8574 is not set |
| 850 | # CONFIG_PCF8575 is not set | 883 | # CONFIG_PCF8575 is not set |
| 851 | # CONFIG_SENSORS_PCA9539 is not set | 884 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -874,6 +907,7 @@ CONFIG_HWMON=y | |||
| 874 | # CONFIG_SENSORS_ADT7462 is not set | 907 | # CONFIG_SENSORS_ADT7462 is not set |
| 875 | # CONFIG_SENSORS_ADT7470 is not set | 908 | # CONFIG_SENSORS_ADT7470 is not set |
| 876 | # CONFIG_SENSORS_ADT7473 is not set | 909 | # CONFIG_SENSORS_ADT7473 is not set |
| 910 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 877 | # CONFIG_SENSORS_ATXP1 is not set | 911 | # CONFIG_SENSORS_ATXP1 is not set |
| 878 | # CONFIG_SENSORS_DS1621 is not set | 912 | # CONFIG_SENSORS_DS1621 is not set |
| 879 | # CONFIG_SENSORS_I5K_AMB is not set | 913 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -894,6 +928,7 @@ CONFIG_HWMON=y | |||
| 894 | # CONFIG_SENSORS_LM90 is not set | 928 | # CONFIG_SENSORS_LM90 is not set |
| 895 | # CONFIG_SENSORS_LM92 is not set | 929 | # CONFIG_SENSORS_LM92 is not set |
| 896 | # CONFIG_SENSORS_LM93 is not set | 930 | # CONFIG_SENSORS_LM93 is not set |
| 931 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 897 | # CONFIG_SENSORS_MAX1619 is not set | 932 | # CONFIG_SENSORS_MAX1619 is not set |
| 898 | # CONFIG_SENSORS_MAX6650 is not set | 933 | # CONFIG_SENSORS_MAX6650 is not set |
| 899 | # CONFIG_SENSORS_PC87360 is not set | 934 | # CONFIG_SENSORS_PC87360 is not set |
| @@ -953,10 +988,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 953 | # CONFIG_MFD_CORE is not set | 988 | # CONFIG_MFD_CORE is not set |
| 954 | # CONFIG_MFD_SM501 is not set | 989 | # CONFIG_MFD_SM501 is not set |
| 955 | # CONFIG_HTC_PASIC3 is not set | 990 | # CONFIG_HTC_PASIC3 is not set |
| 991 | # CONFIG_TWL4030_CORE is not set | ||
| 956 | # CONFIG_MFD_TMIO is not set | 992 | # CONFIG_MFD_TMIO is not set |
| 957 | # CONFIG_PMIC_DA903X is not set | 993 | # CONFIG_PMIC_DA903X is not set |
| 958 | # CONFIG_MFD_WM8400 is not set | 994 | # CONFIG_MFD_WM8400 is not set |
| 959 | # CONFIG_MFD_WM8350_I2C is not set | 995 | # CONFIG_MFD_WM8350_I2C is not set |
| 996 | # CONFIG_MFD_PCF50633 is not set | ||
| 960 | # CONFIG_REGULATOR is not set | 997 | # CONFIG_REGULATOR is not set |
| 961 | 998 | ||
| 962 | # | 999 | # |
| @@ -1051,7 +1088,7 @@ CONFIG_LCD_CLASS_DEVICE=m | |||
| 1051 | # CONFIG_LCD_ILI9320 is not set | 1088 | # CONFIG_LCD_ILI9320 is not set |
| 1052 | # CONFIG_LCD_PLATFORM is not set | 1089 | # CONFIG_LCD_PLATFORM is not set |
| 1053 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1090 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1054 | # CONFIG_BACKLIGHT_CORGI is not set | 1091 | CONFIG_BACKLIGHT_GENERIC=y |
| 1055 | 1092 | ||
| 1056 | # | 1093 | # |
| 1057 | # Display device support | 1094 | # Display device support |
| @@ -1093,21 +1130,22 @@ CONFIG_HID_COMPAT=y | |||
| 1093 | CONFIG_HID_A4TECH=y | 1130 | CONFIG_HID_A4TECH=y |
| 1094 | # CONFIG_HID_APPLE is not set | 1131 | # CONFIG_HID_APPLE is not set |
| 1095 | CONFIG_HID_BELKIN=y | 1132 | CONFIG_HID_BELKIN=y |
| 1096 | CONFIG_HID_BRIGHT=y | ||
| 1097 | CONFIG_HID_CHERRY=y | 1133 | CONFIG_HID_CHERRY=y |
| 1098 | # CONFIG_HID_CHICONY is not set | 1134 | # CONFIG_HID_CHICONY is not set |
| 1099 | CONFIG_HID_CYPRESS=y | 1135 | CONFIG_HID_CYPRESS=y |
| 1100 | CONFIG_HID_DELL=y | ||
| 1101 | CONFIG_HID_EZKEY=y | 1136 | CONFIG_HID_EZKEY=y |
| 1102 | # CONFIG_HID_GYRATION is not set | 1137 | # CONFIG_HID_GYRATION is not set |
| 1103 | # CONFIG_HID_LOGITECH is not set | 1138 | # CONFIG_HID_LOGITECH is not set |
| 1104 | # CONFIG_HID_MICROSOFT is not set | 1139 | # CONFIG_HID_MICROSOFT is not set |
| 1105 | # CONFIG_HID_MONTEREY is not set | 1140 | # CONFIG_HID_MONTEREY is not set |
| 1141 | # CONFIG_HID_NTRIG is not set | ||
| 1106 | # CONFIG_HID_PANTHERLORD is not set | 1142 | # CONFIG_HID_PANTHERLORD is not set |
| 1107 | # CONFIG_HID_PETALYNX is not set | 1143 | # CONFIG_HID_PETALYNX is not set |
| 1108 | # CONFIG_HID_SAMSUNG is not set | 1144 | # CONFIG_HID_SAMSUNG is not set |
| 1109 | # CONFIG_HID_SONY is not set | 1145 | # CONFIG_HID_SONY is not set |
| 1110 | # CONFIG_HID_SUNPLUS is not set | 1146 | # CONFIG_HID_SUNPLUS is not set |
| 1147 | # CONFIG_GREENASIA_FF is not set | ||
| 1148 | # CONFIG_HID_TOPSEED is not set | ||
| 1111 | # CONFIG_THRUSTMASTER_FF is not set | 1149 | # CONFIG_THRUSTMASTER_FF is not set |
| 1112 | # CONFIG_ZEROPLUS_FF is not set | 1150 | # CONFIG_ZEROPLUS_FF is not set |
| 1113 | CONFIG_USB_SUPPORT=y | 1151 | CONFIG_USB_SUPPORT=y |
| @@ -1137,6 +1175,7 @@ CONFIG_USB_MON=y | |||
| 1137 | # | 1175 | # |
| 1138 | # CONFIG_USB_C67X00_HCD is not set | 1176 | # CONFIG_USB_C67X00_HCD is not set |
| 1139 | # CONFIG_USB_EHCI_HCD is not set | 1177 | # CONFIG_USB_EHCI_HCD is not set |
| 1178 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 1140 | # CONFIG_USB_ISP116X_HCD is not set | 1179 | # CONFIG_USB_ISP116X_HCD is not set |
| 1141 | # CONFIG_USB_ISP1760_HCD is not set | 1180 | # CONFIG_USB_ISP1760_HCD is not set |
| 1142 | CONFIG_USB_OHCI_HCD=y | 1181 | CONFIG_USB_OHCI_HCD=y |
| @@ -1164,18 +1203,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1164 | # CONFIG_USB_TMC is not set | 1203 | # CONFIG_USB_TMC is not set |
| 1165 | 1204 | ||
| 1166 | # | 1205 | # |
| 1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1206 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1168 | # | 1207 | # |
| 1169 | 1208 | ||
| 1170 | # | 1209 | # |
| 1171 | # may also be needed; see USB_STORAGE Help for more information | 1210 | # see USB_STORAGE Help for more information |
| 1172 | # | 1211 | # |
| 1173 | CONFIG_USB_STORAGE=y | 1212 | CONFIG_USB_STORAGE=y |
| 1174 | # CONFIG_USB_STORAGE_DEBUG is not set | 1213 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1175 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1214 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1176 | # CONFIG_USB_STORAGE_FREECOM is not set | 1215 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 1177 | # CONFIG_USB_STORAGE_ISD200 is not set | 1216 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 1178 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1179 | # CONFIG_USB_STORAGE_USBAT is not set | 1217 | # CONFIG_USB_STORAGE_USBAT is not set |
| 1180 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1218 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1181 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1219 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| @@ -1222,6 +1260,10 @@ CONFIG_USB_STORAGE=y | |||
| 1222 | # CONFIG_USB_ISIGHTFW is not set | 1260 | # CONFIG_USB_ISIGHTFW is not set |
| 1223 | # CONFIG_USB_VST is not set | 1261 | # CONFIG_USB_VST is not set |
| 1224 | # CONFIG_USB_GADGET is not set | 1262 | # CONFIG_USB_GADGET is not set |
| 1263 | |||
| 1264 | # | ||
| 1265 | # OTG and related infrastructure | ||
| 1266 | # | ||
| 1225 | # CONFIG_UWB is not set | 1267 | # CONFIG_UWB is not set |
| 1226 | # CONFIG_MMC is not set | 1268 | # CONFIG_MMC is not set |
| 1227 | # CONFIG_MEMSTICK is not set | 1269 | # CONFIG_MEMSTICK is not set |
| @@ -1243,7 +1285,6 @@ CONFIG_NEW_LEDS=y | |||
| 1243 | # CONFIG_DMADEVICES is not set | 1285 | # CONFIG_DMADEVICES is not set |
| 1244 | # CONFIG_UIO is not set | 1286 | # CONFIG_UIO is not set |
| 1245 | # CONFIG_STAGING is not set | 1287 | # CONFIG_STAGING is not set |
| 1246 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1247 | 1288 | ||
| 1248 | # | 1289 | # |
| 1249 | # File systems | 1290 | # File systems |
| @@ -1264,6 +1305,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1264 | CONFIG_FILE_LOCKING=y | 1305 | CONFIG_FILE_LOCKING=y |
| 1265 | # CONFIG_XFS_FS is not set | 1306 | # CONFIG_XFS_FS is not set |
| 1266 | # CONFIG_OCFS2_FS is not set | 1307 | # CONFIG_OCFS2_FS is not set |
| 1308 | # CONFIG_BTRFS_FS is not set | ||
| 1267 | CONFIG_DNOTIFY=y | 1309 | CONFIG_DNOTIFY=y |
| 1268 | CONFIG_INOTIFY=y | 1310 | CONFIG_INOTIFY=y |
| 1269 | CONFIG_INOTIFY_USER=y | 1311 | CONFIG_INOTIFY_USER=y |
| @@ -1300,10 +1342,7 @@ CONFIG_TMPFS=y | |||
| 1300 | # CONFIG_TMPFS_POSIX_ACL is not set | 1342 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1301 | # CONFIG_HUGETLB_PAGE is not set | 1343 | # CONFIG_HUGETLB_PAGE is not set |
| 1302 | # CONFIG_CONFIGFS_FS is not set | 1344 | # CONFIG_CONFIGFS_FS is not set |
| 1303 | 1345 | CONFIG_MISC_FILESYSTEMS=y | |
| 1304 | # | ||
| 1305 | # Miscellaneous filesystems | ||
| 1306 | # | ||
| 1307 | # CONFIG_ADFS_FS is not set | 1346 | # CONFIG_ADFS_FS is not set |
| 1308 | # CONFIG_AFFS_FS is not set | 1347 | # CONFIG_AFFS_FS is not set |
| 1309 | # CONFIG_HFS_FS is not set | 1348 | # CONFIG_HFS_FS is not set |
| @@ -1323,6 +1362,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1323 | CONFIG_JFFS2_RTIME=y | 1362 | CONFIG_JFFS2_RTIME=y |
| 1324 | # CONFIG_JFFS2_RUBIN is not set | 1363 | # CONFIG_JFFS2_RUBIN is not set |
| 1325 | CONFIG_CRAMFS=y | 1364 | CONFIG_CRAMFS=y |
| 1365 | # CONFIG_SQUASHFS is not set | ||
| 1326 | # CONFIG_VXFS_FS is not set | 1366 | # CONFIG_VXFS_FS is not set |
| 1327 | # CONFIG_MINIX_FS is not set | 1367 | # CONFIG_MINIX_FS is not set |
| 1328 | # CONFIG_OMFS_FS is not set | 1368 | # CONFIG_OMFS_FS is not set |
| @@ -1403,6 +1443,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1403 | # Library routines | 1443 | # Library routines |
| 1404 | # | 1444 | # |
| 1405 | CONFIG_BITREVERSE=y | 1445 | CONFIG_BITREVERSE=y |
| 1446 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1406 | # CONFIG_CRC_CCITT is not set | 1447 | # CONFIG_CRC_CCITT is not set |
| 1407 | # CONFIG_CRC16 is not set | 1448 | # CONFIG_CRC16 is not set |
| 1408 | # CONFIG_CRC_T10DIF is not set | 1449 | # CONFIG_CRC_T10DIF is not set |
| @@ -1454,6 +1495,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1454 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1495 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1455 | # CONFIG_DEBUG_LIST is not set | 1496 | # CONFIG_DEBUG_LIST is not set |
| 1456 | # CONFIG_DEBUG_SG is not set | 1497 | # CONFIG_DEBUG_SG is not set |
| 1498 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1457 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1499 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1458 | # CONFIG_RCU_TORTURE_TEST is not set | 1500 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1459 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1501 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -1462,6 +1504,8 @@ CONFIG_DEBUG_INFO=y | |||
| 1462 | # CONFIG_FAULT_INJECTION is not set | 1504 | # CONFIG_FAULT_INJECTION is not set |
| 1463 | # CONFIG_LATENCYTOP is not set | 1505 | # CONFIG_LATENCYTOP is not set |
| 1464 | CONFIG_HAVE_FUNCTION_TRACER=y | 1506 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1507 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1508 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1465 | 1509 | ||
| 1466 | # | 1510 | # |
| 1467 | # Tracers | 1511 | # Tracers |
| @@ -1470,11 +1514,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 1470 | # CONFIG_SCHED_TRACER is not set | 1514 | # CONFIG_SCHED_TRACER is not set |
| 1471 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1515 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1472 | # CONFIG_BOOT_TRACER is not set | 1516 | # CONFIG_BOOT_TRACER is not set |
| 1517 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1473 | # CONFIG_STACK_TRACER is not set | 1518 | # CONFIG_STACK_TRACER is not set |
| 1474 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1519 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1475 | # CONFIG_SAMPLES is not set | 1520 | # CONFIG_SAMPLES is not set |
| 1476 | CONFIG_HAVE_ARCH_KGDB=y | 1521 | CONFIG_HAVE_ARCH_KGDB=y |
| 1477 | # CONFIG_KGDB is not set | 1522 | # CONFIG_KGDB is not set |
| 1523 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1478 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1524 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1479 | # CONFIG_DEBUG_STACK_USAGE is not set | 1525 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1480 | # CONFIG_DEBUG_PAGEALLOC is not set | 1526 | # CONFIG_DEBUG_PAGEALLOC is not set |
| @@ -1501,11 +1547,15 @@ CONFIG_CRYPTO=y | |||
| 1501 | # | 1547 | # |
| 1502 | # CONFIG_CRYPTO_FIPS is not set | 1548 | # CONFIG_CRYPTO_FIPS is not set |
| 1503 | CONFIG_CRYPTO_ALGAPI=y | 1549 | CONFIG_CRYPTO_ALGAPI=y |
| 1504 | CONFIG_CRYPTO_AEAD=y | 1550 | CONFIG_CRYPTO_ALGAPI2=y |
| 1551 | CONFIG_CRYPTO_AEAD2=y | ||
| 1505 | CONFIG_CRYPTO_BLKCIPHER=y | 1552 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1553 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1506 | CONFIG_CRYPTO_HASH=y | 1554 | CONFIG_CRYPTO_HASH=y |
| 1507 | CONFIG_CRYPTO_RNG=y | 1555 | CONFIG_CRYPTO_HASH2=y |
| 1556 | CONFIG_CRYPTO_RNG2=y | ||
| 1508 | CONFIG_CRYPTO_MANAGER=y | 1557 | CONFIG_CRYPTO_MANAGER=y |
| 1558 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1509 | # CONFIG_CRYPTO_GF128MUL is not set | 1559 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1510 | # CONFIG_CRYPTO_NULL is not set | 1560 | # CONFIG_CRYPTO_NULL is not set |
| 1511 | # CONFIG_CRYPTO_CRYPTD is not set | 1561 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index da5a3855a0c4..19b12d2cbb4b 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | * 2 of the License, or (at your option) any later version. | 16 | * 2 of the License, or (at your option) any later version. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #define DEBUG | ||
| 20 | |||
| 21 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 22 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 23 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| @@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pci_dev) | |||
| 258 | } else { | 256 | } else { |
| 259 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", | 257 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", |
| 260 | oirq.size, oirq.specifier[0], oirq.specifier[1], | 258 | oirq.size, oirq.specifier[0], oirq.specifier[1], |
| 261 | oirq.controller->full_name); | 259 | oirq.controller ? oirq.controller->full_name : |
| 260 | "<default>"); | ||
| 262 | 261 | ||
| 263 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, | 262 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, |
| 264 | oirq.size); | 263 | oirq.size); |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index c3f2c21024e3..87ff522f28b5 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
| @@ -20,14 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | /* ======================================================================== */ | 22 | /* ======================================================================== */ |
| 23 | /* PCI windows config */ | ||
| 24 | /* ======================================================================== */ | ||
| 25 | |||
| 26 | #define MPC52xx_PCI_TARGET_IO 0xf0000000 | ||
| 27 | #define MPC52xx_PCI_TARGET_MEM 0x00000000 | ||
| 28 | |||
| 29 | |||
| 30 | /* ======================================================================== */ | ||
| 31 | /* Structures mapping & Defines for PCI Unit */ | 23 | /* Structures mapping & Defines for PCI Unit */ |
| 32 | /* ======================================================================== */ | 24 | /* ======================================================================== */ |
| 33 | 25 | ||
| @@ -244,7 +236,7 @@ static struct pci_ops mpc52xx_pci_ops = { | |||
| 244 | 236 | ||
| 245 | static void __init | 237 | static void __init |
| 246 | mpc52xx_pci_setup(struct pci_controller *hose, | 238 | mpc52xx_pci_setup(struct pci_controller *hose, |
| 247 | struct mpc52xx_pci __iomem *pci_regs) | 239 | struct mpc52xx_pci __iomem *pci_regs, phys_addr_t pci_phys) |
| 248 | { | 240 | { |
| 249 | struct resource *res; | 241 | struct resource *res; |
| 250 | u32 tmp; | 242 | u32 tmp; |
| @@ -314,10 +306,14 @@ mpc52xx_pci_setup(struct pci_controller *hose, | |||
| 314 | /* Set all the IWCR fields at once; they're in the same reg */ | 306 | /* Set all the IWCR fields at once; they're in the same reg */ |
| 315 | out_be32(&pci_regs->iwcr, MPC52xx_PCI_IWCR_PACK(iwcr0, iwcr1, iwcr2)); | 307 | out_be32(&pci_regs->iwcr, MPC52xx_PCI_IWCR_PACK(iwcr0, iwcr1, iwcr2)); |
| 316 | 308 | ||
| 317 | out_be32(&pci_regs->tbatr0, | 309 | /* Map IMMR onto PCI bus */ |
| 318 | MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_IO ); | 310 | pci_phys &= 0xfffc0000; /* bar0 has only 14 significant bits */ |
| 319 | out_be32(&pci_regs->tbatr1, | 311 | out_be32(&pci_regs->tbatr0, MPC52xx_PCI_TBATR_ENABLE | pci_phys); |
| 320 | MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_MEM ); | 312 | out_be32(&pci_regs->bar0, PCI_BASE_ADDRESS_MEM_PREFETCH | pci_phys); |
| 313 | |||
| 314 | /* Map memory onto PCI bus */ | ||
| 315 | out_be32(&pci_regs->tbatr1, MPC52xx_PCI_TBATR_ENABLE); | ||
| 316 | out_be32(&pci_regs->bar1, PCI_BASE_ADDRESS_MEM_PREFETCH); | ||
| 321 | 317 | ||
| 322 | out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD | MPC52xx_PCI_TCR_WCT8); | 318 | out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD | MPC52xx_PCI_TCR_WCT8); |
| 323 | 319 | ||
| @@ -414,7 +410,7 @@ mpc52xx_add_bridge(struct device_node *node) | |||
| 414 | 410 | ||
| 415 | /* Finish setting up PCI using values obtained by | 411 | /* Finish setting up PCI using values obtained by |
| 416 | * pci_proces_bridge_OF_ranges */ | 412 | * pci_proces_bridge_OF_ranges */ |
| 417 | mpc52xx_pci_setup(hose, pci_regs); | 413 | mpc52xx_pci_setup(hose, pci_regs, rsrc.start); |
| 418 | 414 | ||
| 419 | return 0; | 415 | return 0; |
| 420 | } | 416 | } |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 4064345cf144..fecbce6e7d7c 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -572,6 +572,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 572 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 572 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
| 573 | case PCI_DEVICE_ID_INTEL_ICH7_30: | 573 | case PCI_DEVICE_ID_INTEL_ICH7_30: |
| 574 | case PCI_DEVICE_ID_INTEL_ICH7_31: | 574 | case PCI_DEVICE_ID_INTEL_ICH7_31: |
| 575 | case PCI_DEVICE_ID_INTEL_TGP_LPC: | ||
| 575 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 576 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
| 576 | case PCI_DEVICE_ID_INTEL_ICH8_0: | 577 | case PCI_DEVICE_ID_INTEL_ICH8_0: |
| 577 | case PCI_DEVICE_ID_INTEL_ICH8_1: | 578 | case PCI_DEVICE_ID_INTEL_ICH8_1: |
diff --git a/block/blk-core.c b/block/blk-core.c index ca69f3d94100..29bcfac6c688 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -69,7 +69,7 @@ static void drive_stat_acct(struct request *rq, int new_io) | |||
| 69 | int rw = rq_data_dir(rq); | 69 | int rw = rq_data_dir(rq); |
| 70 | int cpu; | 70 | int cpu; |
| 71 | 71 | ||
| 72 | if (!blk_fs_request(rq) || !disk || !blk_queue_io_stat(disk->queue)) | 72 | if (!blk_fs_request(rq) || !disk || !blk_do_io_stat(disk->queue)) |
| 73 | return; | 73 | return; |
| 74 | 74 | ||
| 75 | cpu = part_stat_lock(); | 75 | cpu = part_stat_lock(); |
| @@ -1667,7 +1667,7 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) | |||
| 1667 | { | 1667 | { |
| 1668 | struct gendisk *disk = req->rq_disk; | 1668 | struct gendisk *disk = req->rq_disk; |
| 1669 | 1669 | ||
| 1670 | if (!disk || !blk_queue_io_stat(disk->queue)) | 1670 | if (!disk || !blk_do_io_stat(disk->queue)) |
| 1671 | return; | 1671 | return; |
| 1672 | 1672 | ||
| 1673 | if (blk_fs_request(req)) { | 1673 | if (blk_fs_request(req)) { |
| @@ -1686,7 +1686,7 @@ static void blk_account_io_done(struct request *req) | |||
| 1686 | { | 1686 | { |
| 1687 | struct gendisk *disk = req->rq_disk; | 1687 | struct gendisk *disk = req->rq_disk; |
| 1688 | 1688 | ||
| 1689 | if (!disk || !blk_queue_io_stat(disk->queue)) | 1689 | if (!disk || !blk_do_io_stat(disk->queue)) |
| 1690 | return; | 1690 | return; |
| 1691 | 1691 | ||
| 1692 | /* | 1692 | /* |
diff --git a/block/blk.h b/block/blk.h index 6e1ed40534e9..0dce92c37496 100644 --- a/block/blk.h +++ b/block/blk.h | |||
| @@ -108,4 +108,12 @@ static inline int blk_cpu_to_group(int cpu) | |||
| 108 | #endif | 108 | #endif |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static inline int blk_do_io_stat(struct request_queue *q) | ||
| 112 | { | ||
| 113 | if (q) | ||
| 114 | return blk_queue_io_stat(q); | ||
| 115 | |||
| 116 | return 0; | ||
| 117 | } | ||
| 118 | |||
| 111 | #endif | 119 | #endif |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index b1c6f68d98ce..3dad2299d9c5 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -465,6 +465,16 @@ config BLK_DEV_CS5535 | |||
| 465 | 465 | ||
| 466 | It is safe to say Y to this question. | 466 | It is safe to say Y to this question. |
| 467 | 467 | ||
| 468 | config BLK_DEV_CS5536 | ||
| 469 | tristate "CS5536 chipset support" | ||
| 470 | depends on X86_32 | ||
| 471 | select BLK_DEV_IDEDMA_PCI | ||
| 472 | help | ||
| 473 | This option enables support for the AMD CS5536 | ||
| 474 | companion chip used with the Geode LX processor family. | ||
| 475 | |||
| 476 | If unsure, say N. | ||
| 477 | |||
| 468 | config BLK_DEV_HPT366 | 478 | config BLK_DEV_HPT366 |
| 469 | tristate "HPT36X/37X chipset support" | 479 | tristate "HPT36X/37X chipset support" |
| 470 | select BLK_DEV_IDEDMA_PCI | 480 | select BLK_DEV_IDEDMA_PCI |
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index c2b9c93f0095..d0e3d7d5b467 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile | |||
| @@ -43,6 +43,7 @@ obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o | |||
| 43 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o | 43 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o |
| 44 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o | 44 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o |
| 45 | obj-$(CONFIG_BLK_DEV_CS5535) += cs5535.o | 45 | obj-$(CONFIG_BLK_DEV_CS5535) += cs5535.o |
| 46 | obj-$(CONFIG_BLK_DEV_CS5536) += cs5536.o | ||
| 46 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o | 47 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o |
| 47 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o | 48 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o |
| 48 | obj-$(CONFIG_BLK_DEV_DELKIN) += delkin_cb.o | 49 | obj-$(CONFIG_BLK_DEV_DELKIN) += delkin_cb.o |
diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c new file mode 100644 index 000000000000..7a62db719a46 --- /dev/null +++ b/drivers/ide/cs5536.c | |||
| @@ -0,0 +1,308 @@ | |||
| 1 | /* | ||
| 2 | * CS5536 PATA support | ||
| 3 | * (C) 2007 Martin K. Petersen <mkp@mkp.net> | ||
| 4 | * (C) 2009 Bartlomiej Zolnierkiewicz | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, | ||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | * GNU General Public License for more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program; if not, write to the Free Software | ||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 18 | * | ||
| 19 | * Documentation: | ||
| 20 | * Available from AMD web site. | ||
| 21 | * | ||
| 22 | * The IDE timing registers for the CS5536 live in the Geode Machine | ||
| 23 | * Specific Register file and not PCI config space. Most BIOSes | ||
| 24 | * virtualize the PCI registers so the chip looks like a standard IDE | ||
| 25 | * controller. Unfortunately not all implementations get this right. | ||
| 26 | * In particular some have problems with unaligned accesses to the | ||
| 27 | * virtualized PCI registers. This driver always does full dword | ||
| 28 | * writes to work around the issue. Also, in case of a bad BIOS this | ||
| 29 | * driver can be loaded with the "msr=1" parameter which forces using | ||
| 30 | * the Machine Specific Registers to configure the device. | ||
| 31 | */ | ||
| 32 | |||
| 33 | #include <linux/kernel.h> | ||
| 34 | #include <linux/module.h> | ||
| 35 | #include <linux/pci.h> | ||
| 36 | #include <linux/init.h> | ||
| 37 | #include <linux/ide.h> | ||
| 38 | #include <asm/msr.h> | ||
| 39 | |||
| 40 | #define DRV_NAME "cs5536" | ||
| 41 | |||
| 42 | enum { | ||
| 43 | MSR_IDE_CFG = 0x51300010, | ||
| 44 | PCI_IDE_CFG = 0x40, | ||
| 45 | |||
| 46 | CFG = 0, | ||
| 47 | DTC = 2, | ||
| 48 | CAST = 3, | ||
| 49 | ETC = 4, | ||
| 50 | |||
| 51 | IDE_CFG_CHANEN = (1 << 1), | ||
| 52 | IDE_CFG_CABLE = (1 << 17) | (1 << 16), | ||
| 53 | |||
| 54 | IDE_D0_SHIFT = 24, | ||
| 55 | IDE_D1_SHIFT = 16, | ||
| 56 | IDE_DRV_MASK = 0xff, | ||
| 57 | |||
| 58 | IDE_CAST_D0_SHIFT = 6, | ||
| 59 | IDE_CAST_D1_SHIFT = 4, | ||
| 60 | IDE_CAST_DRV_MASK = 0x3, | ||
| 61 | |||
| 62 | IDE_CAST_CMD_SHIFT = 24, | ||
| 63 | IDE_CAST_CMD_MASK = 0xff, | ||
| 64 | |||
| 65 | IDE_ETC_UDMA_MASK = 0xc0, | ||
| 66 | }; | ||
| 67 | |||
| 68 | static int use_msr; | ||
| 69 | |||
| 70 | static int cs5536_read(struct pci_dev *pdev, int reg, u32 *val) | ||
| 71 | { | ||
| 72 | if (unlikely(use_msr)) { | ||
| 73 | u32 dummy; | ||
| 74 | |||
| 75 | rdmsr(MSR_IDE_CFG + reg, *val, dummy); | ||
| 76 | return 0; | ||
| 77 | } | ||
| 78 | |||
| 79 | return pci_read_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); | ||
| 80 | } | ||
| 81 | |||
| 82 | static int cs5536_write(struct pci_dev *pdev, int reg, int val) | ||
| 83 | { | ||
| 84 | if (unlikely(use_msr)) { | ||
| 85 | wrmsr(MSR_IDE_CFG + reg, val, 0); | ||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | |||
| 89 | return pci_write_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); | ||
| 90 | } | ||
| 91 | |||
| 92 | static void cs5536_program_dtc(ide_drive_t *drive, u8 tim) | ||
| 93 | { | ||
| 94 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
| 95 | int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT; | ||
| 96 | u32 dtc; | ||
| 97 | |||
| 98 | cs5536_read(pdev, DTC, &dtc); | ||
| 99 | dtc &= ~(IDE_DRV_MASK << dshift); | ||
| 100 | dtc |= tim << dshift; | ||
| 101 | cs5536_write(pdev, DTC, dtc); | ||
| 102 | } | ||
| 103 | |||
| 104 | /** | ||
| 105 | * cs5536_cable_detect - detect cable type | ||
| 106 | * @hwif: Port to detect on | ||
| 107 | * | ||
| 108 | * Perform cable detection for ATA66 capable cable. | ||
| 109 | * | ||
| 110 | * Returns a cable type. | ||
| 111 | */ | ||
| 112 | |||
| 113 | static u8 cs5536_cable_detect(ide_hwif_t *hwif) | ||
| 114 | { | ||
| 115 | struct pci_dev *pdev = to_pci_dev(hwif->dev); | ||
| 116 | u32 cfg; | ||
| 117 | |||
| 118 | cs5536_read(pdev, CFG, &cfg); | ||
| 119 | |||
| 120 | if (cfg & IDE_CFG_CABLE) | ||
| 121 | return ATA_CBL_PATA80; | ||
| 122 | else | ||
| 123 | return ATA_CBL_PATA40; | ||
| 124 | } | ||
| 125 | |||
| 126 | /** | ||
| 127 | * cs5536_set_pio_mode - PIO timing setup | ||
| 128 | * @drive: ATA device | ||
| 129 | * @pio: PIO mode number | ||
| 130 | */ | ||
| 131 | |||
| 132 | static void cs5536_set_pio_mode(ide_drive_t *drive, const u8 pio) | ||
| 133 | { | ||
| 134 | static const u8 drv_timings[5] = { | ||
| 135 | 0x98, 0x55, 0x32, 0x21, 0x20, | ||
| 136 | }; | ||
| 137 | |||
| 138 | static const u8 addr_timings[5] = { | ||
| 139 | 0x2, 0x1, 0x0, 0x0, 0x0, | ||
| 140 | }; | ||
| 141 | |||
| 142 | static const u8 cmd_timings[5] = { | ||
| 143 | 0x99, 0x92, 0x90, 0x22, 0x20, | ||
| 144 | }; | ||
| 145 | |||
| 146 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
| 147 | ide_drive_t *pair = ide_get_pair_dev(drive); | ||
| 148 | int cshift = (drive->dn & 1) ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT; | ||
| 149 | u32 cast; | ||
| 150 | u8 cmd_pio = pio; | ||
| 151 | |||
| 152 | if (pair) | ||
| 153 | cmd_pio = min(pio, ide_get_best_pio_mode(pair, 255, 4)); | ||
| 154 | |||
| 155 | drive->drive_data &= (IDE_DRV_MASK << 8); | ||
| 156 | drive->drive_data |= drv_timings[pio]; | ||
| 157 | |||
| 158 | cs5536_program_dtc(drive, drv_timings[pio]); | ||
| 159 | |||
| 160 | cs5536_read(pdev, CAST, &cast); | ||
| 161 | |||
| 162 | cast &= ~(IDE_CAST_DRV_MASK << cshift); | ||
| 163 | cast |= addr_timings[pio] << cshift; | ||
| 164 | |||
| 165 | cast &= ~(IDE_CAST_CMD_MASK << IDE_CAST_CMD_SHIFT); | ||
| 166 | cast |= cmd_timings[cmd_pio] << IDE_CAST_CMD_SHIFT; | ||
| 167 | |||
| 168 | cs5536_write(pdev, CAST, cast); | ||
| 169 | } | ||
| 170 | |||
| 171 | /** | ||
| 172 | * cs5536_set_dma_mode - DMA timing setup | ||
| 173 | * @drive: ATA device | ||
| 174 | * @mode: DMA mode | ||
| 175 | */ | ||
| 176 | |||
| 177 | static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) | ||
| 178 | { | ||
| 179 | static const u8 udma_timings[6] = { | ||
| 180 | 0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6, | ||
| 181 | }; | ||
| 182 | |||
| 183 | static const u8 mwdma_timings[3] = { | ||
| 184 | 0x67, 0x21, 0x20, | ||
| 185 | }; | ||
| 186 | |||
| 187 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
| 188 | int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT; | ||
| 189 | u32 etc; | ||
| 190 | |||
| 191 | cs5536_read(pdev, ETC, &etc); | ||
| 192 | |||
| 193 | if (mode >= XFER_UDMA_0) { | ||
| 194 | etc &= ~(IDE_DRV_MASK << dshift); | ||
| 195 | etc |= udma_timings[mode - XFER_UDMA_0] << dshift; | ||
| 196 | } else { /* MWDMA */ | ||
| 197 | etc &= ~(IDE_ETC_UDMA_MASK << dshift); | ||
| 198 | drive->drive_data &= IDE_DRV_MASK; | ||
| 199 | drive->drive_data |= mwdma_timings[mode - XFER_MW_DMA_0] << 8; | ||
| 200 | } | ||
| 201 | |||
| 202 | cs5536_write(pdev, ETC, etc); | ||
| 203 | } | ||
| 204 | |||
| 205 | static void cs5536_dma_start(ide_drive_t *drive) | ||
| 206 | { | ||
| 207 | if (drive->current_speed < XFER_UDMA_0 && | ||
| 208 | (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK)) | ||
| 209 | cs5536_program_dtc(drive, drive->drive_data >> 8); | ||
| 210 | |||
| 211 | ide_dma_start(drive); | ||
| 212 | } | ||
| 213 | |||
| 214 | static int cs5536_dma_end(ide_drive_t *drive) | ||
| 215 | { | ||
| 216 | int ret = ide_dma_end(drive); | ||
| 217 | |||
| 218 | if (drive->current_speed < XFER_UDMA_0 && | ||
| 219 | (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK)) | ||
| 220 | cs5536_program_dtc(drive, drive->drive_data & IDE_DRV_MASK); | ||
| 221 | |||
| 222 | return ret; | ||
| 223 | } | ||
| 224 | |||
| 225 | static const struct ide_port_ops cs5536_port_ops = { | ||
| 226 | .set_pio_mode = cs5536_set_pio_mode, | ||
| 227 | .set_dma_mode = cs5536_set_dma_mode, | ||
| 228 | .cable_detect = cs5536_cable_detect, | ||
| 229 | }; | ||
| 230 | |||
| 231 | static const struct ide_dma_ops cs5536_dma_ops = { | ||
| 232 | .dma_host_set = ide_dma_host_set, | ||
| 233 | .dma_setup = ide_dma_setup, | ||
| 234 | .dma_exec_cmd = ide_dma_exec_cmd, | ||
| 235 | .dma_start = cs5536_dma_start, | ||
| 236 | .dma_end = cs5536_dma_end, | ||
| 237 | .dma_test_irq = ide_dma_test_irq, | ||
| 238 | .dma_lost_irq = ide_dma_lost_irq, | ||
| 239 | .dma_timeout = ide_dma_timeout, | ||
| 240 | }; | ||
| 241 | |||
| 242 | static const struct ide_port_info cs5536_info = { | ||
| 243 | .name = DRV_NAME, | ||
| 244 | .port_ops = &cs5536_port_ops, | ||
| 245 | .dma_ops = &cs5536_dma_ops, | ||
| 246 | .host_flags = IDE_HFLAG_SINGLE, | ||
| 247 | .pio_mask = ATA_PIO4, | ||
| 248 | .mwdma_mask = ATA_MWDMA2, | ||
| 249 | .udma_mask = ATA_UDMA5, | ||
| 250 | }; | ||
| 251 | |||
| 252 | /** | ||
| 253 | * cs5536_init_one | ||
| 254 | * @dev: PCI device | ||
| 255 | * @id: Entry in match table | ||
| 256 | */ | ||
| 257 | |||
| 258 | static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id) | ||
| 259 | { | ||
| 260 | u32 cfg; | ||
| 261 | |||
| 262 | if (use_msr) | ||
| 263 | printk(KERN_INFO DRV_NAME ": Using MSR regs instead of PCI\n"); | ||
| 264 | |||
| 265 | cs5536_read(dev, CFG, &cfg); | ||
| 266 | |||
| 267 | if ((cfg & IDE_CFG_CHANEN) == 0) { | ||
| 268 | printk(KERN_ERR DRV_NAME ": disabled by BIOS\n"); | ||
| 269 | return -ENODEV; | ||
| 270 | } | ||
| 271 | |||
| 272 | return ide_pci_init_one(dev, &cs5536_info, NULL); | ||
| 273 | } | ||
| 274 | |||
| 275 | static const struct pci_device_id cs5536_pci_tbl[] = { | ||
| 276 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), }, | ||
| 277 | { }, | ||
| 278 | }; | ||
| 279 | |||
| 280 | static struct pci_driver cs5536_pci_driver = { | ||
| 281 | .name = DRV_NAME, | ||
| 282 | .id_table = cs5536_pci_tbl, | ||
| 283 | .probe = cs5536_init_one, | ||
| 284 | .remove = ide_pci_remove, | ||
| 285 | .suspend = ide_pci_suspend, | ||
| 286 | .resume = ide_pci_resume, | ||
| 287 | }; | ||
| 288 | |||
| 289 | static int __init cs5536_init(void) | ||
| 290 | { | ||
| 291 | return pci_register_driver(&cs5536_pci_driver); | ||
| 292 | } | ||
| 293 | |||
| 294 | static void __exit cs5536_exit(void) | ||
| 295 | { | ||
| 296 | pci_unregister_driver(&cs5536_pci_driver); | ||
| 297 | } | ||
| 298 | |||
| 299 | MODULE_AUTHOR("Martin K. Petersen, Bartlomiej Zolnierkiewicz"); | ||
| 300 | MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller"); | ||
| 301 | MODULE_LICENSE("GPL"); | ||
| 302 | MODULE_DEVICE_TABLE(pci, cs5536_pci_tbl); | ||
| 303 | |||
| 304 | module_param_named(msr, use_msr, int, 0644); | ||
| 305 | MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); | ||
| 306 | |||
| 307 | module_init(cs5536_init); | ||
| 308 | module_exit(cs5536_exit); | ||
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 97a35c667aee..415d7e24f2b6 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
| @@ -534,7 +534,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
| 534 | d.dma_ops = NULL; | 534 | d.dma_ops = NULL; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | ret = ide_host_register(host, NULL, hws); | 537 | ret = ide_host_register(host, &d, hws); |
| 538 | if (ret) | 538 | if (ret) |
| 539 | goto err_free; | 539 | goto err_free; |
| 540 | 540 | ||
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index d8f295bdad76..ec7d07fa570a 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
| @@ -282,7 +282,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, | |||
| 282 | port = hwif->channel ? drive->dn - 2: drive->dn; | 282 | port = hwif->channel ? drive->dn - 2: drive->dn; |
| 283 | 283 | ||
| 284 | DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", | 284 | DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", |
| 285 | hwif->name, dev->bus_id, port, hwif->channel); | 285 | hwif->name, dev_name(dev), port, hwif->channel); |
| 286 | 286 | ||
| 287 | if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { | 287 | if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { |
| 288 | DEBPRINT("%s drive %d:%d not present\n", | 288 | DEBPRINT("%s drive %d:%d not present\n", |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index cae69372cf45..0bfeb0c79d6e 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -787,6 +787,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
| 787 | if (blk_fs_request(rq)) { | 787 | if (blk_fs_request(rq)) { |
| 788 | ide_end_request(drive, 1, rq->nr_sectors); | 788 | ide_end_request(drive, 1, rq->nr_sectors); |
| 789 | return ide_stopped; | 789 | return ide_stopped; |
| 790 | } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) { | ||
| 791 | ide_end_request(drive, 1, 1); | ||
| 792 | return ide_stopped; | ||
| 790 | } | 793 | } |
| 791 | goto end_request; | 794 | goto end_request; |
| 792 | } | 795 | } |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index cc163319dfbd..9ee51adf567f 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -418,11 +418,14 @@ void ide_map_sg(ide_drive_t *drive, struct request *rq) | |||
| 418 | ide_hwif_t *hwif = drive->hwif; | 418 | ide_hwif_t *hwif = drive->hwif; |
| 419 | struct scatterlist *sg = hwif->sg_table; | 419 | struct scatterlist *sg = hwif->sg_table; |
| 420 | 420 | ||
| 421 | if (rq->cmd_type != REQ_TYPE_ATA_TASKFILE) { | 421 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { |
| 422 | hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg); | ||
| 423 | } else { | ||
| 424 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); | 422 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); |
| 425 | hwif->sg_nents = 1; | 423 | hwif->sg_nents = 1; |
| 424 | } else if (!rq->bio) { | ||
| 425 | sg_init_one(sg, rq->data, rq->data_len); | ||
| 426 | hwif->sg_nents = 1; | ||
| 427 | } else { | ||
| 428 | hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg); | ||
| 426 | } | 429 | } |
| 427 | } | 430 | } |
| 428 | 431 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 0db1ed9f5fc2..ce0818a993f6 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -1467,6 +1467,30 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws) | |||
| 1467 | } | 1467 | } |
| 1468 | EXPORT_SYMBOL_GPL(ide_host_alloc); | 1468 | EXPORT_SYMBOL_GPL(ide_host_alloc); |
| 1469 | 1469 | ||
| 1470 | static void ide_port_free(ide_hwif_t *hwif) | ||
| 1471 | { | ||
| 1472 | ide_port_free_devices(hwif); | ||
| 1473 | ide_free_port_slot(hwif->index); | ||
| 1474 | kfree(hwif); | ||
| 1475 | } | ||
| 1476 | |||
| 1477 | static void ide_disable_port(ide_hwif_t *hwif) | ||
| 1478 | { | ||
| 1479 | struct ide_host *host = hwif->host; | ||
| 1480 | int i; | ||
| 1481 | |||
| 1482 | printk(KERN_INFO "%s: disabling port\n", hwif->name); | ||
| 1483 | |||
| 1484 | for (i = 0; i < MAX_HOST_PORTS; i++) { | ||
| 1485 | if (host->ports[i] == hwif) { | ||
| 1486 | host->ports[i] = NULL; | ||
| 1487 | host->n_ports--; | ||
| 1488 | } | ||
| 1489 | } | ||
| 1490 | |||
| 1491 | ide_port_free(hwif); | ||
| 1492 | } | ||
| 1493 | |||
| 1470 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | 1494 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, |
| 1471 | hw_regs_t **hws) | 1495 | hw_regs_t **hws) |
| 1472 | { | 1496 | { |
| @@ -1507,8 +1531,12 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
| 1507 | hwif->present = 1; | 1531 | hwif->present = 1; |
| 1508 | 1532 | ||
| 1509 | if (hwif->chipset != ide_4drives || !hwif->mate || | 1533 | if (hwif->chipset != ide_4drives || !hwif->mate || |
| 1510 | !hwif->mate->present) | 1534 | !hwif->mate->present) { |
| 1511 | ide_register_port(hwif); | 1535 | if (ide_register_port(hwif)) { |
| 1536 | ide_disable_port(hwif); | ||
| 1537 | continue; | ||
| 1538 | } | ||
| 1539 | } | ||
| 1512 | 1540 | ||
| 1513 | if (hwif->present) | 1541 | if (hwif->present) |
| 1514 | ide_port_tune_devices(hwif); | 1542 | ide_port_tune_devices(hwif); |
| @@ -1521,7 +1549,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
| 1521 | if (hwif_init(hwif) == 0) { | 1549 | if (hwif_init(hwif) == 0) { |
| 1522 | printk(KERN_INFO "%s: failed to initialize IDE " | 1550 | printk(KERN_INFO "%s: failed to initialize IDE " |
| 1523 | "interface\n", hwif->name); | 1551 | "interface\n", hwif->name); |
| 1524 | hwif->present = 0; | 1552 | device_unregister(&hwif->gendev); |
| 1553 | ide_disable_port(hwif); | ||
| 1525 | continue; | 1554 | continue; |
| 1526 | } | 1555 | } |
| 1527 | 1556 | ||
| @@ -1660,12 +1689,8 @@ void ide_host_free(struct ide_host *host) | |||
| 1660 | int i; | 1689 | int i; |
| 1661 | 1690 | ||
| 1662 | ide_host_for_each_port(i, hwif, host) { | 1691 | ide_host_for_each_port(i, hwif, host) { |
| 1663 | if (hwif == NULL) | 1692 | if (hwif) |
| 1664 | continue; | 1693 | ide_port_free(hwif); |
| 1665 | |||
| 1666 | ide_port_free_devices(hwif); | ||
| 1667 | ide_free_port_slot(hwif->index); | ||
| 1668 | kfree(hwif); | ||
| 1669 | } | 1694 | } |
| 1670 | 1695 | ||
| 1671 | kfree(host); | 1696 | kfree(host); |
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 882f6f07c476..40b0812a045c 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
| @@ -261,9 +261,9 @@ static int tx4939ide_build_dmatable(ide_drive_t *drive, struct request *rq) | |||
| 261 | bcount = cur_len; | 261 | bcount = cur_len; |
| 262 | /* | 262 | /* |
| 263 | * This workaround for zero count seems required. | 263 | * This workaround for zero count seems required. |
| 264 | * (standard ide_build_dmatable do it too) | 264 | * (standard ide_build_dmatable does it too) |
| 265 | */ | 265 | */ |
| 266 | if ((bcount & 0xffff) == 0x0000) | 266 | if (bcount == 0x10000) |
| 267 | bcount = 0x8000; | 267 | bcount = 0x8000; |
| 268 | *table++ = bcount & 0xffff; | 268 | *table++ = bcount & 0xffff; |
| 269 | *table++ = cur_addr; | 269 | *table++ = cur_addr; |
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index 703c3eeb20a8..6092fe3f409d 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c | |||
| @@ -448,6 +448,11 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i | |||
| 448 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; | 448 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; |
| 449 | #endif | 449 | #endif |
| 450 | 450 | ||
| 451 | #ifdef CONFIG_AMIGAONE | ||
| 452 | if (machine_is(amigaone)) | ||
| 453 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; | ||
| 454 | #endif | ||
| 455 | |||
| 451 | d.udma_mask = via_config->udma_mask; | 456 | d.udma_mask = via_config->udma_mask; |
| 452 | 457 | ||
| 453 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); | 458 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 6098b626811f..47fee05eaefb 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
| @@ -576,6 +576,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c) | |||
| 576 | vv->vflip = c->value; | 576 | vv->vflip = c->value; |
| 577 | break; | 577 | break; |
| 578 | default: { | 578 | default: { |
| 579 | mutex_unlock(&dev->lock); | ||
| 579 | return -EINVAL; | 580 | return -EINVAL; |
| 580 | } | 581 | } |
| 581 | } | 582 | } |
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c index 64379f2bf237..3ec28945c26f 100644 --- a/drivers/media/common/tuners/mxl5007t.c +++ b/drivers/media/common/tuners/mxl5007t.c | |||
| @@ -657,7 +657,7 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status) | |||
| 657 | { | 657 | { |
| 658 | struct mxl5007t_state *state = fe->tuner_priv; | 658 | struct mxl5007t_state *state = fe->tuner_priv; |
| 659 | int rf_locked, ref_locked; | 659 | int rf_locked, ref_locked; |
| 660 | s32 rf_input_level; | 660 | s32 rf_input_level = 0; |
| 661 | int ret; | 661 | int ret; |
| 662 | 662 | ||
| 663 | if (fe->ops.i2c_gate_ctrl) | 663 | if (fe->ops.i2c_gate_ctrl) |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 98ee16773ff2..7e3aeaa7370f 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
| @@ -93,6 +93,9 @@ struct dvb_ca_slot { | |||
| 93 | /* current state of the CAM */ | 93 | /* current state of the CAM */ |
| 94 | int slot_state; | 94 | int slot_state; |
| 95 | 95 | ||
| 96 | /* mutex used for serializing access to one CI slot */ | ||
| 97 | struct mutex slot_lock; | ||
| 98 | |||
| 96 | /* Number of CAMCHANGES that have occurred since last processing */ | 99 | /* Number of CAMCHANGES that have occurred since last processing */ |
| 97 | atomic_t camchange_count; | 100 | atomic_t camchange_count; |
| 98 | 101 | ||
| @@ -711,14 +714,20 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * b | |||
| 711 | dprintk("%s\n", __func__); | 714 | dprintk("%s\n", __func__); |
| 712 | 715 | ||
| 713 | 716 | ||
| 714 | // sanity check | 717 | /* sanity check */ |
| 715 | if (bytes_write > ca->slot_info[slot].link_buf_size) | 718 | if (bytes_write > ca->slot_info[slot].link_buf_size) |
| 716 | return -EINVAL; | 719 | return -EINVAL; |
| 717 | 720 | ||
| 718 | /* check if interface is actually waiting for us to read from it, or if a read is in progress */ | 721 | /* it is possible we are dealing with a single buffer implementation, |
| 722 | thus if there is data available for read or if there is even a read | ||
| 723 | already in progress, we do nothing but awake the kernel thread to | ||
| 724 | process the data if necessary. */ | ||
| 719 | if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) | 725 | if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) |
| 720 | goto exitnowrite; | 726 | goto exitnowrite; |
| 721 | if (status & (STATUSREG_DA | STATUSREG_RE)) { | 727 | if (status & (STATUSREG_DA | STATUSREG_RE)) { |
| 728 | if (status & STATUSREG_DA) | ||
| 729 | dvb_ca_en50221_thread_wakeup(ca); | ||
| 730 | |||
| 722 | status = -EAGAIN; | 731 | status = -EAGAIN; |
| 723 | goto exitnowrite; | 732 | goto exitnowrite; |
| 724 | } | 733 | } |
| @@ -987,6 +996,8 @@ static int dvb_ca_en50221_thread(void *data) | |||
| 987 | /* go through all the slots processing them */ | 996 | /* go through all the slots processing them */ |
| 988 | for (slot = 0; slot < ca->slot_count; slot++) { | 997 | for (slot = 0; slot < ca->slot_count; slot++) { |
| 989 | 998 | ||
| 999 | mutex_lock(&ca->slot_info[slot].slot_lock); | ||
| 1000 | |||
| 990 | // check the cam status + deal with CAMCHANGEs | 1001 | // check the cam status + deal with CAMCHANGEs |
| 991 | while (dvb_ca_en50221_check_camstatus(ca, slot)) { | 1002 | while (dvb_ca_en50221_check_camstatus(ca, slot)) { |
| 992 | /* clear down an old CI slot if necessary */ | 1003 | /* clear down an old CI slot if necessary */ |
| @@ -1122,7 +1133,7 @@ static int dvb_ca_en50221_thread(void *data) | |||
| 1122 | 1133 | ||
| 1123 | case DVB_CA_SLOTSTATE_RUNNING: | 1134 | case DVB_CA_SLOTSTATE_RUNNING: |
| 1124 | if (!ca->open) | 1135 | if (!ca->open) |
| 1125 | continue; | 1136 | break; |
| 1126 | 1137 | ||
| 1127 | // poll slots for data | 1138 | // poll slots for data |
| 1128 | pktcount = 0; | 1139 | pktcount = 0; |
| @@ -1146,6 +1157,8 @@ static int dvb_ca_en50221_thread(void *data) | |||
| 1146 | } | 1157 | } |
| 1147 | break; | 1158 | break; |
| 1148 | } | 1159 | } |
| 1160 | |||
| 1161 | mutex_unlock(&ca->slot_info[slot].slot_lock); | ||
| 1149 | } | 1162 | } |
| 1150 | } | 1163 | } |
| 1151 | 1164 | ||
| @@ -1181,6 +1194,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file, | |||
| 1181 | switch (cmd) { | 1194 | switch (cmd) { |
| 1182 | case CA_RESET: | 1195 | case CA_RESET: |
| 1183 | for (slot = 0; slot < ca->slot_count; slot++) { | 1196 | for (slot = 0; slot < ca->slot_count; slot++) { |
| 1197 | mutex_lock(&ca->slot_info[slot].slot_lock); | ||
| 1184 | if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_NONE) { | 1198 | if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_NONE) { |
| 1185 | dvb_ca_en50221_slot_shutdown(ca, slot); | 1199 | dvb_ca_en50221_slot_shutdown(ca, slot); |
| 1186 | if (ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE) | 1200 | if (ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE) |
| @@ -1188,6 +1202,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file, | |||
| 1188 | slot, | 1202 | slot, |
| 1189 | DVB_CA_EN50221_CAMCHANGE_INSERTED); | 1203 | DVB_CA_EN50221_CAMCHANGE_INSERTED); |
| 1190 | } | 1204 | } |
| 1205 | mutex_unlock(&ca->slot_info[slot].slot_lock); | ||
| 1191 | } | 1206 | } |
| 1192 | ca->next_read_slot = 0; | 1207 | ca->next_read_slot = 0; |
| 1193 | dvb_ca_en50221_thread_wakeup(ca); | 1208 | dvb_ca_en50221_thread_wakeup(ca); |
| @@ -1308,7 +1323,9 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file, | |||
| 1308 | goto exit; | 1323 | goto exit; |
| 1309 | } | 1324 | } |
| 1310 | 1325 | ||
| 1326 | mutex_lock(&ca->slot_info[slot].slot_lock); | ||
| 1311 | status = dvb_ca_en50221_write_data(ca, slot, fragbuf, fraglen + 2); | 1327 | status = dvb_ca_en50221_write_data(ca, slot, fragbuf, fraglen + 2); |
| 1328 | mutex_unlock(&ca->slot_info[slot].slot_lock); | ||
| 1312 | if (status == (fraglen + 2)) { | 1329 | if (status == (fraglen + 2)) { |
| 1313 | written = 1; | 1330 | written = 1; |
| 1314 | break; | 1331 | break; |
| @@ -1664,6 +1681,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, | |||
| 1664 | ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE; | 1681 | ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE; |
| 1665 | atomic_set(&ca->slot_info[i].camchange_count, 0); | 1682 | atomic_set(&ca->slot_info[i].camchange_count, 0); |
| 1666 | ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED; | 1683 | ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED; |
| 1684 | mutex_init(&ca->slot_info[i].slot_lock); | ||
| 1667 | } | 1685 | } |
| 1668 | 1686 | ||
| 1669 | if (signal_pending(current)) { | 1687 | if (signal_pending(current)) { |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h index 8467e63ddc0d..7df2e141187a 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h | |||
| @@ -45,8 +45,10 @@ struct dvb_ca_en50221 { | |||
| 45 | /* the module owning this structure */ | 45 | /* the module owning this structure */ |
| 46 | struct module* owner; | 46 | struct module* owner; |
| 47 | 47 | ||
| 48 | /* NOTE: the read_*, write_* and poll_slot_status functions must use locks as | 48 | /* NOTE: the read_*, write_* and poll_slot_status functions will be |
| 49 | * they may be called from several threads at once */ | 49 | * called for different slots concurrently and need to use locks where |
| 50 | * and if appropriate. There will be no concurrent access to one slot. | ||
| 51 | */ | ||
| 50 | 52 | ||
| 51 | /* functions for accessing attribute memory on the CAM */ | 53 | /* functions for accessing attribute memory on the CAM */ |
| 52 | int (*read_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address); | 54 | int (*read_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address); |
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c index b1a9c4cdec93..199ece0d4883 100644 --- a/drivers/media/dvb/dvb-usb/af9005-fe.c +++ b/drivers/media/dvb/dvb-usb/af9005-fe.c | |||
| @@ -220,7 +220,7 @@ static int af9005_get_post_vit_ber(struct dvb_frontend *fe, | |||
| 220 | u16 * abort_count) | 220 | u16 * abort_count) |
| 221 | { | 221 | { |
| 222 | u32 loc_cw_count = 0, loc_err_count; | 222 | u32 loc_cw_count = 0, loc_err_count; |
| 223 | u16 loc_abort_count; | 223 | u16 loc_abort_count = 0; |
| 224 | int ret; | 224 | int ret; |
| 225 | 225 | ||
| 226 | ret = | 226 | ret = |
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index e1e9aa5c6b84..6a97a40d3dfb 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
| @@ -694,7 +694,12 @@ static int af9015_read_config(struct usb_device *udev) | |||
| 694 | 694 | ||
| 695 | /* IR remote controller */ | 695 | /* IR remote controller */ |
| 696 | req.addr = AF9015_EEPROM_IR_MODE; | 696 | req.addr = AF9015_EEPROM_IR_MODE; |
| 697 | ret = af9015_rw_udev(udev, &req); | 697 | /* first message will timeout often due to possible hw bug */ |
| 698 | for (i = 0; i < 4; i++) { | ||
| 699 | ret = af9015_rw_udev(udev, &req); | ||
| 700 | if (!ret) | ||
| 701 | break; | ||
| 702 | } | ||
| 698 | if (ret) | 703 | if (ret) |
| 699 | goto error; | 704 | goto error; |
| 700 | deb_info("%s: IR mode:%d\n", __func__, val); | 705 | deb_info("%s: IR mode:%d\n", __func__, val); |
| @@ -835,18 +840,19 @@ static int af9015_read_config(struct usb_device *udev) | |||
| 835 | if (!dvb_usb_af9015_dual_mode) | 840 | if (!dvb_usb_af9015_dual_mode) |
| 836 | af9015_config.dual_mode = 0; | 841 | af9015_config.dual_mode = 0; |
| 837 | 842 | ||
| 838 | /* set buffer size according to USB port speed */ | 843 | /* Set adapter0 buffer size according to USB port speed, adapter1 buffer |
| 844 | size can be static because it is enabled only USB2.0 */ | ||
| 839 | for (i = 0; i < af9015_properties_count; i++) { | 845 | for (i = 0; i < af9015_properties_count; i++) { |
| 840 | /* USB1.1 set smaller buffersize and disable 2nd adapter */ | 846 | /* USB1.1 set smaller buffersize and disable 2nd adapter */ |
| 841 | if (udev->speed == USB_SPEED_FULL) { | 847 | if (udev->speed == USB_SPEED_FULL) { |
| 842 | af9015_properties[i].adapter->stream.u.bulk.buffersize = | 848 | af9015_properties[i].adapter[0].stream.u.bulk.buffersize |
| 843 | TS_USB11_MAX_PACKET_SIZE; | 849 | = TS_USB11_MAX_PACKET_SIZE; |
| 844 | /* disable 2nd adapter because we don't have | 850 | /* disable 2nd adapter because we don't have |
| 845 | PID-filters */ | 851 | PID-filters */ |
| 846 | af9015_config.dual_mode = 0; | 852 | af9015_config.dual_mode = 0; |
| 847 | } else { | 853 | } else { |
| 848 | af9015_properties[i].adapter->stream.u.bulk.buffersize = | 854 | af9015_properties[i].adapter[0].stream.u.bulk.buffersize |
| 849 | TS_USB20_MAX_PACKET_SIZE; | 855 | = TS_USB20_MAX_PACKET_SIZE; |
| 850 | } | 856 | } |
| 851 | } | 857 | } |
| 852 | 858 | ||
| @@ -1254,6 +1260,12 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1254 | .type = USB_BULK, | 1260 | .type = USB_BULK, |
| 1255 | .count = 6, | 1261 | .count = 6, |
| 1256 | .endpoint = 0x85, | 1262 | .endpoint = 0x85, |
| 1263 | .u = { | ||
| 1264 | .bulk = { | ||
| 1265 | .buffersize = | ||
| 1266 | TS_USB20_MAX_PACKET_SIZE, | ||
| 1267 | } | ||
| 1268 | } | ||
| 1257 | }, | 1269 | }, |
| 1258 | } | 1270 | } |
| 1259 | }, | 1271 | }, |
| @@ -1353,6 +1365,12 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1353 | .type = USB_BULK, | 1365 | .type = USB_BULK, |
| 1354 | .count = 6, | 1366 | .count = 6, |
| 1355 | .endpoint = 0x85, | 1367 | .endpoint = 0x85, |
| 1368 | .u = { | ||
| 1369 | .bulk = { | ||
| 1370 | .buffersize = | ||
| 1371 | TS_USB20_MAX_PACKET_SIZE, | ||
| 1372 | } | ||
| 1373 | } | ||
| 1356 | }, | 1374 | }, |
| 1357 | } | 1375 | } |
| 1358 | }, | 1376 | }, |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 391732788911..635d30a55078 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
| @@ -1393,6 +1393,9 @@ struct usb_device_id dib0700_usb_id_table[] = { | |||
| 1393 | { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) }, | 1393 | { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) }, |
| 1394 | /* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) }, | 1394 | /* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) }, |
| 1395 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) }, | 1395 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) }, |
| 1396 | { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_EXPRESS) }, | ||
| 1397 | { USB_DEVICE(USB_VID_TERRATEC, | ||
| 1398 | USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) }, | ||
| 1396 | { 0 } /* Terminating entry */ | 1399 | { 0 } /* Terminating entry */ |
| 1397 | }; | 1400 | }; |
| 1398 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | 1401 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); |
| @@ -1537,7 +1540,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 1537 | { "DiBcom STK7700D reference design", | 1540 | { "DiBcom STK7700D reference design", |
| 1538 | { &dib0700_usb_id_table[14], NULL }, | 1541 | { &dib0700_usb_id_table[14], NULL }, |
| 1539 | { NULL }, | 1542 | { NULL }, |
| 1540 | } | 1543 | }, |
| 1544 | |||
| 1541 | }, | 1545 | }, |
| 1542 | 1546 | ||
| 1543 | .rc_interval = DEFAULT_RC_INTERVAL, | 1547 | .rc_interval = DEFAULT_RC_INTERVAL, |
| @@ -1557,7 +1561,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 1557 | }, | 1561 | }, |
| 1558 | }, | 1562 | }, |
| 1559 | 1563 | ||
| 1560 | .num_device_descs = 2, | 1564 | .num_device_descs = 3, |
| 1561 | .devices = { | 1565 | .devices = { |
| 1562 | { "ASUS My Cinema U3000 Mini DVBT Tuner", | 1566 | { "ASUS My Cinema U3000 Mini DVBT Tuner", |
| 1563 | { &dib0700_usb_id_table[23], NULL }, | 1567 | { &dib0700_usb_id_table[23], NULL }, |
| @@ -1566,6 +1570,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 1566 | { "Yuan EC372S", | 1570 | { "Yuan EC372S", |
| 1567 | { &dib0700_usb_id_table[31], NULL }, | 1571 | { &dib0700_usb_id_table[31], NULL }, |
| 1568 | { NULL }, | 1572 | { NULL }, |
| 1573 | }, | ||
| 1574 | { "Terratec Cinergy T Express", | ||
| 1575 | { &dib0700_usb_id_table[42], NULL }, | ||
| 1576 | { NULL }, | ||
| 1569 | } | 1577 | } |
| 1570 | }, | 1578 | }, |
| 1571 | 1579 | ||
| @@ -1653,7 +1661,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 1653 | } | 1661 | } |
| 1654 | }, | 1662 | }, |
| 1655 | 1663 | ||
| 1656 | .num_device_descs = 4, | 1664 | .num_device_descs = 5, |
| 1657 | .devices = { | 1665 | .devices = { |
| 1658 | { "DiBcom STK7070PD reference design", | 1666 | { "DiBcom STK7070PD reference design", |
| 1659 | { &dib0700_usb_id_table[17], NULL }, | 1667 | { &dib0700_usb_id_table[17], NULL }, |
| @@ -1670,6 +1678,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 1670 | { "Hauppauge Nova-TD-500 (84xxx)", | 1678 | { "Hauppauge Nova-TD-500 (84xxx)", |
| 1671 | { &dib0700_usb_id_table[36], NULL }, | 1679 | { &dib0700_usb_id_table[36], NULL }, |
| 1672 | { NULL }, | 1680 | { NULL }, |
| 1681 | }, | ||
| 1682 | { "Terratec Cinergy DT USB XS Diversity", | ||
| 1683 | { &dib0700_usb_id_table[43], NULL }, | ||
| 1684 | { NULL }, | ||
| 1673 | } | 1685 | } |
| 1674 | } | 1686 | } |
| 1675 | }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, | 1687 | }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index a4fca3fca5ee..0db0c06ee6f2 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
| @@ -162,8 +162,10 @@ | |||
| 162 | #define USB_PID_AVERMEDIA_A309 0xa309 | 162 | #define USB_PID_AVERMEDIA_A309 0xa309 |
| 163 | #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 | 163 | #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 |
| 164 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a | 164 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a |
| 165 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081 | ||
| 165 | #define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 | 166 | #define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 |
| 166 | #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 | 167 | #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 |
| 168 | #define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062 | ||
| 167 | #define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 | 169 | #define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 |
| 168 | #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e | 170 | #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e |
| 169 | #define USB_PID_PINNACLE_PCTV2000E 0x022c | 171 | #define USB_PID_PINNACLE_PCTV2000E 0x022c |
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index ec4e08dbc699..1e81e713df63 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c | |||
| @@ -646,7 +646,7 @@ static int drx_tune(struct drx397xD_state *s, | |||
| 646 | u32 edi = 0, ebx = 0, ebp = 0, edx = 0; | 646 | u32 edi = 0, ebx = 0, ebp = 0, edx = 0; |
| 647 | u16 v20 = 0, v1E = 0, v16 = 0, v14 = 0, v12 = 0, v10 = 0, v0E = 0; | 647 | u16 v20 = 0, v1E = 0, v16 = 0, v14 = 0, v12 = 0, v10 = 0, v0E = 0; |
| 648 | 648 | ||
| 649 | int rc, df_tuner; | 649 | int rc, df_tuner = 0; |
| 650 | int a, b, c, d; | 650 | int a, b, c, d; |
| 651 | pr_debug("%s %d\n", __func__, s->config.d60); | 651 | pr_debug("%s %d\n", __func__, s->config.d60); |
| 652 | 652 | ||
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index cf4d8936bb83..3e08d985d6e5 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
| @@ -545,9 +545,6 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, | |||
| 545 | 545 | ||
| 546 | s5h1409_enable_modulation(fe, p->u.vsb.modulation); | 546 | s5h1409_enable_modulation(fe, p->u.vsb.modulation); |
| 547 | 547 | ||
| 548 | /* Allow the demod to settle */ | ||
| 549 | msleep(100); | ||
| 550 | |||
| 551 | if (fe->ops.tuner_ops.set_params) { | 548 | if (fe->ops.tuner_ops.set_params) { |
| 552 | if (fe->ops.i2c_gate_ctrl) | 549 | if (fe->ops.i2c_gate_ctrl) |
| 553 | fe->ops.i2c_gate_ctrl(fe, 1); | 550 | fe->ops.i2c_gate_ctrl(fe, 1); |
| @@ -562,6 +559,10 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, | |||
| 562 | s5h1409_set_qam_interleave_mode(fe); | 559 | s5h1409_set_qam_interleave_mode(fe); |
| 563 | } | 560 | } |
| 564 | 561 | ||
| 562 | /* Issue a reset to the demod so it knows to resync against the | ||
| 563 | newly tuned frequency */ | ||
| 564 | s5h1409_softreset(fe); | ||
| 565 | |||
| 565 | return 0; | 566 | return 0; |
| 566 | } | 567 | } |
| 567 | 568 | ||
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c index 83dc7e12d5f0..a67d1775a43c 100644 --- a/drivers/media/dvb/frontends/stb0899_algo.c +++ b/drivers/media/dvb/frontends/stb0899_algo.c | |||
| @@ -31,6 +31,8 @@ inline u32 stb0899_do_div(u64 n, u32 d) | |||
| 31 | return n; | 31 | return n; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | #if 0 | ||
| 35 | /* These functions are currently unused */ | ||
| 34 | /* | 36 | /* |
| 35 | * stb0899_calc_srate | 37 | * stb0899_calc_srate |
| 36 | * Compute symbol rate | 38 | * Compute symbol rate |
| @@ -63,6 +65,7 @@ static u32 stb0899_get_srate(struct stb0899_state *state) | |||
| 63 | 65 | ||
| 64 | return stb0899_calc_srate(internal->master_clk, sfr); | 66 | return stb0899_calc_srate(internal->master_clk, sfr); |
| 65 | } | 67 | } |
| 68 | #endif | ||
| 66 | 69 | ||
| 67 | /* | 70 | /* |
| 68 | * stb0899_set_srate | 71 | * stb0899_set_srate |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 1638e1d9f538..83e9e7750c8c 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
| @@ -470,6 +470,7 @@ static void frontend_init(struct budget *budget) | |||
| 470 | budget->dvb_frontend = dvb_attach(l64781_attach, &grundig_29504_401_config, &budget->i2c_adap); | 470 | budget->dvb_frontend = dvb_attach(l64781_attach, &grundig_29504_401_config, &budget->i2c_adap); |
| 471 | if (budget->dvb_frontend) { | 471 | if (budget->dvb_frontend) { |
| 472 | budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params; | 472 | budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params; |
| 473 | budget->dvb_frontend->tuner_priv = NULL; | ||
| 473 | break; | 474 | break; |
| 474 | } | 475 | } |
| 475 | break; | 476 | break; |
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 0aa96df80fc2..d91e0638448f 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
| @@ -1384,7 +1384,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) | |||
| 1384 | static int ttusb_dec_init_stb(struct ttusb_dec *dec) | 1384 | static int ttusb_dec_init_stb(struct ttusb_dec *dec) |
| 1385 | { | 1385 | { |
| 1386 | int result; | 1386 | int result; |
| 1387 | unsigned int mode, model, version; | 1387 | unsigned int mode = 0, model = 0, version = 0; |
| 1388 | 1388 | ||
| 1389 | dprintk("%s\n", __func__); | 1389 | dprintk("%s\n", __func__); |
| 1390 | 1390 | ||
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index 0747dc8862b0..fdfc7bf86b9e 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
| @@ -194,10 +194,10 @@ static int amradio_start(struct amradio_device *radio) | |||
| 194 | return retval; | 194 | return retval; |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | mutex_unlock(&radio->lock); | ||
| 198 | |||
| 199 | radio->muted = 0; | 197 | radio->muted = 0; |
| 200 | 198 | ||
| 199 | mutex_unlock(&radio->lock); | ||
| 200 | |||
| 201 | return retval; | 201 | return retval; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| @@ -230,10 +230,10 @@ static int amradio_stop(struct amradio_device *radio) | |||
| 230 | return retval; | 230 | return retval; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | mutex_unlock(&radio->lock); | ||
| 234 | |||
| 235 | radio->muted = 1; | 233 | radio->muted = 1; |
| 236 | 234 | ||
| 235 | mutex_unlock(&radio->lock); | ||
| 236 | |||
| 237 | return retval; | 237 | return retval; |
| 238 | } | 238 | } |
| 239 | 239 | ||
| @@ -284,10 +284,10 @@ static int amradio_setfreq(struct amradio_device *radio, int freq) | |||
| 284 | return retval; | 284 | return retval; |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | mutex_unlock(&radio->lock); | ||
| 288 | |||
| 289 | radio->stereo = 0; | 287 | radio->stereo = 0; |
| 290 | 288 | ||
| 289 | mutex_unlock(&radio->lock); | ||
| 290 | |||
| 291 | return retval; | 291 | return retval; |
| 292 | } | 292 | } |
| 293 | 293 | ||
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c index 14bebf8a116f..87e91072627a 100644 --- a/drivers/media/video/cs5345.c +++ b/drivers/media/video/cs5345.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #include <linux/version.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index 8f1db57bd1dd..bfe25841dbf4 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
| @@ -1586,7 +1586,8 @@ static int mpeg_open(struct file *file) | |||
| 1586 | lock_kernel(); | 1586 | lock_kernel(); |
| 1587 | list_for_each(list, &cx23885_devlist) { | 1587 | list_for_each(list, &cx23885_devlist) { |
| 1588 | h = list_entry(list, struct cx23885_dev, devlist); | 1588 | h = list_entry(list, struct cx23885_dev, devlist); |
| 1589 | if (h->v4l_device->minor == minor) { | 1589 | if (h->v4l_device && |
| 1590 | h->v4l_device->minor == minor) { | ||
| 1590 | dev = h; | 1591 | dev = h; |
| 1591 | break; | 1592 | break; |
| 1592 | } | 1593 | } |
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 2d81c4d04340..eaa11893bfe9 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
| @@ -730,12 +730,13 @@ static int video_open(struct file *file) | |||
| 730 | lock_kernel(); | 730 | lock_kernel(); |
| 731 | list_for_each(list, &cx23885_devlist) { | 731 | list_for_each(list, &cx23885_devlist) { |
| 732 | h = list_entry(list, struct cx23885_dev, devlist); | 732 | h = list_entry(list, struct cx23885_dev, devlist); |
| 733 | if (h->video_dev->minor == minor) { | 733 | if (h->video_dev && |
| 734 | h->video_dev->minor == minor) { | ||
| 734 | dev = h; | 735 | dev = h; |
| 735 | type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 736 | type = V4L2_BUF_TYPE_VIDEO_CAPTURE; |
| 736 | } | 737 | } |
| 737 | if (h->vbi_dev && | 738 | if (h->vbi_dev && |
| 738 | h->vbi_dev->minor == minor) { | 739 | h->vbi_dev->minor == minor) { |
| 739 | dev = h; | 740 | dev = h; |
| 740 | type = V4L2_BUF_TYPE_VBI_CAPTURE; | 741 | type = V4L2_BUF_TYPE_VBI_CAPTURE; |
| 741 | } | 742 | } |
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 88f2fd32bfe3..25eb3bec9e5d 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c | |||
| @@ -1382,6 +1382,14 @@ static int cx25840_log_status(struct v4l2_subdev *sd) | |||
| 1382 | 1382 | ||
| 1383 | static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg) | 1383 | static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg) |
| 1384 | { | 1384 | { |
| 1385 | /* ignore this command */ | ||
| 1386 | if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG) | ||
| 1387 | return 0; | ||
| 1388 | |||
| 1389 | /* Old-style drivers rely on initialization on first use, so | ||
| 1390 | call the init whenever a command is issued to this driver. | ||
| 1391 | New-style drivers using v4l2_subdev should call init explicitly. */ | ||
| 1392 | cx25840_init(i2c_get_clientdata(client), 0); | ||
| 1385 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | 1393 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); |
| 1386 | } | 1394 | } |
| 1387 | 1395 | ||
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 613dfea4ff3e..aef5297534af 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
| @@ -614,34 +614,41 @@ static struct stv0288_config tevii_tuner_earda_config = { | |||
| 614 | .set_ts_params = cx24116_set_ts_param, | 614 | .set_ts_params = cx24116_set_ts_param, |
| 615 | }; | 615 | }; |
| 616 | 616 | ||
| 617 | static int dvb_register(struct cx8802_dev *dev) | 617 | static int cx8802_alloc_frontends(struct cx8802_dev *dev) |
| 618 | { | 618 | { |
| 619 | struct cx88_core *core = dev->core; | 619 | struct cx88_core *core = dev->core; |
| 620 | struct videobuf_dvb_frontend *fe0, *fe1 = NULL; | 620 | struct videobuf_dvb_frontend *fe = NULL; |
| 621 | int mfe_shared = 0; /* bus not shared by default */ | ||
| 622 | int i; | 621 | int i; |
| 623 | 622 | ||
| 624 | if (0 != core->i2c_rc) { | ||
| 625 | printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name); | ||
| 626 | goto frontend_detach; | ||
| 627 | } | ||
| 628 | |||
| 629 | if (!core->board.num_frontends) | ||
| 630 | return -EINVAL; | ||
| 631 | |||
| 632 | mutex_init(&dev->frontends.lock); | 623 | mutex_init(&dev->frontends.lock); |
| 633 | INIT_LIST_HEAD(&dev->frontends.felist); | 624 | INIT_LIST_HEAD(&dev->frontends.felist); |
| 634 | 625 | ||
| 626 | if (!core->board.num_frontends) | ||
| 627 | return -ENODEV; | ||
| 628 | |||
| 635 | printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, | 629 | printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, |
| 636 | core->board.num_frontends); | 630 | core->board.num_frontends); |
| 637 | for (i = 1; i <= core->board.num_frontends; i++) { | 631 | for (i = 1; i <= core->board.num_frontends; i++) { |
| 638 | fe0 = videobuf_dvb_alloc_frontend(&dev->frontends, i); | 632 | fe = videobuf_dvb_alloc_frontend(&dev->frontends, i); |
| 639 | if (!fe0) { | 633 | if (!fe) { |
| 640 | printk(KERN_ERR "%s() failed to alloc\n", __func__); | 634 | printk(KERN_ERR "%s() failed to alloc\n", __func__); |
| 641 | videobuf_dvb_dealloc_frontends(&dev->frontends); | 635 | videobuf_dvb_dealloc_frontends(&dev->frontends); |
| 642 | goto frontend_detach; | 636 | return -ENOMEM; |
| 643 | } | 637 | } |
| 644 | } | 638 | } |
| 639 | return 0; | ||
| 640 | } | ||
| 641 | |||
| 642 | static int dvb_register(struct cx8802_dev *dev) | ||
| 643 | { | ||
| 644 | struct cx88_core *core = dev->core; | ||
| 645 | struct videobuf_dvb_frontend *fe0, *fe1 = NULL; | ||
| 646 | int mfe_shared = 0; /* bus not shared by default */ | ||
| 647 | |||
| 648 | if (0 != core->i2c_rc) { | ||
| 649 | printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name); | ||
| 650 | goto frontend_detach; | ||
| 651 | } | ||
| 645 | 652 | ||
| 646 | /* Get the first frontend */ | 653 | /* Get the first frontend */ |
| 647 | fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1); | 654 | fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1); |
| @@ -1243,6 +1250,8 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv) | |||
| 1243 | struct cx88_core *core = drv->core; | 1250 | struct cx88_core *core = drv->core; |
| 1244 | struct cx8802_dev *dev = drv->core->dvbdev; | 1251 | struct cx8802_dev *dev = drv->core->dvbdev; |
| 1245 | int err; | 1252 | int err; |
| 1253 | struct videobuf_dvb_frontend *fe; | ||
| 1254 | int i; | ||
| 1246 | 1255 | ||
| 1247 | dprintk( 1, "%s\n", __func__); | 1256 | dprintk( 1, "%s\n", __func__); |
| 1248 | dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", | 1257 | dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", |
| @@ -1258,39 +1267,34 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv) | |||
| 1258 | /* If vp3054 isn't enabled, a stub will just return 0 */ | 1267 | /* If vp3054 isn't enabled, a stub will just return 0 */ |
| 1259 | err = vp3054_i2c_probe(dev); | 1268 | err = vp3054_i2c_probe(dev); |
| 1260 | if (0 != err) | 1269 | if (0 != err) |
| 1261 | goto fail_probe; | 1270 | goto fail_core; |
| 1262 | 1271 | ||
| 1263 | /* dvb stuff */ | 1272 | /* dvb stuff */ |
| 1264 | printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name); | 1273 | printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name); |
| 1265 | dev->ts_gen_cntrl = 0x0c; | 1274 | dev->ts_gen_cntrl = 0x0c; |
| 1266 | 1275 | ||
| 1276 | err = cx8802_alloc_frontends(dev); | ||
| 1277 | if (err) | ||
| 1278 | goto fail_core; | ||
| 1279 | |||
| 1267 | err = -ENODEV; | 1280 | err = -ENODEV; |
| 1268 | if (core->board.num_frontends) { | 1281 | for (i = 1; i <= core->board.num_frontends; i++) { |
| 1269 | struct videobuf_dvb_frontend *fe; | 1282 | fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i); |
| 1270 | int i; | 1283 | if (fe == NULL) { |
| 1271 | 1284 | printk(KERN_ERR "%s() failed to get frontend(%d)\n", | |
| 1272 | for (i = 1; i <= core->board.num_frontends; i++) { | ||
| 1273 | fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i); | ||
| 1274 | if (fe == NULL) { | ||
| 1275 | printk(KERN_ERR "%s() failed to get frontend(%d)\n", | ||
| 1276 | __func__, i); | 1285 | __func__, i); |
| 1277 | goto fail_probe; | 1286 | goto fail_probe; |
| 1278 | } | 1287 | } |
| 1279 | videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops, | 1288 | videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops, |
| 1280 | &dev->pci->dev, &dev->slock, | 1289 | &dev->pci->dev, &dev->slock, |
| 1281 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 1290 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
| 1282 | V4L2_FIELD_TOP, | 1291 | V4L2_FIELD_TOP, |
| 1283 | sizeof(struct cx88_buffer), | 1292 | sizeof(struct cx88_buffer), |
| 1284 | dev); | 1293 | dev); |
| 1285 | /* init struct videobuf_dvb */ | 1294 | /* init struct videobuf_dvb */ |
| 1286 | fe->dvb.name = dev->core->name; | 1295 | fe->dvb.name = dev->core->name; |
| 1287 | } | ||
| 1288 | } else { | ||
| 1289 | /* no frontends allocated */ | ||
| 1290 | printk(KERN_ERR "%s/2 .num_frontends should be non-zero\n", | ||
| 1291 | core->name); | ||
| 1292 | goto fail_core; | ||
| 1293 | } | 1296 | } |
| 1297 | |||
| 1294 | err = dvb_register(dev); | 1298 | err = dvb_register(dev); |
| 1295 | if (err) | 1299 | if (err) |
| 1296 | /* frontends/adapter de-allocated in dvb_register */ | 1300 | /* frontends/adapter de-allocated in dvb_register */ |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 60a8b3187f14..6025fdd23344 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
| @@ -336,8 +336,8 @@ struct cx88_core { | |||
| 336 | /* config info -- dvb */ | 336 | /* config info -- dvb */ |
| 337 | #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) | 337 | #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) |
| 338 | int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); | 338 | int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); |
| 339 | void (*gate_ctrl)(struct cx88_core *core, int open); | ||
| 340 | #endif | 339 | #endif |
| 340 | void (*gate_ctrl)(struct cx88_core *core, int open); | ||
| 341 | 341 | ||
| 342 | /* state info */ | 342 | /* state info */ |
| 343 | struct task_struct *kthread; | 343 | struct task_struct *kthread; |
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index 94378ccb7505..5d882a44e3ee 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c | |||
| @@ -62,9 +62,15 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev) | |||
| 62 | 62 | ||
| 63 | dprintk("Stopping isoc\n"); | 63 | dprintk("Stopping isoc\n"); |
| 64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { | 64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { |
| 65 | usb_unlink_urb(dev->adev.urb[i]); | 65 | if (!irqs_disabled()) |
| 66 | usb_kill_urb(dev->adev.urb[i]); | ||
| 67 | else | ||
| 68 | usb_unlink_urb(dev->adev.urb[i]); | ||
| 66 | usb_free_urb(dev->adev.urb[i]); | 69 | usb_free_urb(dev->adev.urb[i]); |
| 67 | dev->adev.urb[i] = NULL; | 70 | dev->adev.urb[i] = NULL; |
| 71 | |||
| 72 | kfree(dev->adev.transfer_buffer[i]); | ||
| 73 | dev->adev.transfer_buffer[i] = NULL; | ||
| 68 | } | 74 | } |
| 69 | 75 | ||
| 70 | return 0; | 76 | return 0; |
| @@ -389,11 +395,15 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream, | |||
| 389 | static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream | 395 | static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream |
| 390 | *substream) | 396 | *substream) |
| 391 | { | 397 | { |
| 392 | struct em28xx *dev; | 398 | unsigned long flags; |
| 393 | 399 | ||
| 400 | struct em28xx *dev; | ||
| 394 | snd_pcm_uframes_t hwptr_done; | 401 | snd_pcm_uframes_t hwptr_done; |
| 402 | |||
| 395 | dev = snd_pcm_substream_chip(substream); | 403 | dev = snd_pcm_substream_chip(substream); |
| 404 | spin_lock_irqsave(&dev->adev.slock, flags); | ||
| 396 | hwptr_done = dev->adev.hwptr_done_capture; | 405 | hwptr_done = dev->adev.hwptr_done_capture; |
| 406 | spin_unlock_irqrestore(&dev->adev.slock, flags); | ||
| 397 | 407 | ||
| 398 | return hwptr_done; | 408 | return hwptr_done; |
| 399 | } | 409 | } |
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index ef9bf008a924..3b3ca3f46d52 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
| @@ -102,6 +102,18 @@ static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = { | |||
| 102 | /* Board - EM2870 Kworld 355u | 102 | /* Board - EM2870 Kworld 355u |
| 103 | Analog - No input analog */ | 103 | Analog - No input analog */ |
| 104 | 104 | ||
| 105 | static struct em28xx_reg_seq kworld_330u_analog[] = { | ||
| 106 | {EM28XX_R08_GPIO, 0x6d, ~EM_GPIO_4, 10}, | ||
| 107 | {EM2880_R04_GPO, 0x00, 0xff, 10}, | ||
| 108 | { -1, -1, -1, -1}, | ||
| 109 | }; | ||
| 110 | |||
| 111 | static struct em28xx_reg_seq kworld_330u_digital[] = { | ||
| 112 | {EM28XX_R08_GPIO, 0x6e, ~EM_GPIO_4, 10}, | ||
| 113 | {EM2880_R04_GPO, 0x08, 0xff, 10}, | ||
| 114 | { -1, -1, -1, -1}, | ||
| 115 | }; | ||
| 116 | |||
| 105 | /* Callback for the most boards */ | 117 | /* Callback for the most boards */ |
| 106 | static struct em28xx_reg_seq default_tuner_gpio[] = { | 118 | static struct em28xx_reg_seq default_tuner_gpio[] = { |
| 107 | {EM28XX_R08_GPIO, EM_GPIO_4, EM_GPIO_4, 10}, | 119 | {EM28XX_R08_GPIO, EM_GPIO_4, EM_GPIO_4, 10}, |
| @@ -1177,29 +1189,33 @@ struct em28xx_board em28xx_boards[] = { | |||
| 1177 | .gpio = hauppauge_wintv_hvr_900_analog, | 1189 | .gpio = hauppauge_wintv_hvr_900_analog, |
| 1178 | } }, | 1190 | } }, |
| 1179 | }, | 1191 | }, |
| 1180 | [EM2883_BOARD_KWORLD_HYBRID_A316] = { | 1192 | [EM2883_BOARD_KWORLD_HYBRID_330U] = { |
| 1181 | .name = "Kworld PlusTV HD Hybrid 330", | 1193 | .name = "Kworld PlusTV HD Hybrid 330", |
| 1182 | .tuner_type = TUNER_XC2028, | 1194 | .tuner_type = TUNER_XC2028, |
| 1183 | .tuner_gpio = default_tuner_gpio, | 1195 | .tuner_gpio = default_tuner_gpio, |
| 1184 | .decoder = EM28XX_TVP5150, | 1196 | .decoder = EM28XX_TVP5150, |
| 1185 | .mts_firmware = 1, | 1197 | .mts_firmware = 1, |
| 1186 | .has_dvb = 1, | 1198 | .has_dvb = 1, |
| 1187 | .dvb_gpio = default_digital, | 1199 | .dvb_gpio = kworld_330u_digital, |
| 1200 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, | ||
| 1201 | .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_EEPROM_ON_BOARD | EM28XX_I2C_EEPROM_KEY_VALID, | ||
| 1188 | .input = { { | 1202 | .input = { { |
| 1189 | .type = EM28XX_VMUX_TELEVISION, | 1203 | .type = EM28XX_VMUX_TELEVISION, |
| 1190 | .vmux = TVP5150_COMPOSITE0, | 1204 | .vmux = TVP5150_COMPOSITE0, |
| 1191 | .amux = EM28XX_AMUX_VIDEO, | 1205 | .amux = EM28XX_AMUX_VIDEO, |
| 1192 | .gpio = default_analog, | 1206 | .gpio = kworld_330u_analog, |
| 1207 | .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO, | ||
| 1193 | }, { | 1208 | }, { |
| 1194 | .type = EM28XX_VMUX_COMPOSITE1, | 1209 | .type = EM28XX_VMUX_COMPOSITE1, |
| 1195 | .vmux = TVP5150_COMPOSITE1, | 1210 | .vmux = TVP5150_COMPOSITE1, |
| 1196 | .amux = EM28XX_AMUX_LINE_IN, | 1211 | .amux = EM28XX_AMUX_LINE_IN, |
| 1197 | .gpio = hauppauge_wintv_hvr_900_analog, | 1212 | .gpio = kworld_330u_analog, |
| 1213 | .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO, | ||
| 1198 | }, { | 1214 | }, { |
| 1199 | .type = EM28XX_VMUX_SVIDEO, | 1215 | .type = EM28XX_VMUX_SVIDEO, |
| 1200 | .vmux = TVP5150_SVIDEO, | 1216 | .vmux = TVP5150_SVIDEO, |
| 1201 | .amux = EM28XX_AMUX_LINE_IN, | 1217 | .amux = EM28XX_AMUX_LINE_IN, |
| 1202 | .gpio = hauppauge_wintv_hvr_900_analog, | 1218 | .gpio = kworld_330u_analog, |
| 1203 | } }, | 1219 | } }, |
| 1204 | }, | 1220 | }, |
| 1205 | [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = { | 1221 | [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = { |
| @@ -1249,7 +1265,7 @@ struct usb_device_id em28xx_id_table [] = { | |||
| 1249 | { USB_DEVICE(0xeb1a, 0xe310), | 1265 | { USB_DEVICE(0xeb1a, 0xe310), |
| 1250 | .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD }, | 1266 | .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD }, |
| 1251 | { USB_DEVICE(0xeb1a, 0xa316), | 1267 | { USB_DEVICE(0xeb1a, 0xa316), |
| 1252 | .driver_info = EM2883_BOARD_KWORLD_HYBRID_A316 }, | 1268 | .driver_info = EM2883_BOARD_KWORLD_HYBRID_330U }, |
| 1253 | { USB_DEVICE(0xeb1a, 0xe320), | 1269 | { USB_DEVICE(0xeb1a, 0xe320), |
| 1254 | .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD_II }, | 1270 | .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD_II }, |
| 1255 | { USB_DEVICE(0xeb1a, 0xe323), | 1271 | { USB_DEVICE(0xeb1a, 0xe323), |
| @@ -1526,6 +1542,10 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl) | |||
| 1526 | /* FIXME: Better to specify the needed IF */ | 1542 | /* FIXME: Better to specify the needed IF */ |
| 1527 | ctl->demod = XC3028_FE_DEFAULT; | 1543 | ctl->demod = XC3028_FE_DEFAULT; |
| 1528 | break; | 1544 | break; |
| 1545 | case EM2883_BOARD_KWORLD_HYBRID_330U: | ||
| 1546 | ctl->demod = XC3028_FE_CHINA; | ||
| 1547 | ctl->fname = XC2028_DEFAULT_FIRMWARE; | ||
| 1548 | break; | ||
| 1529 | default: | 1549 | default: |
| 1530 | ctl->demod = XC3028_FE_OREN538; | 1550 | ctl->demod = XC3028_FE_OREN538; |
| 1531 | } | 1551 | } |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index eb5fb05fab22..94fb1b639a2e 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -438,6 +438,10 @@ int em28xx_audio_analog_set(struct em28xx *dev) | |||
| 438 | if (dev->audio_mode.ac97 != EM28XX_NO_AC97) { | 438 | if (dev->audio_mode.ac97 != EM28XX_NO_AC97) { |
| 439 | int vol; | 439 | int vol; |
| 440 | 440 | ||
| 441 | em28xx_write_ac97(dev, AC97_POWER_DOWN_CTRL, 0x4200); | ||
| 442 | em28xx_write_ac97(dev, AC97_EXT_AUD_CTRL, 0x0031); | ||
| 443 | em28xx_write_ac97(dev, AC97_PCM_IN_SRATE, 0xbb80); | ||
| 444 | |||
| 441 | /* LSB: left channel - both channels with the same level */ | 445 | /* LSB: left channel - both channels with the same level */ |
| 442 | vol = (0x1f - dev->volume) | ((0x1f - dev->volume) << 8); | 446 | vol = (0x1f - dev->volume) | ((0x1f - dev->volume) << 8); |
| 443 | 447 | ||
| @@ -454,6 +458,15 @@ int em28xx_audio_analog_set(struct em28xx *dev) | |||
| 454 | em28xx_warn("couldn't setup AC97 register %d\n", | 458 | em28xx_warn("couldn't setup AC97 register %d\n", |
| 455 | outputs[i].reg); | 459 | outputs[i].reg); |
| 456 | } | 460 | } |
| 461 | |||
| 462 | if (dev->ctl_aoutput & EM28XX_AOUT_PCM_IN) { | ||
| 463 | int sel = ac97_return_record_select(dev->ctl_aoutput); | ||
| 464 | |||
| 465 | /* Use the same input for both left and right channels */ | ||
| 466 | sel |= (sel << 8); | ||
| 467 | |||
| 468 | em28xx_write_ac97(dev, AC97_RECORD_SELECT, sel); | ||
| 469 | } | ||
| 457 | } | 470 | } |
| 458 | 471 | ||
| 459 | return ret; | 472 | return ret; |
| @@ -847,8 +860,11 @@ void em28xx_uninit_isoc(struct em28xx *dev) | |||
| 847 | for (i = 0; i < dev->isoc_ctl.num_bufs; i++) { | 860 | for (i = 0; i < dev->isoc_ctl.num_bufs; i++) { |
| 848 | urb = dev->isoc_ctl.urb[i]; | 861 | urb = dev->isoc_ctl.urb[i]; |
| 849 | if (urb) { | 862 | if (urb) { |
| 850 | usb_kill_urb(urb); | 863 | if (!irqs_disabled()) |
| 851 | usb_unlink_urb(urb); | 864 | usb_kill_urb(urb); |
| 865 | else | ||
| 866 | usb_unlink_urb(urb); | ||
| 867 | |||
| 852 | if (dev->isoc_ctl.transfer_buffer[i]) { | 868 | if (dev->isoc_ctl.transfer_buffer[i]) { |
| 853 | usb_buffer_free(dev->udev, | 869 | usb_buffer_free(dev->udev, |
| 854 | urb->transfer_buffer_length, | 870 | urb->transfer_buffer_length, |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index d38cb21834d9..9ad8527b3fda 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include "lgdt330x.h" | 29 | #include "lgdt330x.h" |
| 30 | #include "zl10353.h" | 30 | #include "zl10353.h" |
| 31 | #include "s5h1409.h" | ||
| 31 | #ifdef EM28XX_DRX397XD_SUPPORT | 32 | #ifdef EM28XX_DRX397XD_SUPPORT |
| 32 | #include "drx397xD.h" | 33 | #include "drx397xD.h" |
| 33 | #endif | 34 | #endif |
| @@ -232,6 +233,15 @@ static struct zl10353_config em28xx_zl10353_with_xc3028 = { | |||
| 232 | .if2 = 45600, | 233 | .if2 = 45600, |
| 233 | }; | 234 | }; |
| 234 | 235 | ||
| 236 | static struct s5h1409_config em28xx_s5h1409_with_xc3028 = { | ||
| 237 | .demod_address = 0x32 >> 1, | ||
| 238 | .output_mode = S5H1409_PARALLEL_OUTPUT, | ||
| 239 | .gpio = S5H1409_GPIO_OFF, | ||
| 240 | .inversion = S5H1409_INVERSION_OFF, | ||
| 241 | .status_mode = S5H1409_DEMODLOCKING, | ||
| 242 | .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK | ||
| 243 | }; | ||
| 244 | |||
| 235 | #ifdef EM28XX_DRX397XD_SUPPORT | 245 | #ifdef EM28XX_DRX397XD_SUPPORT |
| 236 | /* [TODO] djh - not sure yet what the device config needs to contain */ | 246 | /* [TODO] djh - not sure yet what the device config needs to contain */ |
| 237 | static struct drx397xD_config em28xx_drx397xD_with_xc3028 = { | 247 | static struct drx397xD_config em28xx_drx397xD_with_xc3028 = { |
| @@ -412,7 +422,6 @@ static int dvb_init(struct em28xx *dev) | |||
| 412 | case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850: | 422 | case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850: |
| 413 | case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950: | 423 | case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950: |
| 414 | case EM2880_BOARD_PINNACLE_PCTV_HD_PRO: | 424 | case EM2880_BOARD_PINNACLE_PCTV_HD_PRO: |
| 415 | case EM2883_BOARD_KWORLD_HYBRID_A316: | ||
| 416 | case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600: | 425 | case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600: |
| 417 | dvb->frontend = dvb_attach(lgdt330x_attach, | 426 | dvb->frontend = dvb_attach(lgdt330x_attach, |
| 418 | &em2880_lgdt3303_dev, | 427 | &em2880_lgdt3303_dev, |
| @@ -433,6 +442,15 @@ static int dvb_init(struct em28xx *dev) | |||
| 433 | goto out_free; | 442 | goto out_free; |
| 434 | } | 443 | } |
| 435 | break; | 444 | break; |
| 445 | case EM2883_BOARD_KWORLD_HYBRID_330U: | ||
| 446 | dvb->frontend = dvb_attach(s5h1409_attach, | ||
| 447 | &em28xx_s5h1409_with_xc3028, | ||
| 448 | &dev->i2c_adap); | ||
| 449 | if (attach_xc3028(0x61, dev) < 0) { | ||
| 450 | result = -EINVAL; | ||
| 451 | goto out_free; | ||
| 452 | } | ||
| 453 | break; | ||
| 436 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: | 454 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: |
| 437 | #ifdef EM28XX_DRX397XD_SUPPORT | 455 | #ifdef EM28XX_DRX397XD_SUPPORT |
| 438 | /* We don't have the config structure properly populated, so | 456 | /* We don't have the config structure properly populated, so |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 416b691c33c1..8e61b2ca9167 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -886,10 +886,10 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
| 886 | if (0 == INPUT(i)->type) | 886 | if (0 == INPUT(i)->type) |
| 887 | return -EINVAL; | 887 | return -EINVAL; |
| 888 | 888 | ||
| 889 | mutex_lock(&dev->lock); | 889 | dev->ctl_input = i; |
| 890 | |||
| 891 | video_mux(dev, i); | ||
| 892 | 890 | ||
| 891 | mutex_lock(&dev->lock); | ||
| 892 | video_mux(dev, dev->ctl_input); | ||
| 893 | mutex_unlock(&dev->lock); | 893 | mutex_unlock(&dev->lock); |
| 894 | return 0; | 894 | return 0; |
| 895 | } | 895 | } |
| @@ -939,6 +939,12 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) | |||
| 939 | struct em28xx_fh *fh = priv; | 939 | struct em28xx_fh *fh = priv; |
| 940 | struct em28xx *dev = fh->dev; | 940 | struct em28xx *dev = fh->dev; |
| 941 | 941 | ||
| 942 | |||
| 943 | if (a->index >= MAX_EM28XX_INPUT) | ||
| 944 | return -EINVAL; | ||
| 945 | if (0 == INPUT(a->index)->type) | ||
| 946 | return -EINVAL; | ||
| 947 | |||
| 942 | mutex_lock(&dev->lock); | 948 | mutex_lock(&dev->lock); |
| 943 | 949 | ||
| 944 | dev->ctl_ainput = INPUT(a->index)->amux; | 950 | dev->ctl_ainput = INPUT(a->index)->amux; |
| @@ -1950,6 +1956,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, | |||
| 1950 | 1956 | ||
| 1951 | int em28xx_register_analog_devices(struct em28xx *dev) | 1957 | int em28xx_register_analog_devices(struct em28xx *dev) |
| 1952 | { | 1958 | { |
| 1959 | u8 val; | ||
| 1953 | int ret; | 1960 | int ret; |
| 1954 | 1961 | ||
| 1955 | printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n", | 1962 | printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n", |
| @@ -1957,34 +1964,34 @@ int em28xx_register_analog_devices(struct em28xx *dev) | |||
| 1957 | (EM28XX_VERSION_CODE >> 16) & 0xff, | 1964 | (EM28XX_VERSION_CODE >> 16) & 0xff, |
| 1958 | (EM28XX_VERSION_CODE >> 8) & 0xff, EM28XX_VERSION_CODE & 0xff); | 1965 | (EM28XX_VERSION_CODE >> 8) & 0xff, EM28XX_VERSION_CODE & 0xff); |
| 1959 | 1966 | ||
| 1967 | /* set default norm */ | ||
| 1968 | dev->norm = em28xx_video_template.current_norm; | ||
| 1969 | dev->width = norm_maxw(dev); | ||
| 1970 | dev->height = norm_maxh(dev); | ||
| 1971 | dev->interlaced = EM28XX_INTERLACED_DEFAULT; | ||
| 1972 | dev->hscale = 0; | ||
| 1973 | dev->vscale = 0; | ||
| 1974 | dev->ctl_input = 0; | ||
| 1975 | |||
| 1960 | /* Analog specific initialization */ | 1976 | /* Analog specific initialization */ |
| 1961 | dev->format = &format[0]; | 1977 | dev->format = &format[0]; |
| 1962 | video_mux(dev, 0); | 1978 | video_mux(dev, dev->ctl_input); |
| 1979 | |||
| 1980 | /* Audio defaults */ | ||
| 1981 | dev->mute = 1; | ||
| 1982 | dev->volume = 0x1f; | ||
| 1963 | 1983 | ||
| 1964 | /* enable vbi capturing */ | 1984 | /* enable vbi capturing */ |
| 1965 | 1985 | ||
| 1966 | /* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */ | 1986 | /* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */ |
| 1967 | /* em28xx_write_reg(dev, EM28XX_R0F_XCLK, 0x80); clk register */ | 1987 | val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK); |
| 1988 | em28xx_write_reg(dev, EM28XX_R0F_XCLK, (EM28XX_XCLK_AUDIO_UNMUTE | val)); | ||
| 1968 | em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51); | 1989 | em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51); |
| 1969 | 1990 | ||
| 1970 | dev->mute = 1; /* maybe not the right place... */ | ||
| 1971 | dev->volume = 0x1f; | ||
| 1972 | |||
| 1973 | em28xx_set_outfmt(dev); | 1991 | em28xx_set_outfmt(dev); |
| 1974 | em28xx_colorlevels_set_default(dev); | 1992 | em28xx_colorlevels_set_default(dev); |
| 1975 | em28xx_compression_disable(dev); | 1993 | em28xx_compression_disable(dev); |
| 1976 | 1994 | ||
| 1977 | /* set default norm */ | ||
| 1978 | dev->norm = em28xx_video_template.current_norm; | ||
| 1979 | dev->width = norm_maxw(dev); | ||
| 1980 | dev->height = norm_maxh(dev); | ||
| 1981 | dev->interlaced = EM28XX_INTERLACED_DEFAULT; | ||
| 1982 | dev->hscale = 0; | ||
| 1983 | dev->vscale = 0; | ||
| 1984 | |||
| 1985 | /* FIXME: This is a very bad hack! Not all devices have TV on input 2 */ | ||
| 1986 | dev->ctl_input = 2; | ||
| 1987 | |||
| 1988 | /* allocate and fill video video_device struct */ | 1995 | /* allocate and fill video video_device struct */ |
| 1989 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); | 1996 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); |
| 1990 | if (!dev->vdev) { | 1997 | if (!dev->vdev) { |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 6c6b94aa05b2..dd2cd36fb1bb 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | #define EM2882_BOARD_KWORLD_VS_DVBT 54 | 94 | #define EM2882_BOARD_KWORLD_VS_DVBT 54 |
| 95 | #define EM2882_BOARD_TERRATEC_HYBRID_XS 55 | 95 | #define EM2882_BOARD_TERRATEC_HYBRID_XS 55 |
| 96 | #define EM2882_BOARD_PINNACLE_HYBRID_PRO 56 | 96 | #define EM2882_BOARD_PINNACLE_HYBRID_PRO 56 |
| 97 | #define EM2883_BOARD_KWORLD_HYBRID_A316 57 | 97 | #define EM2883_BOARD_KWORLD_HYBRID_330U 57 |
| 98 | #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 | 98 | #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 |
| 99 | #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 | 99 | #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 |
| 100 | #define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61 | 100 | #define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61 |
| @@ -300,13 +300,32 @@ enum em28xx_amux { | |||
| 300 | }; | 300 | }; |
| 301 | 301 | ||
| 302 | enum em28xx_aout { | 302 | enum em28xx_aout { |
| 303 | /* AC97 outputs */ | ||
| 303 | EM28XX_AOUT_MASTER = 1 << 0, | 304 | EM28XX_AOUT_MASTER = 1 << 0, |
| 304 | EM28XX_AOUT_LINE = 1 << 1, | 305 | EM28XX_AOUT_LINE = 1 << 1, |
| 305 | EM28XX_AOUT_MONO = 1 << 2, | 306 | EM28XX_AOUT_MONO = 1 << 2, |
| 306 | EM28XX_AOUT_LFE = 1 << 3, | 307 | EM28XX_AOUT_LFE = 1 << 3, |
| 307 | EM28XX_AOUT_SURR = 1 << 4, | 308 | EM28XX_AOUT_SURR = 1 << 4, |
| 309 | |||
| 310 | /* PCM IN Mixer - used by AC97_RECORD_SELECT register */ | ||
| 311 | EM28XX_AOUT_PCM_IN = 1 << 7, | ||
| 312 | |||
| 313 | /* Bits 10-8 are used to indicate the PCM IN record select */ | ||
| 314 | EM28XX_AOUT_PCM_MIC_PCM = 0 << 8, | ||
| 315 | EM28XX_AOUT_PCM_CD = 1 << 8, | ||
| 316 | EM28XX_AOUT_PCM_VIDEO = 2 << 8, | ||
| 317 | EM28XX_AOUT_PCM_AUX = 3 << 8, | ||
| 318 | EM28XX_AOUT_PCM_LINE = 4 << 8, | ||
| 319 | EM28XX_AOUT_PCM_STEREO = 5 << 8, | ||
| 320 | EM28XX_AOUT_PCM_MONO = 6 << 8, | ||
| 321 | EM28XX_AOUT_PCM_PHONE = 7 << 8, | ||
| 308 | }; | 322 | }; |
| 309 | 323 | ||
| 324 | static inline int ac97_return_record_select(int a_out) | ||
| 325 | { | ||
| 326 | return (a_out & 0x700) >> 8; | ||
| 327 | } | ||
| 328 | |||
| 310 | struct em28xx_reg_seq { | 329 | struct em28xx_reg_seq { |
| 311 | int reg; | 330 | int reg; |
| 312 | unsigned char val, mask; | 331 | unsigned char val, mask; |
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 5e36b9a4ae3e..2ed24527ecd6 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
| @@ -423,7 +423,8 @@ static void destroy_urbs(struct gspca_dev *gspca_dev) | |||
| 423 | break; | 423 | break; |
| 424 | 424 | ||
| 425 | gspca_dev->urb[i] = NULL; | 425 | gspca_dev->urb[i] = NULL; |
| 426 | usb_kill_urb(urb); | 426 | if (!gspca_dev->present) |
| 427 | usb_kill_urb(urb); | ||
| 427 | if (urb->transfer_buffer != NULL) | 428 | if (urb->transfer_buffer != NULL) |
| 428 | usb_buffer_free(gspca_dev->dev, | 429 | usb_buffer_free(gspca_dev->dev, |
| 429 | urb->transfer_buffer_length, | 430 | urb->transfer_buffer_length, |
| @@ -1950,7 +1951,6 @@ void gspca_disconnect(struct usb_interface *intf) | |||
| 1950 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); | 1951 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); |
| 1951 | 1952 | ||
| 1952 | gspca_dev->present = 0; | 1953 | gspca_dev->present = 0; |
| 1953 | gspca_dev->streaming = 0; | ||
| 1954 | 1954 | ||
| 1955 | usb_set_intfdata(intf, NULL); | 1955 | usb_set_intfdata(intf, NULL); |
| 1956 | 1956 | ||
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index e8e5921cdc34..c46c990987f9 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
| @@ -949,8 +949,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev, | |||
| 949 | itv->instance = atomic_inc_return(&ivtv_instance) - 1; | 949 | itv->instance = atomic_inc_return(&ivtv_instance) - 1; |
| 950 | 950 | ||
| 951 | retval = v4l2_device_register(&dev->dev, &itv->device); | 951 | retval = v4l2_device_register(&dev->dev, &itv->device); |
| 952 | if (retval) | 952 | if (retval) { |
| 953 | kfree(itv); | ||
| 953 | return retval; | 954 | return retval; |
| 955 | } | ||
| 954 | /* "ivtv + PCI ID" is a bit of a mouthful, so use | 956 | /* "ivtv + PCI ID" is a bit of a mouthful, so use |
| 955 | "ivtv + instance" instead. */ | 957 | "ivtv + instance" instead. */ |
| 956 | snprintf(itv->device.name, sizeof(itv->device.name), | 958 | snprintf(itv->device.name, sizeof(itv->device.name), |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 39fbc970f43d..0d810189dd87 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | #include <linux/poll.h> | 62 | #include <linux/poll.h> |
| 63 | #include <linux/slab.h> | 63 | #include <linux/slab.h> |
| 64 | #include <linux/vmalloc.h> | 64 | #include <linux/vmalloc.h> |
| 65 | #include <linux/version.h> | ||
| 66 | #include <asm/io.h> | 65 | #include <asm/io.h> |
| 67 | 66 | ||
| 68 | #include "pwc.h" | 67 | #include "pwc.h" |
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c index d6848f7a503b..05221d47dd4c 100644 --- a/drivers/media/video/saa7127.c +++ b/drivers/media/video/saa7127.c | |||
| @@ -149,7 +149,7 @@ static const struct i2c_reg_value saa7127_init_config_common[] = { | |||
| 149 | { SAA7127_REG_COPYGEN_0, 0x77 }, | 149 | { SAA7127_REG_COPYGEN_0, 0x77 }, |
| 150 | { SAA7127_REG_COPYGEN_1, 0x41 }, | 150 | { SAA7127_REG_COPYGEN_1, 0x41 }, |
| 151 | { SAA7127_REG_COPYGEN_2, 0x00 }, /* Macrovision enable/disable */ | 151 | { SAA7127_REG_COPYGEN_2, 0x00 }, /* Macrovision enable/disable */ |
| 152 | { SAA7127_REG_OUTPUT_PORT_CONTROL, 0x9e }, | 152 | { SAA7127_REG_OUTPUT_PORT_CONTROL, 0xbf }, |
| 153 | { SAA7127_REG_GAIN_LUMINANCE_RGB, 0x00 }, | 153 | { SAA7127_REG_GAIN_LUMINANCE_RGB, 0x00 }, |
| 154 | { SAA7127_REG_GAIN_COLORDIFF_RGB, 0x00 }, | 154 | { SAA7127_REG_GAIN_COLORDIFF_RGB, 0x00 }, |
| 155 | { SAA7127_REG_INPUT_PORT_CONTROL_1, 0x80 }, /* for color bars */ | 155 | { SAA7127_REG_INPUT_PORT_CONTROL_1, 0x80 }, /* for color bars */ |
| @@ -488,12 +488,18 @@ static int saa7127_set_output_type(struct v4l2_subdev *sd, int output) | |||
| 488 | break; | 488 | break; |
| 489 | 489 | ||
| 490 | case SAA7127_OUTPUT_TYPE_COMPOSITE: | 490 | case SAA7127_OUTPUT_TYPE_COMPOSITE: |
| 491 | state->reg_2d = 0x08; /* 00001000 CVBS only, RGB DAC's off (high impedance mode) */ | 491 | if (state->ident == V4L2_IDENT_SAA7129) |
| 492 | state->reg_2d = 0x20; /* CVBS only */ | ||
| 493 | else | ||
| 494 | state->reg_2d = 0x08; /* 00001000 CVBS only, RGB DAC's off (high impedance mode) */ | ||
| 492 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ | 495 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ |
| 493 | break; | 496 | break; |
| 494 | 497 | ||
| 495 | case SAA7127_OUTPUT_TYPE_SVIDEO: | 498 | case SAA7127_OUTPUT_TYPE_SVIDEO: |
| 496 | state->reg_2d = 0xff; /* 11111111 croma -> R, luma -> CVBS + G + B */ | 499 | if (state->ident == V4L2_IDENT_SAA7129) |
| 500 | state->reg_2d = 0x18; /* Y + C */ | ||
| 501 | else | ||
| 502 | state->reg_2d = 0xff; /*11111111 croma -> R, luma -> CVBS + G + B */ | ||
| 497 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ | 503 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ |
| 498 | break; | 504 | break; |
| 499 | 505 | ||
| @@ -508,7 +514,10 @@ static int saa7127_set_output_type(struct v4l2_subdev *sd, int output) | |||
| 508 | break; | 514 | break; |
| 509 | 515 | ||
| 510 | case SAA7127_OUTPUT_TYPE_BOTH: | 516 | case SAA7127_OUTPUT_TYPE_BOTH: |
| 511 | state->reg_2d = 0xbf; | 517 | if (state->ident == V4L2_IDENT_SAA7129) |
| 518 | state->reg_2d = 0x38; | ||
| 519 | else | ||
| 520 | state->reg_2d = 0xbf; | ||
| 512 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ | 521 | state->reg_3a = 0x13; /* by default switch YUV to RGB-matrix on */ |
| 513 | break; | 522 | break; |
| 514 | 523 | ||
| @@ -731,24 +740,6 @@ static int saa7127_probe(struct i2c_client *client, | |||
| 731 | return -ENODEV; | 740 | return -ENODEV; |
| 732 | } | 741 | } |
| 733 | 742 | ||
| 734 | /* Configure Encoder */ | ||
| 735 | |||
| 736 | v4l2_dbg(1, debug, sd, "Configuring encoder\n"); | ||
| 737 | saa7127_write_inittab(sd, saa7127_init_config_common); | ||
| 738 | saa7127_set_std(sd, V4L2_STD_NTSC); | ||
| 739 | saa7127_set_output_type(sd, SAA7127_OUTPUT_TYPE_BOTH); | ||
| 740 | saa7127_set_vps(sd, &vbi); | ||
| 741 | saa7127_set_wss(sd, &vbi); | ||
| 742 | saa7127_set_cc(sd, &vbi); | ||
| 743 | saa7127_set_xds(sd, &vbi); | ||
| 744 | if (test_image == 1) | ||
| 745 | /* The Encoder has an internal Colorbar generator */ | ||
| 746 | /* This can be used for debugging */ | ||
| 747 | saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_TEST_IMAGE); | ||
| 748 | else | ||
| 749 | saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_NORMAL); | ||
| 750 | saa7127_set_video_enable(sd, 1); | ||
| 751 | |||
| 752 | if (id->driver_data) { /* Chip type is already known */ | 743 | if (id->driver_data) { /* Chip type is already known */ |
| 753 | state->ident = id->driver_data; | 744 | state->ident = id->driver_data; |
| 754 | } else { /* Needs detection */ | 745 | } else { /* Needs detection */ |
| @@ -770,6 +761,23 @@ static int saa7127_probe(struct i2c_client *client, | |||
| 770 | 761 | ||
| 771 | v4l2_info(sd, "%s found @ 0x%x (%s)\n", client->name, | 762 | v4l2_info(sd, "%s found @ 0x%x (%s)\n", client->name, |
| 772 | client->addr << 1, client->adapter->name); | 763 | client->addr << 1, client->adapter->name); |
| 764 | |||
| 765 | v4l2_dbg(1, debug, sd, "Configuring encoder\n"); | ||
| 766 | saa7127_write_inittab(sd, saa7127_init_config_common); | ||
| 767 | saa7127_set_std(sd, V4L2_STD_NTSC); | ||
| 768 | saa7127_set_output_type(sd, SAA7127_OUTPUT_TYPE_BOTH); | ||
| 769 | saa7127_set_vps(sd, &vbi); | ||
| 770 | saa7127_set_wss(sd, &vbi); | ||
| 771 | saa7127_set_cc(sd, &vbi); | ||
| 772 | saa7127_set_xds(sd, &vbi); | ||
| 773 | if (test_image == 1) | ||
| 774 | /* The Encoder has an internal Colorbar generator */ | ||
| 775 | /* This can be used for debugging */ | ||
| 776 | saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_TEST_IMAGE); | ||
| 777 | else | ||
| 778 | saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_NORMAL); | ||
| 779 | saa7127_set_video_enable(sd, 1); | ||
| 780 | |||
| 773 | if (state->ident == V4L2_IDENT_SAA7129) | 781 | if (state->ident == V4L2_IDENT_SAA7129) |
| 774 | saa7127_write_inittab(sd, saa7129_init_config_extra); | 782 | saa7127_write_inittab(sd, saa7129_init_config_extra); |
| 775 | return 0; | 783 | return 0; |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index 26194a0ce927..c750d3dd57d2 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -1089,7 +1089,11 @@ static int saa7134_alsa_init(void) | |||
| 1089 | 1089 | ||
| 1090 | list_for_each(list,&saa7134_devlist) { | 1090 | list_for_each(list,&saa7134_devlist) { |
| 1091 | dev = list_entry(list, struct saa7134_dev, devlist); | 1091 | dev = list_entry(list, struct saa7134_dev, devlist); |
| 1092 | alsa_device_init(dev); | 1092 | if (dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7130) |
| 1093 | printk(KERN_INFO "%s/alsa: %s doesn't support digital audio\n", | ||
| 1094 | dev->name, saa7134_boards[dev->board].name); | ||
| 1095 | else | ||
| 1096 | alsa_device_init(dev); | ||
| 1093 | } | 1097 | } |
| 1094 | 1098 | ||
| 1095 | if (dev == NULL) | 1099 | if (dev == NULL) |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index dfbe08a9ad9b..99221d726edb 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
| @@ -660,6 +660,10 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) | |||
| 660 | 660 | ||
| 661 | saa_writel(SAA7134_IRQ1, 0); | 661 | saa_writel(SAA7134_IRQ1, 0); |
| 662 | saa_writel(SAA7134_IRQ2, 0); | 662 | saa_writel(SAA7134_IRQ2, 0); |
| 663 | |||
| 664 | /* Clear any stale IRQ reports */ | ||
| 665 | saa_writel(SAA7134_IRQ_REPORT, saa_readl(SAA7134_IRQ_REPORT)); | ||
| 666 | |||
| 663 | mutex_init(&dev->lock); | 667 | mutex_init(&dev->lock); |
| 664 | spin_lock_init(&dev->slock); | 668 | spin_lock_init(&dev->slock); |
| 665 | 669 | ||
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 454ad1dd7507..88c5e942f751 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/version.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 56f0c0eb500f..00c6cbe06ab0 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c | |||
| @@ -242,7 +242,7 @@ static int tda9875_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) | |||
| 242 | static int tda9875_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) | 242 | static int tda9875_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) |
| 243 | { | 243 | { |
| 244 | struct tda9875 *t = to_state(sd); | 244 | struct tda9875 *t = to_state(sd); |
| 245 | int chvol=0, volume, balance, left, right; | 245 | int chvol = 0, volume = 0, balance = 0, left, right; |
| 246 | 246 | ||
| 247 | switch (ctrl->id) { | 247 | switch (ctrl->id) { |
| 248 | case V4L2_CID_AUDIO_VOLUME: | 248 | case V4L2_CID_AUDIO_VOLUME: |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 3b0b84c2e451..78277abb733b 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
| @@ -427,6 +427,9 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 427 | const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" }; | 427 | const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" }; |
| 428 | 428 | ||
| 429 | memset(tvee, 0, sizeof(*tvee)); | 429 | memset(tvee, 0, sizeof(*tvee)); |
| 430 | tvee->tuner_type = TUNER_ABSENT; | ||
| 431 | tvee->tuner2_type = TUNER_ABSENT; | ||
| 432 | |||
| 430 | done = len = beenhere = 0; | 433 | done = len = beenhere = 0; |
| 431 | 434 | ||
| 432 | /* Different eeprom start offsets for em28xx, cx2388x and cx23418 */ | 435 | /* Different eeprom start offsets for em28xx, cx2388x and cx23418 */ |
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c index ac9aa40d09f6..8e23aa53c29a 100644 --- a/drivers/media/video/tvp514x.c +++ b/drivers/media/video/tvp514x.c | |||
| @@ -1401,7 +1401,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 1401 | 1401 | ||
| 1402 | decoder->pdata = client->dev.platform_data; | 1402 | decoder->pdata = client->dev.platform_data; |
| 1403 | if (!decoder->pdata) { | 1403 | if (!decoder->pdata) { |
| 1404 | v4l_err(client, "No platform data\n!!"); | 1404 | v4l_err(client, "No platform data!!\n"); |
| 1405 | return -ENODEV; | 1405 | return -ENODEV; |
| 1406 | } | 1406 | } |
| 1407 | /* | 1407 | /* |
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c index 4f16effb530f..f4522bb08916 100644 --- a/drivers/media/video/upd64031a.c +++ b/drivers/media/video/upd64031a.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <linux/version.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c index 4b712f69d1b7..a5fb74bf2407 100644 --- a/drivers/media/video/upd64083.c +++ b/drivers/media/video/upd64083.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * 02110-1301, USA. | 21 | * 02110-1301, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/version.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index 9907b9aff2b9..6b66ae4f430f 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c | |||
| @@ -157,7 +157,7 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) | |||
| 157 | struct i2c_msg *pmsg; | 157 | struct i2c_msg *pmsg; |
| 158 | struct usb_usbvision *usbvision; | 158 | struct usb_usbvision *usbvision; |
| 159 | int i, ret; | 159 | int i, ret; |
| 160 | unsigned char addr; | 160 | unsigned char addr = 0; |
| 161 | 161 | ||
| 162 | usbvision = (struct usb_usbvision *)i2c_get_adapdata(i2c_adap); | 162 | usbvision = (struct usb_usbvision *)i2c_get_adapdata(i2c_adap); |
| 163 | 163 | ||
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 2208165aa6f0..d2576f6391c0 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_ctrl.c -- USB Video Class driver - Controls | 2 | * uvc_ctrl.c -- USB Video Class driver - Controls |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005-2008 | 4 | * Copyright (C) 2005-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
| @@ -29,7 +28,7 @@ | |||
| 29 | #define UVC_CTRL_DATA_BACKUP 1 | 28 | #define UVC_CTRL_DATA_BACKUP 1 |
| 30 | 29 | ||
| 31 | /* ------------------------------------------------------------------------ | 30 | /* ------------------------------------------------------------------------ |
| 32 | * Control, formats, ... | 31 | * Controls |
| 33 | */ | 32 | */ |
| 34 | 33 | ||
| 35 | static struct uvc_control_info uvc_ctrls[] = { | 34 | static struct uvc_control_info uvc_ctrls[] = { |
| @@ -635,7 +634,7 @@ static __s32 uvc_get_le_value(struct uvc_control_mapping *mapping, | |||
| 635 | mask = (1 << bits) - 1; | 634 | mask = (1 << bits) - 1; |
| 636 | } | 635 | } |
| 637 | 636 | ||
| 638 | /* Sign-extend the value if needed */ | 637 | /* Sign-extend the value if needed. */ |
| 639 | if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED) | 638 | if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED) |
| 640 | value |= -(value & (1 << (mapping->size - 1))); | 639 | value |= -(value & (1 << (mapping->size - 1))); |
| 641 | 640 | ||
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 89d8bd10a852..b12873265cc5 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_driver.c -- USB Video Class driver | 2 | * uvc_driver.c -- USB Video Class driver |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005-2008 | 4 | * Copyright (C) 2005-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| @@ -49,7 +48,7 @@ static unsigned int uvc_quirks_param; | |||
| 49 | unsigned int uvc_trace_param; | 48 | unsigned int uvc_trace_param; |
| 50 | 49 | ||
| 51 | /* ------------------------------------------------------------------------ | 50 | /* ------------------------------------------------------------------------ |
| 52 | * Control, formats, ... | 51 | * Video formats |
| 53 | */ | 52 | */ |
| 54 | 53 | ||
| 55 | static struct uvc_format_desc uvc_fmts[] = { | 54 | static struct uvc_format_desc uvc_fmts[] = { |
| @@ -474,7 +473,7 @@ static int uvc_parse_format(struct uvc_device *dev, | |||
| 474 | 473 | ||
| 475 | /* Several UVC chipsets screw up dwMaxVideoFrameBufferSize | 474 | /* Several UVC chipsets screw up dwMaxVideoFrameBufferSize |
| 476 | * completely. Observed behaviours range from setting the | 475 | * completely. Observed behaviours range from setting the |
| 477 | * value to 1.1x the actual frame size of hardwiring the | 476 | * value to 1.1x the actual frame size to hardwiring the |
| 478 | * 16 low bits to 0. This results in a higher than necessary | 477 | * 16 low bits to 0. This results in a higher than necessary |
| 479 | * memory usage as well as a wrong image size information. For | 478 | * memory usage as well as a wrong image size information. For |
| 480 | * uncompressed formats this can be fixed by computing the | 479 | * uncompressed formats this can be fixed by computing the |
| @@ -487,7 +486,7 @@ static int uvc_parse_format(struct uvc_device *dev, | |||
| 487 | /* Some bogus devices report dwMinFrameInterval equal to | 486 | /* Some bogus devices report dwMinFrameInterval equal to |
| 488 | * dwMaxFrameInterval and have dwFrameIntervalStep set to | 487 | * dwMaxFrameInterval and have dwFrameIntervalStep set to |
| 489 | * zero. Setting all null intervals to 1 fixes the problem and | 488 | * zero. Setting all null intervals to 1 fixes the problem and |
| 490 | * some other divisions by zero which could happen. | 489 | * some other divisions by zero that could happen. |
| 491 | */ | 490 | */ |
| 492 | for (i = 0; i < n; ++i) { | 491 | for (i = 0; i < n; ++i) { |
| 493 | interval = get_unaligned_le32(&buffer[26+4*i]); | 492 | interval = get_unaligned_le32(&buffer[26+4*i]); |
| @@ -1200,13 +1199,13 @@ static void uvc_unregister_video(struct uvc_device *dev) | |||
| 1200 | * Scan the UVC descriptors to locate a chain starting at an Output Terminal | 1199 | * Scan the UVC descriptors to locate a chain starting at an Output Terminal |
| 1201 | * and containing the following units: | 1200 | * and containing the following units: |
| 1202 | * | 1201 | * |
| 1203 | * - a USB Streaming Output Terminal | 1202 | * - one Output Terminal (USB Streaming or Display) |
| 1204 | * - zero or one Processing Unit | 1203 | * - zero or one Processing Unit |
| 1205 | * - zero, one or mode single-input Selector Units | 1204 | * - zero, one or mode single-input Selector Units |
| 1206 | * - zero or one multiple-input Selector Units, provided all inputs are | 1205 | * - zero or one multiple-input Selector Units, provided all inputs are |
| 1207 | * connected to input terminals | 1206 | * connected to input terminals |
| 1208 | * - zero, one or mode single-input Extension Units | 1207 | * - zero, one or mode single-input Extension Units |
| 1209 | * - one Camera Input Terminal, or one or more External terminals. | 1208 | * - one or more Input Terminals (Camera, External or USB Streaming) |
| 1210 | * | 1209 | * |
| 1211 | * A side forward scan is made on each detected entity to check for additional | 1210 | * A side forward scan is made on each detected entity to check for additional |
| 1212 | * extension units. | 1211 | * extension units. |
| @@ -1531,10 +1530,6 @@ static int uvc_register_video(struct uvc_device *dev) | |||
| 1531 | 1530 | ||
| 1532 | /* Set the driver data before calling video_register_device, otherwise | 1531 | /* Set the driver data before calling video_register_device, otherwise |
| 1533 | * uvc_v4l2_open might race us. | 1532 | * uvc_v4l2_open might race us. |
| 1534 | * | ||
| 1535 | * FIXME: usb_set_intfdata hasn't been called so far. Is that a | ||
| 1536 | * problem ? Does any function which could be called here get | ||
| 1537 | * a pointer to the usb_interface ? | ||
| 1538 | */ | 1533 | */ |
| 1539 | dev->video.vdev = vdev; | 1534 | dev->video.vdev = vdev; |
| 1540 | video_set_drvdata(vdev, &dev->video); | 1535 | video_set_drvdata(vdev, &dev->video); |
| @@ -1569,7 +1564,7 @@ void uvc_delete(struct kref *kref) | |||
| 1569 | struct uvc_device *dev = container_of(kref, struct uvc_device, kref); | 1564 | struct uvc_device *dev = container_of(kref, struct uvc_device, kref); |
| 1570 | struct list_head *p, *n; | 1565 | struct list_head *p, *n; |
| 1571 | 1566 | ||
| 1572 | /* Unregister the video device */ | 1567 | /* Unregister the video device. */ |
| 1573 | uvc_unregister_video(dev); | 1568 | uvc_unregister_video(dev); |
| 1574 | usb_put_intf(dev->intf); | 1569 | usb_put_intf(dev->intf); |
| 1575 | usb_put_dev(dev->udev); | 1570 | usb_put_dev(dev->udev); |
| @@ -1612,7 +1607,7 @@ static int uvc_probe(struct usb_interface *intf, | |||
| 1612 | uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n", | 1607 | uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n", |
| 1613 | udev->devpath); | 1608 | udev->devpath); |
| 1614 | 1609 | ||
| 1615 | /* Allocate memory for the device and initialize it */ | 1610 | /* Allocate memory for the device and initialize it. */ |
| 1616 | if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL) | 1611 | if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL) |
| 1617 | return -ENOMEM; | 1612 | return -ENOMEM; |
| 1618 | 1613 | ||
| @@ -1633,14 +1628,14 @@ static int uvc_probe(struct usb_interface *intf, | |||
| 1633 | le16_to_cpu(udev->descriptor.idVendor), | 1628 | le16_to_cpu(udev->descriptor.idVendor), |
| 1634 | le16_to_cpu(udev->descriptor.idProduct)); | 1629 | le16_to_cpu(udev->descriptor.idProduct)); |
| 1635 | 1630 | ||
| 1636 | /* Parse the Video Class control descriptor */ | 1631 | /* Parse the Video Class control descriptor. */ |
| 1637 | if (uvc_parse_control(dev) < 0) { | 1632 | if (uvc_parse_control(dev) < 0) { |
| 1638 | uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC " | 1633 | uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC " |
| 1639 | "descriptors.\n"); | 1634 | "descriptors.\n"); |
| 1640 | goto error; | 1635 | goto error; |
| 1641 | } | 1636 | } |
| 1642 | 1637 | ||
| 1643 | uvc_printk(KERN_INFO, "Found UVC %u.%02u device %s (%04x:%04x)\n", | 1638 | uvc_printk(KERN_INFO, "Found UVC %u.%02x device %s (%04x:%04x)\n", |
| 1644 | dev->uvc_version >> 8, dev->uvc_version & 0xff, | 1639 | dev->uvc_version >> 8, dev->uvc_version & 0xff, |
| 1645 | udev->product ? udev->product : "<unnamed>", | 1640 | udev->product ? udev->product : "<unnamed>", |
| 1646 | le16_to_cpu(udev->descriptor.idVendor), | 1641 | le16_to_cpu(udev->descriptor.idVendor), |
| @@ -1653,18 +1648,18 @@ static int uvc_probe(struct usb_interface *intf, | |||
| 1653 | "linux-uvc-devel mailing list.\n"); | 1648 | "linux-uvc-devel mailing list.\n"); |
| 1654 | } | 1649 | } |
| 1655 | 1650 | ||
| 1656 | /* Initialize controls */ | 1651 | /* Initialize controls. */ |
| 1657 | if (uvc_ctrl_init_device(dev) < 0) | 1652 | if (uvc_ctrl_init_device(dev) < 0) |
| 1658 | goto error; | 1653 | goto error; |
| 1659 | 1654 | ||
| 1660 | /* Register the video devices */ | 1655 | /* Register the video devices. */ |
| 1661 | if (uvc_register_video(dev) < 0) | 1656 | if (uvc_register_video(dev) < 0) |
| 1662 | goto error; | 1657 | goto error; |
| 1663 | 1658 | ||
| 1664 | /* Save our data pointer in the interface data */ | 1659 | /* Save our data pointer in the interface data. */ |
| 1665 | usb_set_intfdata(intf, dev); | 1660 | usb_set_intfdata(intf, dev); |
| 1666 | 1661 | ||
| 1667 | /* Initialize the interrupt URB */ | 1662 | /* Initialize the interrupt URB. */ |
| 1668 | if ((ret = uvc_status_init(dev)) < 0) { | 1663 | if ((ret = uvc_status_init(dev)) < 0) { |
| 1669 | uvc_printk(KERN_INFO, "Unable to initialize the status " | 1664 | uvc_printk(KERN_INFO, "Unable to initialize the status " |
| 1670 | "endpoint (%d), status interrupt will not be " | 1665 | "endpoint (%d), status interrupt will not be " |
| @@ -1839,24 +1834,24 @@ static struct usb_device_id uvc_ids[] = { | |||
| 1839 | .bInterfaceSubClass = 1, | 1834 | .bInterfaceSubClass = 1, |
| 1840 | .bInterfaceProtocol = 0 }, | 1835 | .bInterfaceProtocol = 0 }, |
| 1841 | /* Apple Built-In iSight */ | 1836 | /* Apple Built-In iSight */ |
| 1842 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1837 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 1843 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1838 | | USB_DEVICE_ID_MATCH_INT_INFO, |
| 1844 | .idVendor = 0x05ac, | 1839 | .idVendor = 0x05ac, |
| 1845 | .idProduct = 0x8501, | 1840 | .idProduct = 0x8501, |
| 1846 | .bInterfaceClass = USB_CLASS_VIDEO, | 1841 | .bInterfaceClass = USB_CLASS_VIDEO, |
| 1847 | .bInterfaceSubClass = 1, | 1842 | .bInterfaceSubClass = 1, |
| 1848 | .bInterfaceProtocol = 0, | 1843 | .bInterfaceProtocol = 0, |
| 1849 | .driver_info = UVC_QUIRK_PROBE_MINMAX | 1844 | .driver_info = UVC_QUIRK_PROBE_MINMAX |
| 1850 | | UVC_QUIRK_BUILTIN_ISIGHT }, | 1845 | | UVC_QUIRK_BUILTIN_ISIGHT }, |
| 1851 | /* Genesys Logic USB 2.0 PC Camera */ | 1846 | /* Genesys Logic USB 2.0 PC Camera */ |
| 1852 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1847 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 1853 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1848 | | USB_DEVICE_ID_MATCH_INT_INFO, |
| 1854 | .idVendor = 0x05e3, | 1849 | .idVendor = 0x05e3, |
| 1855 | .idProduct = 0x0505, | 1850 | .idProduct = 0x0505, |
| 1856 | .bInterfaceClass = USB_CLASS_VIDEO, | 1851 | .bInterfaceClass = USB_CLASS_VIDEO, |
| 1857 | .bInterfaceSubClass = 1, | 1852 | .bInterfaceSubClass = 1, |
| 1858 | .bInterfaceProtocol = 0, | 1853 | .bInterfaceProtocol = 0, |
| 1859 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, | 1854 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, |
| 1860 | /* MT6227 */ | 1855 | /* MT6227 */ |
| 1861 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 1856 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 1862 | | USB_DEVICE_ID_MATCH_INT_INFO, | 1857 | | USB_DEVICE_ID_MATCH_INT_INFO, |
diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/video/uvc/uvc_isight.c index 37bdefdbead5..436f462685a0 100644 --- a/drivers/media/video/uvc/uvc_isight.c +++ b/drivers/media/video/uvc/uvc_isight.c | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2006-2007 | 4 | * Copyright (C) 2006-2007 |
| 5 | * Ivan N. Zlatev <contact@i-nz.net> | 5 | * Ivan N. Zlatev <contact@i-nz.net> |
| 6 | * Copyright (C) 2008-2009 | ||
| 7 | * Laurent Pinchart <laurent.pinchart@skynet.be> | ||
| 6 | * | 8 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c index 42546342e97d..0155752e4a5a 100644 --- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/video/uvc/uvc_queue.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_queue.c -- USB Video Class driver - Buffers management | 2 | * uvc_queue.c -- USB Video Class driver - Buffers management |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005-2008 | 4 | * Copyright (C) 2005-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| @@ -37,22 +36,22 @@ | |||
| 37 | * to user space will return -EBUSY. | 36 | * to user space will return -EBUSY. |
| 38 | * | 37 | * |
| 39 | * Video buffers are managed using two queues. However, unlike most USB video | 38 | * Video buffers are managed using two queues. However, unlike most USB video |
| 40 | * drivers which use an in queue and an out queue, we use a main queue which | 39 | * drivers that use an in queue and an out queue, we use a main queue to hold |
| 41 | * holds all queued buffers (both 'empty' and 'done' buffers), and an irq | 40 | * all queued buffers (both 'empty' and 'done' buffers), and an irq queue to |
| 42 | * queue which holds empty buffers. This design (copied from video-buf) | 41 | * hold empty buffers. This design (copied from video-buf) minimizes locking |
| 43 | * minimizes locking in interrupt, as only one queue is shared between | 42 | * in interrupt, as only one queue is shared between interrupt and user |
| 44 | * interrupt and user contexts. | 43 | * contexts. |
| 45 | * | 44 | * |
| 46 | * Use cases | 45 | * Use cases |
| 47 | * --------- | 46 | * --------- |
| 48 | * | 47 | * |
| 49 | * Unless stated otherwise, all operations which modify the irq buffers queue | 48 | * Unless stated otherwise, all operations that modify the irq buffers queue |
| 50 | * are protected by the irq spinlock. | 49 | * are protected by the irq spinlock. |
| 51 | * | 50 | * |
| 52 | * 1. The user queues the buffers, starts streaming and dequeues a buffer. | 51 | * 1. The user queues the buffers, starts streaming and dequeues a buffer. |
| 53 | * | 52 | * |
| 54 | * The buffers are added to the main and irq queues. Both operations are | 53 | * The buffers are added to the main and irq queues. Both operations are |
| 55 | * protected by the queue lock, and the latert is protected by the irq | 54 | * protected by the queue lock, and the later is protected by the irq |
| 56 | * spinlock as well. | 55 | * spinlock as well. |
| 57 | * | 56 | * |
| 58 | * The completion handler fetches a buffer from the irq queue and fills it | 57 | * The completion handler fetches a buffer from the irq queue and fills it |
| @@ -60,7 +59,7 @@ | |||
| 60 | * returns immediately. | 59 | * returns immediately. |
| 61 | * | 60 | * |
| 62 | * When the buffer is full, the completion handler removes it from the irq | 61 | * When the buffer is full, the completion handler removes it from the irq |
| 63 | * queue, marks it as ready (UVC_BUF_STATE_DONE) and wake its wait queue. | 62 | * queue, marks it as ready (UVC_BUF_STATE_DONE) and wakes its wait queue. |
| 64 | * At that point, any process waiting on the buffer will be woken up. If a | 63 | * At that point, any process waiting on the buffer will be woken up. If a |
| 65 | * process tries to dequeue a buffer after it has been marked ready, the | 64 | * process tries to dequeue a buffer after it has been marked ready, the |
| 66 | * dequeing will succeed immediately. | 65 | * dequeing will succeed immediately. |
| @@ -91,8 +90,8 @@ void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type) | |||
| 91 | /* | 90 | /* |
| 92 | * Allocate the video buffers. | 91 | * Allocate the video buffers. |
| 93 | * | 92 | * |
| 94 | * Pages are reserved to make sure they will not be swaped, as they will be | 93 | * Pages are reserved to make sure they will not be swapped, as they will be |
| 95 | * filled in URB completion handler. | 94 | * filled in the URB completion handler. |
| 96 | * | 95 | * |
| 97 | * Buffers will be individually mapped, so they must all be page aligned. | 96 | * Buffers will be individually mapped, so they must all be page aligned. |
| 98 | */ | 97 | */ |
| @@ -210,8 +209,8 @@ int uvc_query_buffer(struct uvc_video_queue *queue, | |||
| 210 | __uvc_query_buffer(&queue->buffer[v4l2_buf->index], v4l2_buf); | 209 | __uvc_query_buffer(&queue->buffer[v4l2_buf->index], v4l2_buf); |
| 211 | 210 | ||
| 212 | done: | 211 | done: |
| 213 | mutex_unlock(&queue->mutex); | 212 | mutex_unlock(&queue->mutex); |
| 214 | return ret; | 213 | return ret; |
| 215 | } | 214 | } |
| 216 | 215 | ||
| 217 | /* | 216 | /* |
| @@ -236,7 +235,7 @@ int uvc_queue_buffer(struct uvc_video_queue *queue, | |||
| 236 | } | 235 | } |
| 237 | 236 | ||
| 238 | mutex_lock(&queue->mutex); | 237 | mutex_lock(&queue->mutex); |
| 239 | if (v4l2_buf->index >= queue->count) { | 238 | if (v4l2_buf->index >= queue->count) { |
| 240 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Out of range index.\n"); | 239 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Out of range index.\n"); |
| 241 | ret = -EINVAL; | 240 | ret = -EINVAL; |
| 242 | goto done; | 241 | goto done; |
| @@ -429,7 +428,7 @@ done: | |||
| 429 | * Cancel the video buffers queue. | 428 | * Cancel the video buffers queue. |
| 430 | * | 429 | * |
| 431 | * Cancelling the queue marks all buffers on the irq queue as erroneous, | 430 | * Cancelling the queue marks all buffers on the irq queue as erroneous, |
| 432 | * wakes them up and remove them from the queue. | 431 | * wakes them up and removes them from the queue. |
| 433 | * | 432 | * |
| 434 | * If the disconnect parameter is set, further calls to uvc_queue_buffer will | 433 | * If the disconnect parameter is set, further calls to uvc_queue_buffer will |
| 435 | * fail with -ENODEV. | 434 | * fail with -ENODEV. |
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c index 5d60b264d59a..c1e4ae27c613 100644 --- a/drivers/media/video/uvc/uvc_status.c +++ b/drivers/media/video/uvc/uvc_status.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_status.c -- USB Video Class driver - Status endpoint | 2 | * uvc_status.c -- USB Video Class driver - Status endpoint |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007-2008 | 4 | * Copyright (C) 2007-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 17 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 18 | #include <linux/usb/input.h> | 17 | #include <linux/usb/input.h> |
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index fa150fff2c10..d681519d0c8a 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_v4l2.c -- USB Video Class driver - V4L2 API | 2 | * uvc_v4l2.c -- USB Video Class driver - V4L2 API |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005-2008 | 4 | * Copyright (C) 2005-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -37,7 +37,7 @@ | |||
| 37 | * must be grouped (for instance the Red Balance, Blue Balance and Do White | 37 | * must be grouped (for instance the Red Balance, Blue Balance and Do White |
| 38 | * Balance V4L2 controls use the White Balance Component UVC control) or | 38 | * Balance V4L2 controls use the White Balance Component UVC control) or |
| 39 | * otherwise translated. The approach we take here is to use a translation | 39 | * otherwise translated. The approach we take here is to use a translation |
| 40 | * table for the controls which can be mapped directly, and handle the others | 40 | * table for the controls that can be mapped directly, and handle the others |
| 41 | * manually. | 41 | * manually. |
| 42 | */ | 42 | */ |
| 43 | static int uvc_v4l2_query_menu(struct uvc_video_device *video, | 43 | static int uvc_v4l2_query_menu(struct uvc_video_device *video, |
| @@ -189,7 +189,7 @@ static int uvc_v4l2_try_format(struct uvc_video_device *video, | |||
| 189 | probe->dwMaxVideoFrameSize = | 189 | probe->dwMaxVideoFrameSize = |
| 190 | video->streaming->ctrl.dwMaxVideoFrameSize; | 190 | video->streaming->ctrl.dwMaxVideoFrameSize; |
| 191 | 191 | ||
| 192 | /* Probe the device */ | 192 | /* Probe the device. */ |
| 193 | if ((ret = uvc_probe_video(video, probe)) < 0) | 193 | if ((ret = uvc_probe_video(video, probe)) < 0) |
| 194 | goto done; | 194 | goto done; |
| 195 | 195 | ||
| @@ -354,11 +354,11 @@ static int uvc_v4l2_set_streamparm(struct uvc_video_device *video, | |||
| 354 | * | 354 | * |
| 355 | * Each open instance of a UVC device can either be in a privileged or | 355 | * Each open instance of a UVC device can either be in a privileged or |
| 356 | * unprivileged state. Only a single instance can be in a privileged state at | 356 | * unprivileged state. Only a single instance can be in a privileged state at |
| 357 | * a given time. Trying to perform an operation which requires privileges will | 357 | * a given time. Trying to perform an operation that requires privileges will |
| 358 | * automatically acquire the required privileges if possible, or return -EBUSY | 358 | * automatically acquire the required privileges if possible, or return -EBUSY |
| 359 | * otherwise. Privileges are dismissed when closing the instance. | 359 | * otherwise. Privileges are dismissed when closing the instance. |
| 360 | * | 360 | * |
| 361 | * Operations which require privileges are: | 361 | * Operations that require privileges are: |
| 362 | * | 362 | * |
| 363 | * - VIDIOC_S_INPUT | 363 | * - VIDIOC_S_INPUT |
| 364 | * - VIDIOC_S_PARM | 364 | * - VIDIOC_S_PARM |
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index e7c31995527f..9bc4705be78d 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * uvc_video.c -- USB Video Class driver - Video handling | 2 | * uvc_video.c -- USB Video Class driver - Video handling |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005-2008 | 4 | * Copyright (C) 2005-2009 |
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/usb.h> | 17 | #include <linux/usb.h> |
| @@ -115,7 +114,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video, | |||
| 115 | ctrl->wCompQuality = le16_to_cpup((__le16 *)data); | 114 | ctrl->wCompQuality = le16_to_cpup((__le16 *)data); |
| 116 | ret = 0; | 115 | ret = 0; |
| 117 | goto out; | 116 | goto out; |
| 118 | } else if (query == GET_DEF && probe == 1) { | 117 | } else if (query == GET_DEF && probe == 1 && ret != size) { |
| 119 | /* Many cameras don't support the GET_DEF request on their | 118 | /* Many cameras don't support the GET_DEF request on their |
| 120 | * video probe control. Warn once and return, the caller will | 119 | * video probe control. Warn once and return, the caller will |
| 121 | * fall back to GET_CUR. | 120 | * fall back to GET_CUR. |
| @@ -160,7 +159,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video, | |||
| 160 | } | 159 | } |
| 161 | 160 | ||
| 162 | /* Some broken devices return a null or wrong dwMaxVideoFrameSize. | 161 | /* Some broken devices return a null or wrong dwMaxVideoFrameSize. |
| 163 | * Try to get the value from the format and frame descriptor. | 162 | * Try to get the value from the format and frame descriptors. |
| 164 | */ | 163 | */ |
| 165 | uvc_fixup_buffer_size(video, ctrl); | 164 | uvc_fixup_buffer_size(video, ctrl); |
| 166 | ret = 0; | 165 | ret = 0; |
| @@ -191,9 +190,6 @@ static int uvc_set_video_ctrl(struct uvc_video_device *video, | |||
| 191 | *(__le16 *)&data[12] = cpu_to_le16(ctrl->wCompQuality); | 190 | *(__le16 *)&data[12] = cpu_to_le16(ctrl->wCompQuality); |
| 192 | *(__le16 *)&data[14] = cpu_to_le16(ctrl->wCompWindowSize); | 191 | *(__le16 *)&data[14] = cpu_to_le16(ctrl->wCompWindowSize); |
| 193 | *(__le16 *)&data[16] = cpu_to_le16(ctrl->wDelay); | 192 | *(__le16 *)&data[16] = cpu_to_le16(ctrl->wDelay); |
| 194 | /* Note: Some of the fields below are not required for IN devices (see | ||
| 195 | * UVC spec, 4.3.1.1), but we still copy them in case support for OUT | ||
| 196 | * devices is added in the future. */ | ||
| 197 | put_unaligned_le32(ctrl->dwMaxVideoFrameSize, &data[18]); | 193 | put_unaligned_le32(ctrl->dwMaxVideoFrameSize, &data[18]); |
| 198 | put_unaligned_le32(ctrl->dwMaxPayloadTransferSize, &data[22]); | 194 | put_unaligned_le32(ctrl->dwMaxPayloadTransferSize, &data[22]); |
| 199 | 195 | ||
| @@ -400,7 +396,7 @@ static int uvc_video_decode_start(struct uvc_video_device *video, | |||
| 400 | * | 396 | * |
| 401 | * Empty buffers (bytesused == 0) don't trigger end of frame detection | 397 | * Empty buffers (bytesused == 0) don't trigger end of frame detection |
| 402 | * as it doesn't make sense to return an empty buffer. This also | 398 | * as it doesn't make sense to return an empty buffer. This also |
| 403 | * avoids detecting and of frame conditions at FID toggling if the | 399 | * avoids detecting end of frame conditions at FID toggling if the |
| 404 | * previous payload had the EOF bit set. | 400 | * previous payload had the EOF bit set. |
| 405 | */ | 401 | */ |
| 406 | if (fid != video->last_fid && buf->buf.bytesused != 0) { | 402 | if (fid != video->last_fid && buf->buf.bytesused != 0) { |
| @@ -453,6 +449,17 @@ static void uvc_video_decode_end(struct uvc_video_device *video, | |||
| 453 | } | 449 | } |
| 454 | } | 450 | } |
| 455 | 451 | ||
| 452 | /* Video payload encoding is handled by uvc_video_encode_header() and | ||
| 453 | * uvc_video_encode_data(). Only bulk transfers are currently supported. | ||
| 454 | * | ||
| 455 | * uvc_video_encode_header is called at the start of a payload. It adds header | ||
| 456 | * data to the transfer buffer and returns the header size. As the only known | ||
| 457 | * UVC output device transfers a whole frame in a single payload, the EOF bit | ||
| 458 | * is always set in the header. | ||
| 459 | * | ||
| 460 | * uvc_video_encode_data is called for every URB and copies the data from the | ||
| 461 | * video buffer to the transfer buffer. | ||
| 462 | */ | ||
| 456 | static int uvc_video_encode_header(struct uvc_video_device *video, | 463 | static int uvc_video_encode_header(struct uvc_video_device *video, |
| 457 | struct uvc_buffer *buf, __u8 *data, int len) | 464 | struct uvc_buffer *buf, __u8 *data, int len) |
| 458 | { | 465 | { |
| @@ -953,7 +960,7 @@ int uvc_video_suspend(struct uvc_video_device *video) | |||
| 953 | } | 960 | } |
| 954 | 961 | ||
| 955 | /* | 962 | /* |
| 956 | * Reconfigure the video interface and restart streaming if it was enable | 963 | * Reconfigure the video interface and restart streaming if it was enabled |
| 957 | * before suspend. | 964 | * before suspend. |
| 958 | * | 965 | * |
| 959 | * If an error occurs, disable the video queue. This will wake all pending | 966 | * If an error occurs, disable the video queue. This will wake all pending |
| @@ -985,8 +992,8 @@ int uvc_video_resume(struct uvc_video_device *video) | |||
| 985 | */ | 992 | */ |
| 986 | 993 | ||
| 987 | /* | 994 | /* |
| 988 | * Initialize the UVC video device by retrieving the default format and | 995 | * Initialize the UVC video device by switching to alternate setting 0 and |
| 989 | * committing it. | 996 | * retrieve the default format. |
| 990 | * | 997 | * |
| 991 | * Some cameras (namely the Fuji Finepix) set the format and frame | 998 | * Some cameras (namely the Fuji Finepix) set the format and frame |
| 992 | * indexes to zero. The UVC standard doesn't clearly make this a spec | 999 | * indexes to zero. The UVC standard doesn't clearly make this a spec |
| @@ -1014,7 +1021,7 @@ int uvc_video_init(struct uvc_video_device *video) | |||
| 1014 | */ | 1021 | */ |
| 1015 | usb_set_interface(video->dev->udev, video->streaming->intfnum, 0); | 1022 | usb_set_interface(video->dev->udev, video->streaming->intfnum, 0); |
| 1016 | 1023 | ||
| 1017 | /* Some webcams don't suport GET_DEF request on the probe control. We | 1024 | /* Some webcams don't suport GET_DEF requests on the probe control. We |
| 1018 | * fall back to GET_CUR if GET_DEF fails. | 1025 | * fall back to GET_CUR if GET_DEF fails. |
| 1019 | */ | 1026 | */ |
| 1020 | if ((ret = uvc_get_video_ctrl(video, probe, 1, GET_DEF)) < 0 && | 1027 | if ((ret = uvc_get_video_ctrl(video, probe, 1, GET_DEF)) < 0 && |
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index bcf4361dc1bc..027947ea9b6e 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
| @@ -72,149 +72,149 @@ struct uvc_xu_control { | |||
| 72 | * UVC constants | 72 | * UVC constants |
| 73 | */ | 73 | */ |
| 74 | 74 | ||
| 75 | #define SC_UNDEFINED 0x00 | 75 | #define SC_UNDEFINED 0x00 |
| 76 | #define SC_VIDEOCONTROL 0x01 | 76 | #define SC_VIDEOCONTROL 0x01 |
| 77 | #define SC_VIDEOSTREAMING 0x02 | 77 | #define SC_VIDEOSTREAMING 0x02 |
| 78 | #define SC_VIDEO_INTERFACE_COLLECTION 0x03 | 78 | #define SC_VIDEO_INTERFACE_COLLECTION 0x03 |
| 79 | 79 | ||
| 80 | #define PC_PROTOCOL_UNDEFINED 0x00 | 80 | #define PC_PROTOCOL_UNDEFINED 0x00 |
| 81 | 81 | ||
| 82 | #define CS_UNDEFINED 0x20 | 82 | #define CS_UNDEFINED 0x20 |
| 83 | #define CS_DEVICE 0x21 | 83 | #define CS_DEVICE 0x21 |
| 84 | #define CS_CONFIGURATION 0x22 | 84 | #define CS_CONFIGURATION 0x22 |
| 85 | #define CS_STRING 0x23 | 85 | #define CS_STRING 0x23 |
| 86 | #define CS_INTERFACE 0x24 | 86 | #define CS_INTERFACE 0x24 |
| 87 | #define CS_ENDPOINT 0x25 | 87 | #define CS_ENDPOINT 0x25 |
| 88 | 88 | ||
| 89 | /* VideoControl class specific interface descriptor */ | 89 | /* VideoControl class specific interface descriptor */ |
| 90 | #define VC_DESCRIPTOR_UNDEFINED 0x00 | 90 | #define VC_DESCRIPTOR_UNDEFINED 0x00 |
| 91 | #define VC_HEADER 0x01 | 91 | #define VC_HEADER 0x01 |
| 92 | #define VC_INPUT_TERMINAL 0x02 | 92 | #define VC_INPUT_TERMINAL 0x02 |
| 93 | #define VC_OUTPUT_TERMINAL 0x03 | 93 | #define VC_OUTPUT_TERMINAL 0x03 |
| 94 | #define VC_SELECTOR_UNIT 0x04 | 94 | #define VC_SELECTOR_UNIT 0x04 |
| 95 | #define VC_PROCESSING_UNIT 0x05 | 95 | #define VC_PROCESSING_UNIT 0x05 |
| 96 | #define VC_EXTENSION_UNIT 0x06 | 96 | #define VC_EXTENSION_UNIT 0x06 |
| 97 | 97 | ||
| 98 | /* VideoStreaming class specific interface descriptor */ | 98 | /* VideoStreaming class specific interface descriptor */ |
| 99 | #define VS_UNDEFINED 0x00 | 99 | #define VS_UNDEFINED 0x00 |
| 100 | #define VS_INPUT_HEADER 0x01 | 100 | #define VS_INPUT_HEADER 0x01 |
| 101 | #define VS_OUTPUT_HEADER 0x02 | 101 | #define VS_OUTPUT_HEADER 0x02 |
| 102 | #define VS_STILL_IMAGE_FRAME 0x03 | 102 | #define VS_STILL_IMAGE_FRAME 0x03 |
| 103 | #define VS_FORMAT_UNCOMPRESSED 0x04 | 103 | #define VS_FORMAT_UNCOMPRESSED 0x04 |
| 104 | #define VS_FRAME_UNCOMPRESSED 0x05 | 104 | #define VS_FRAME_UNCOMPRESSED 0x05 |
| 105 | #define VS_FORMAT_MJPEG 0x06 | 105 | #define VS_FORMAT_MJPEG 0x06 |
| 106 | #define VS_FRAME_MJPEG 0x07 | 106 | #define VS_FRAME_MJPEG 0x07 |
| 107 | #define VS_FORMAT_MPEG2TS 0x0a | 107 | #define VS_FORMAT_MPEG2TS 0x0a |
| 108 | #define VS_FORMAT_DV 0x0c | 108 | #define VS_FORMAT_DV 0x0c |
| 109 | #define VS_COLORFORMAT 0x0d | 109 | #define VS_COLORFORMAT 0x0d |
| 110 | #define VS_FORMAT_FRAME_BASED 0x10 | 110 | #define VS_FORMAT_FRAME_BASED 0x10 |
| 111 | #define VS_FRAME_FRAME_BASED 0x11 | 111 | #define VS_FRAME_FRAME_BASED 0x11 |
| 112 | #define VS_FORMAT_STREAM_BASED 0x12 | 112 | #define VS_FORMAT_STREAM_BASED 0x12 |
| 113 | 113 | ||
| 114 | /* Endpoint type */ | 114 | /* Endpoint type */ |
| 115 | #define EP_UNDEFINED 0x00 | 115 | #define EP_UNDEFINED 0x00 |
| 116 | #define EP_GENERAL 0x01 | 116 | #define EP_GENERAL 0x01 |
| 117 | #define EP_ENDPOINT 0x02 | 117 | #define EP_ENDPOINT 0x02 |
| 118 | #define EP_INTERRUPT 0x03 | 118 | #define EP_INTERRUPT 0x03 |
| 119 | 119 | ||
| 120 | /* Request codes */ | 120 | /* Request codes */ |
| 121 | #define RC_UNDEFINED 0x00 | 121 | #define RC_UNDEFINED 0x00 |
| 122 | #define SET_CUR 0x01 | 122 | #define SET_CUR 0x01 |
| 123 | #define GET_CUR 0x81 | 123 | #define GET_CUR 0x81 |
| 124 | #define GET_MIN 0x82 | 124 | #define GET_MIN 0x82 |
| 125 | #define GET_MAX 0x83 | 125 | #define GET_MAX 0x83 |
| 126 | #define GET_RES 0x84 | 126 | #define GET_RES 0x84 |
| 127 | #define GET_LEN 0x85 | 127 | #define GET_LEN 0x85 |
| 128 | #define GET_INFO 0x86 | 128 | #define GET_INFO 0x86 |
| 129 | #define GET_DEF 0x87 | 129 | #define GET_DEF 0x87 |
| 130 | 130 | ||
| 131 | /* VideoControl interface controls */ | 131 | /* VideoControl interface controls */ |
| 132 | #define VC_CONTROL_UNDEFINED 0x00 | 132 | #define VC_CONTROL_UNDEFINED 0x00 |
| 133 | #define VC_VIDEO_POWER_MODE_CONTROL 0x01 | 133 | #define VC_VIDEO_POWER_MODE_CONTROL 0x01 |
| 134 | #define VC_REQUEST_ERROR_CODE_CONTROL 0x02 | 134 | #define VC_REQUEST_ERROR_CODE_CONTROL 0x02 |
| 135 | 135 | ||
| 136 | /* Terminal controls */ | 136 | /* Terminal controls */ |
| 137 | #define TE_CONTROL_UNDEFINED 0x00 | 137 | #define TE_CONTROL_UNDEFINED 0x00 |
| 138 | 138 | ||
| 139 | /* Selector Unit controls */ | 139 | /* Selector Unit controls */ |
| 140 | #define SU_CONTROL_UNDEFINED 0x00 | 140 | #define SU_CONTROL_UNDEFINED 0x00 |
| 141 | #define SU_INPUT_SELECT_CONTROL 0x01 | 141 | #define SU_INPUT_SELECT_CONTROL 0x01 |
| 142 | 142 | ||
| 143 | /* Camera Terminal controls */ | 143 | /* Camera Terminal controls */ |
| 144 | #define CT_CONTROL_UNDEFINED 0x00 | 144 | #define CT_CONTROL_UNDEFINED 0x00 |
| 145 | #define CT_SCANNING_MODE_CONTROL 0x01 | 145 | #define CT_SCANNING_MODE_CONTROL 0x01 |
| 146 | #define CT_AE_MODE_CONTROL 0x02 | 146 | #define CT_AE_MODE_CONTROL 0x02 |
| 147 | #define CT_AE_PRIORITY_CONTROL 0x03 | 147 | #define CT_AE_PRIORITY_CONTROL 0x03 |
| 148 | #define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL 0x04 | 148 | #define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL 0x04 |
| 149 | #define CT_EXPOSURE_TIME_RELATIVE_CONTROL 0x05 | 149 | #define CT_EXPOSURE_TIME_RELATIVE_CONTROL 0x05 |
| 150 | #define CT_FOCUS_ABSOLUTE_CONTROL 0x06 | 150 | #define CT_FOCUS_ABSOLUTE_CONTROL 0x06 |
| 151 | #define CT_FOCUS_RELATIVE_CONTROL 0x07 | 151 | #define CT_FOCUS_RELATIVE_CONTROL 0x07 |
| 152 | #define CT_FOCUS_AUTO_CONTROL 0x08 | 152 | #define CT_FOCUS_AUTO_CONTROL 0x08 |
| 153 | #define CT_IRIS_ABSOLUTE_CONTROL 0x09 | 153 | #define CT_IRIS_ABSOLUTE_CONTROL 0x09 |
| 154 | #define CT_IRIS_RELATIVE_CONTROL 0x0a | 154 | #define CT_IRIS_RELATIVE_CONTROL 0x0a |
| 155 | #define CT_ZOOM_ABSOLUTE_CONTROL 0x0b | 155 | #define CT_ZOOM_ABSOLUTE_CONTROL 0x0b |
| 156 | #define CT_ZOOM_RELATIVE_CONTROL 0x0c | 156 | #define CT_ZOOM_RELATIVE_CONTROL 0x0c |
| 157 | #define CT_PANTILT_ABSOLUTE_CONTROL 0x0d | 157 | #define CT_PANTILT_ABSOLUTE_CONTROL 0x0d |
| 158 | #define CT_PANTILT_RELATIVE_CONTROL 0x0e | 158 | #define CT_PANTILT_RELATIVE_CONTROL 0x0e |
| 159 | #define CT_ROLL_ABSOLUTE_CONTROL 0x0f | 159 | #define CT_ROLL_ABSOLUTE_CONTROL 0x0f |
| 160 | #define CT_ROLL_RELATIVE_CONTROL 0x10 | 160 | #define CT_ROLL_RELATIVE_CONTROL 0x10 |
| 161 | #define CT_PRIVACY_CONTROL 0x11 | 161 | #define CT_PRIVACY_CONTROL 0x11 |
| 162 | 162 | ||
| 163 | /* Processing Unit controls */ | 163 | /* Processing Unit controls */ |
| 164 | #define PU_CONTROL_UNDEFINED 0x00 | 164 | #define PU_CONTROL_UNDEFINED 0x00 |
| 165 | #define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01 | 165 | #define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01 |
| 166 | #define PU_BRIGHTNESS_CONTROL 0x02 | 166 | #define PU_BRIGHTNESS_CONTROL 0x02 |
| 167 | #define PU_CONTRAST_CONTROL 0x03 | 167 | #define PU_CONTRAST_CONTROL 0x03 |
| 168 | #define PU_GAIN_CONTROL 0x04 | 168 | #define PU_GAIN_CONTROL 0x04 |
| 169 | #define PU_POWER_LINE_FREQUENCY_CONTROL 0x05 | 169 | #define PU_POWER_LINE_FREQUENCY_CONTROL 0x05 |
| 170 | #define PU_HUE_CONTROL 0x06 | 170 | #define PU_HUE_CONTROL 0x06 |
| 171 | #define PU_SATURATION_CONTROL 0x07 | 171 | #define PU_SATURATION_CONTROL 0x07 |
| 172 | #define PU_SHARPNESS_CONTROL 0x08 | 172 | #define PU_SHARPNESS_CONTROL 0x08 |
| 173 | #define PU_GAMMA_CONTROL 0x09 | 173 | #define PU_GAMMA_CONTROL 0x09 |
| 174 | #define PU_WHITE_BALANCE_TEMPERATURE_CONTROL 0x0a | 174 | #define PU_WHITE_BALANCE_TEMPERATURE_CONTROL 0x0a |
| 175 | #define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL 0x0b | 175 | #define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL 0x0b |
| 176 | #define PU_WHITE_BALANCE_COMPONENT_CONTROL 0x0c | 176 | #define PU_WHITE_BALANCE_COMPONENT_CONTROL 0x0c |
| 177 | #define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL 0x0d | 177 | #define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL 0x0d |
| 178 | #define PU_DIGITAL_MULTIPLIER_CONTROL 0x0e | 178 | #define PU_DIGITAL_MULTIPLIER_CONTROL 0x0e |
| 179 | #define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL 0x0f | 179 | #define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL 0x0f |
| 180 | #define PU_HUE_AUTO_CONTROL 0x10 | 180 | #define PU_HUE_AUTO_CONTROL 0x10 |
| 181 | #define PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 | 181 | #define PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 |
| 182 | #define PU_ANALOG_LOCK_STATUS_CONTROL 0x12 | 182 | #define PU_ANALOG_LOCK_STATUS_CONTROL 0x12 |
| 183 | 183 | ||
| 184 | #define LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01 | 184 | #define LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01 |
| 185 | #define LXU_MOTOR_PANTILT_RESET_CONTROL 0x02 | 185 | #define LXU_MOTOR_PANTILT_RESET_CONTROL 0x02 |
| 186 | #define LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03 | 186 | #define LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03 |
| 187 | 187 | ||
| 188 | /* VideoStreaming interface controls */ | 188 | /* VideoStreaming interface controls */ |
| 189 | #define VS_CONTROL_UNDEFINED 0x00 | 189 | #define VS_CONTROL_UNDEFINED 0x00 |
| 190 | #define VS_PROBE_CONTROL 0x01 | 190 | #define VS_PROBE_CONTROL 0x01 |
| 191 | #define VS_COMMIT_CONTROL 0x02 | 191 | #define VS_COMMIT_CONTROL 0x02 |
| 192 | #define VS_STILL_PROBE_CONTROL 0x03 | 192 | #define VS_STILL_PROBE_CONTROL 0x03 |
| 193 | #define VS_STILL_COMMIT_CONTROL 0x04 | 193 | #define VS_STILL_COMMIT_CONTROL 0x04 |
| 194 | #define VS_STILL_IMAGE_TRIGGER_CONTROL 0x05 | 194 | #define VS_STILL_IMAGE_TRIGGER_CONTROL 0x05 |
| 195 | #define VS_STREAM_ERROR_CODE_CONTROL 0x06 | 195 | #define VS_STREAM_ERROR_CODE_CONTROL 0x06 |
| 196 | #define VS_GENERATE_KEY_FRAME_CONTROL 0x07 | 196 | #define VS_GENERATE_KEY_FRAME_CONTROL 0x07 |
| 197 | #define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08 | 197 | #define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08 |
| 198 | #define VS_SYNC_DELAY_CONTROL 0x09 | 198 | #define VS_SYNC_DELAY_CONTROL 0x09 |
| 199 | 199 | ||
| 200 | #define TT_VENDOR_SPECIFIC 0x0100 | 200 | #define TT_VENDOR_SPECIFIC 0x0100 |
| 201 | #define TT_STREAMING 0x0101 | 201 | #define TT_STREAMING 0x0101 |
| 202 | 202 | ||
| 203 | /* Input Terminal types */ | 203 | /* Input Terminal types */ |
| 204 | #define ITT_VENDOR_SPECIFIC 0x0200 | 204 | #define ITT_VENDOR_SPECIFIC 0x0200 |
| 205 | #define ITT_CAMERA 0x0201 | 205 | #define ITT_CAMERA 0x0201 |
| 206 | #define ITT_MEDIA_TRANSPORT_INPUT 0x0202 | 206 | #define ITT_MEDIA_TRANSPORT_INPUT 0x0202 |
| 207 | 207 | ||
| 208 | /* Output Terminal types */ | 208 | /* Output Terminal types */ |
| 209 | #define OTT_VENDOR_SPECIFIC 0x0300 | 209 | #define OTT_VENDOR_SPECIFIC 0x0300 |
| 210 | #define OTT_DISPLAY 0x0301 | 210 | #define OTT_DISPLAY 0x0301 |
| 211 | #define OTT_MEDIA_TRANSPORT_OUTPUT 0x0302 | 211 | #define OTT_MEDIA_TRANSPORT_OUTPUT 0x0302 |
| 212 | 212 | ||
| 213 | /* External Terminal types */ | 213 | /* External Terminal types */ |
| 214 | #define EXTERNAL_VENDOR_SPECIFIC 0x0400 | 214 | #define EXTERNAL_VENDOR_SPECIFIC 0x0400 |
| 215 | #define COMPOSITE_CONNECTOR 0x0401 | 215 | #define COMPOSITE_CONNECTOR 0x0401 |
| 216 | #define SVIDEO_CONNECTOR 0x0402 | 216 | #define SVIDEO_CONNECTOR 0x0402 |
| 217 | #define COMPONENT_CONNECTOR 0x0403 | 217 | #define COMPONENT_CONNECTOR 0x0403 |
| 218 | 218 | ||
| 219 | #define UVC_TERM_INPUT 0x0000 | 219 | #define UVC_TERM_INPUT 0x0000 |
| 220 | #define UVC_TERM_OUTPUT 0x8000 | 220 | #define UVC_TERM_OUTPUT 0x8000 |
| @@ -541,11 +541,11 @@ struct uvc_streaming { | |||
| 541 | }; | 541 | }; |
| 542 | 542 | ||
| 543 | enum uvc_buffer_state { | 543 | enum uvc_buffer_state { |
| 544 | UVC_BUF_STATE_IDLE = 0, | 544 | UVC_BUF_STATE_IDLE = 0, |
| 545 | UVC_BUF_STATE_QUEUED = 1, | 545 | UVC_BUF_STATE_QUEUED = 1, |
| 546 | UVC_BUF_STATE_ACTIVE = 2, | 546 | UVC_BUF_STATE_ACTIVE = 2, |
| 547 | UVC_BUF_STATE_DONE = 3, | 547 | UVC_BUF_STATE_DONE = 3, |
| 548 | UVC_BUF_STATE_ERROR = 4, | 548 | UVC_BUF_STATE_ERROR = 4, |
| 549 | }; | 549 | }; |
| 550 | 550 | ||
| 551 | struct uvc_buffer { | 551 | struct uvc_buffer { |
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c index fbe9cc0d433a..21208805ea9b 100644 --- a/drivers/media/video/v4l2-subdev.c +++ b/drivers/media/video/v4l2-subdev.c | |||
| @@ -28,13 +28,13 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) | |||
| 28 | { | 28 | { |
| 29 | switch (cmd) { | 29 | switch (cmd) { |
| 30 | case VIDIOC_QUERYCTRL: | 30 | case VIDIOC_QUERYCTRL: |
| 31 | return v4l2_subdev_call(sd, core, querymenu, arg); | 31 | return v4l2_subdev_call(sd, core, queryctrl, arg); |
| 32 | case VIDIOC_G_CTRL: | 32 | case VIDIOC_G_CTRL: |
| 33 | return v4l2_subdev_call(sd, core, g_ctrl, arg); | 33 | return v4l2_subdev_call(sd, core, g_ctrl, arg); |
| 34 | case VIDIOC_S_CTRL: | 34 | case VIDIOC_S_CTRL: |
| 35 | return v4l2_subdev_call(sd, core, s_ctrl, arg); | 35 | return v4l2_subdev_call(sd, core, s_ctrl, arg); |
| 36 | case VIDIOC_QUERYMENU: | 36 | case VIDIOC_QUERYMENU: |
| 37 | return v4l2_subdev_call(sd, core, queryctrl, arg); | 37 | return v4l2_subdev_call(sd, core, querymenu, arg); |
| 38 | case VIDIOC_LOG_STATUS: | 38 | case VIDIOC_LOG_STATUS: |
| 39 | return v4l2_subdev_call(sd, core, log_status); | 39 | return v4l2_subdev_call(sd, core, log_status); |
| 40 | case VIDIOC_DBG_G_CHIP_IDENT: | 40 | case VIDIOC_DBG_G_CHIP_IDENT: |
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index 46b7ad477ceb..e873a916250f 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h | |||
| @@ -349,7 +349,6 @@ struct card_info { | |||
| 349 | u16 i2c_decoder, i2c_encoder; /* I2C types */ | 349 | u16 i2c_decoder, i2c_encoder; /* I2C types */ |
| 350 | u16 video_vfe, video_codec; /* videocodec types */ | 350 | u16 video_vfe, video_codec; /* videocodec types */ |
| 351 | u16 audio_chip; /* audio type */ | 351 | u16 audio_chip; /* audio type */ |
| 352 | u16 vendor_id, device_id; /* subsystem vendor/device ID */ | ||
| 353 | 352 | ||
| 354 | int inputs; /* number of video inputs */ | 353 | int inputs; /* number of video inputs */ |
| 355 | struct input { | 354 | struct input { |
| @@ -401,7 +400,6 @@ struct zoran { | |||
| 401 | char name[32]; /* name of this device */ | 400 | char name[32]; /* name of this device */ |
| 402 | struct pci_dev *pci_dev; /* PCI device */ | 401 | struct pci_dev *pci_dev; /* PCI device */ |
| 403 | unsigned char revision; /* revision of zr36057 */ | 402 | unsigned char revision; /* revision of zr36057 */ |
| 404 | unsigned int zr36057_adr; /* bus address of IO mem returned by PCI BIOS */ | ||
| 405 | unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */ | 403 | unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */ |
| 406 | 404 | ||
| 407 | spinlock_t spinlock; /* Spinlock */ | 405 | spinlock_t spinlock; /* Spinlock */ |
| @@ -490,16 +488,10 @@ struct zoran { | |||
| 490 | wait_queue_head_t test_q; | 488 | wait_queue_head_t test_q; |
| 491 | }; | 489 | }; |
| 492 | 490 | ||
| 493 | /*The following should be done in more portable way. It depends on define | 491 | /* There was something called _ALPHA_BUZ that used the PCI address instead of |
| 494 | of _ALPHA_BUZ in the Makefile.*/ | 492 | * the kernel iomapped address for btread/btwrite. */ |
| 495 | |||
| 496 | #ifdef _ALPHA_BUZ | ||
| 497 | #define btwrite(dat,adr) writel((dat), zr->zr36057_adr+(adr)) | ||
| 498 | #define btread(adr) readl(zr->zr36057_adr+(adr)) | ||
| 499 | #else | ||
| 500 | #define btwrite(dat,adr) writel((dat), zr->zr36057_mem+(adr)) | 493 | #define btwrite(dat,adr) writel((dat), zr->zr36057_mem+(adr)) |
| 501 | #define btread(adr) readl(zr->zr36057_mem+(adr)) | 494 | #define btread(adr) readl(zr->zr36057_mem+(adr)) |
| 502 | #endif | ||
| 503 | 495 | ||
| 504 | #define btand(dat,adr) btwrite((dat) & btread(adr), adr) | 496 | #define btand(dat,adr) btwrite((dat) & btread(adr), adr) |
| 505 | #define btor(dat,adr) btwrite((dat) | btread(adr), adr) | 497 | #define btor(dat,adr) btwrite((dat) | btread(adr), adr) |
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c index 05f39195372e..5d2f090aa0f8 100644 --- a/drivers/media/video/zoran/zoran_card.c +++ b/drivers/media/video/zoran/zoran_card.c | |||
| @@ -61,17 +61,17 @@ | |||
| 61 | 61 | ||
| 62 | extern const struct zoran_format zoran_formats[]; | 62 | extern const struct zoran_format zoran_formats[]; |
| 63 | 63 | ||
| 64 | static int card[BUZ_MAX] = { -1, -1, -1, -1 }; | 64 | static int card[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; |
| 65 | module_param_array(card, int, NULL, 0444); | 65 | module_param_array(card, int, NULL, 0444); |
| 66 | MODULE_PARM_DESC(card, "The type of card"); | 66 | MODULE_PARM_DESC(card, "Card type"); |
| 67 | 67 | ||
| 68 | static int encoder[BUZ_MAX] = { -1, -1, -1, -1 }; | 68 | static int encoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; |
| 69 | module_param_array(encoder, int, NULL, 0444); | 69 | module_param_array(encoder, int, NULL, 0444); |
| 70 | MODULE_PARM_DESC(encoder, "i2c TV encoder"); | 70 | MODULE_PARM_DESC(encoder, "Video encoder chip"); |
| 71 | 71 | ||
| 72 | static int decoder[BUZ_MAX] = { -1, -1, -1, -1 }; | 72 | static int decoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; |
| 73 | module_param_array(decoder, int, NULL, 0444); | 73 | module_param_array(decoder, int, NULL, 0444); |
| 74 | MODULE_PARM_DESC(decoder, "i2c TV decoder"); | 74 | MODULE_PARM_DESC(decoder, "Video decoder chip"); |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | The video mem address of the video card. | 77 | The video mem address of the video card. |
| @@ -104,9 +104,9 @@ module_param(default_norm, int, 0444); | |||
| 104 | MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)"); | 104 | MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)"); |
| 105 | 105 | ||
| 106 | /* /dev/videoN, -1 for autodetect */ | 106 | /* /dev/videoN, -1 for autodetect */ |
| 107 | static int video_nr[BUZ_MAX] = {-1, -1, -1, -1}; | 107 | static int video_nr[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; |
| 108 | module_param_array(video_nr, int, NULL, 0444); | 108 | module_param_array(video_nr, int, NULL, 0444); |
| 109 | MODULE_PARM_DESC(video_nr, "video device number (-1=Auto)"); | 109 | MODULE_PARM_DESC(video_nr, "Video device number (-1=Auto)"); |
| 110 | 110 | ||
| 111 | /* | 111 | /* |
| 112 | Number and size of grab buffers for Video 4 Linux | 112 | Number and size of grab buffers for Video 4 Linux |
| @@ -153,9 +153,21 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver"); | |||
| 153 | MODULE_AUTHOR("Serguei Miridonov"); | 153 | MODULE_AUTHOR("Serguei Miridonov"); |
| 154 | MODULE_LICENSE("GPL"); | 154 | MODULE_LICENSE("GPL"); |
| 155 | 155 | ||
| 156 | #define ZR_DEVICE(subven, subdev, data) { \ | ||
| 157 | .vendor = PCI_VENDOR_ID_ZORAN, .device = PCI_DEVICE_ID_ZORAN_36057, \ | ||
| 158 | .subvendor = (subven), .subdevice = (subdev), .driver_data = (data) } | ||
| 159 | |||
| 160 | static struct pci_device_id zr36067_pci_tbl[] = { | ||
| 161 | ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10plus), | ||
| 162 | ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC30PLUS, DC30plus), | ||
| 163 | ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10), | ||
| 164 | ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ), | ||
| 165 | ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS), | ||
| 166 | {0} | ||
| 167 | }; | ||
| 168 | MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl); | ||
| 156 | 169 | ||
| 157 | int zoran_num; /* number of Buzs in use */ | 170 | static unsigned int zoran_num; /* number of cards found */ |
| 158 | struct zoran *zoran[BUZ_MAX]; | ||
| 159 | 171 | ||
| 160 | /* videocodec bus functions ZR36060 */ | 172 | /* videocodec bus functions ZR36060 */ |
| 161 | static u32 | 173 | static u32 |
| @@ -472,8 +484,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = { | |||
| 472 | }, { | 484 | }, { |
| 473 | .type = DC10plus, | 485 | .type = DC10plus, |
| 474 | .name = "DC10plus", | 486 | .name = "DC10plus", |
| 475 | .vendor_id = PCI_VENDOR_ID_MIRO, | ||
| 476 | .device_id = PCI_DEVICE_ID_MIRO_DC10PLUS, | ||
| 477 | .i2c_decoder = I2C_DRIVERID_SAA7110, | 487 | .i2c_decoder = I2C_DRIVERID_SAA7110, |
| 478 | .i2c_encoder = I2C_DRIVERID_ADV7175, | 488 | .i2c_encoder = I2C_DRIVERID_ADV7175, |
| 479 | .video_codec = CODEC_TYPE_ZR36060, | 489 | .video_codec = CODEC_TYPE_ZR36060, |
| @@ -531,8 +541,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = { | |||
| 531 | }, { | 541 | }, { |
| 532 | .type = DC30plus, | 542 | .type = DC30plus, |
| 533 | .name = "DC30plus", | 543 | .name = "DC30plus", |
| 534 | .vendor_id = PCI_VENDOR_ID_MIRO, | ||
| 535 | .device_id = PCI_DEVICE_ID_MIRO_DC30PLUS, | ||
| 536 | .i2c_decoder = I2C_DRIVERID_VPX3220, | 544 | .i2c_decoder = I2C_DRIVERID_VPX3220, |
| 537 | .i2c_encoder = I2C_DRIVERID_ADV7175, | 545 | .i2c_encoder = I2C_DRIVERID_ADV7175, |
| 538 | .video_codec = CODEC_TYPE_ZR36050, | 546 | .video_codec = CODEC_TYPE_ZR36050, |
| @@ -589,8 +597,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = { | |||
| 589 | }, { | 597 | }, { |
| 590 | .type = LML33R10, | 598 | .type = LML33R10, |
| 591 | .name = "LML33R10", | 599 | .name = "LML33R10", |
| 592 | .vendor_id = PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, | ||
| 593 | .device_id = PCI_DEVICE_ID_LML_33R10, | ||
| 594 | .i2c_decoder = I2C_DRIVERID_SAA7114, | 600 | .i2c_decoder = I2C_DRIVERID_SAA7114, |
| 595 | .i2c_encoder = I2C_DRIVERID_ADV7170, | 601 | .i2c_encoder = I2C_DRIVERID_ADV7170, |
| 596 | .video_codec = CODEC_TYPE_ZR36060, | 602 | .video_codec = CODEC_TYPE_ZR36060, |
| @@ -618,8 +624,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = { | |||
| 618 | }, { | 624 | }, { |
| 619 | .type = BUZ, | 625 | .type = BUZ, |
| 620 | .name = "Buz", | 626 | .name = "Buz", |
| 621 | .vendor_id = PCI_VENDOR_ID_IOMEGA, | ||
| 622 | .device_id = PCI_DEVICE_ID_IOMEGA_BUZ, | ||
| 623 | .i2c_decoder = I2C_DRIVERID_SAA7111A, | 627 | .i2c_decoder = I2C_DRIVERID_SAA7111A, |
| 624 | .i2c_encoder = I2C_DRIVERID_SAA7185B, | 628 | .i2c_encoder = I2C_DRIVERID_SAA7185B, |
| 625 | .video_codec = CODEC_TYPE_ZR36060, | 629 | .video_codec = CODEC_TYPE_ZR36060, |
| @@ -649,8 +653,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = { | |||
| 649 | .name = "6-Eyes", | 653 | .name = "6-Eyes", |
| 650 | /* AverMedia chose not to brand the 6-Eyes. Thus it | 654 | /* AverMedia chose not to brand the 6-Eyes. Thus it |
| 651 | can't be autodetected, and requires card=x. */ | 655 | can't be autodetected, and requires card=x. */ |
| 652 | .vendor_id = -1, | ||
| 653 | .device_id = -1, | ||
| 654 | .i2c_decoder = I2C_DRIVERID_KS0127, | 656 | .i2c_decoder = I2C_DRIVERID_KS0127, |
| 655 | .i2c_encoder = I2C_DRIVERID_BT866, | 657 | .i2c_encoder = I2C_DRIVERID_BT866, |
| 656 | .video_codec = CODEC_TYPE_ZR36060, | 658 | .video_codec = CODEC_TYPE_ZR36060, |
| @@ -1138,7 +1140,8 @@ zr36057_init (struct zoran *zr) | |||
| 1138 | strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); | 1140 | strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); |
| 1139 | err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]); | 1141 | err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]); |
| 1140 | if (err < 0) | 1142 | if (err < 0) |
| 1141 | goto exit_unregister; | 1143 | goto exit_free; |
| 1144 | video_set_drvdata(zr->video_dev, zr); | ||
| 1142 | 1145 | ||
| 1143 | zoran_init_hardware(zr); | 1146 | zoran_init_hardware(zr); |
| 1144 | if (zr36067_debug > 2) | 1147 | if (zr36067_debug > 2) |
| @@ -1153,19 +1156,19 @@ zr36057_init (struct zoran *zr) | |||
| 1153 | zr->initialized = 1; | 1156 | zr->initialized = 1; |
| 1154 | return 0; | 1157 | return 0; |
| 1155 | 1158 | ||
| 1156 | exit_unregister: | ||
| 1157 | zoran_unregister_i2c(zr); | ||
| 1158 | exit_free: | 1159 | exit_free: |
| 1159 | kfree(zr->stat_com); | 1160 | kfree(zr->stat_com); |
| 1160 | kfree(zr->video_dev); | 1161 | kfree(zr->video_dev); |
| 1161 | return err; | 1162 | return err; |
| 1162 | } | 1163 | } |
| 1163 | 1164 | ||
| 1164 | static void | 1165 | static void __devexit zoran_remove(struct pci_dev *pdev) |
| 1165 | zoran_release (struct zoran *zr) | ||
| 1166 | { | 1166 | { |
| 1167 | struct zoran *zr = pci_get_drvdata(pdev); | ||
| 1168 | |||
| 1167 | if (!zr->initialized) | 1169 | if (!zr->initialized) |
| 1168 | goto exit_free; | 1170 | goto exit_free; |
| 1171 | |||
| 1169 | /* unregister videocodec bus */ | 1172 | /* unregister videocodec bus */ |
| 1170 | if (zr->codec) { | 1173 | if (zr->codec) { |
| 1171 | struct videocodec_master *master = zr->codec->master_data; | 1174 | struct videocodec_master *master = zr->codec->master_data; |
| @@ -1194,6 +1197,7 @@ zoran_release (struct zoran *zr) | |||
| 1194 | pci_disable_device(zr->pci_dev); | 1197 | pci_disable_device(zr->pci_dev); |
| 1195 | video_unregister_device(zr->video_dev); | 1198 | video_unregister_device(zr->video_dev); |
| 1196 | exit_free: | 1199 | exit_free: |
| 1200 | pci_set_drvdata(pdev, NULL); | ||
| 1197 | kfree(zr); | 1201 | kfree(zr); |
| 1198 | } | 1202 | } |
| 1199 | 1203 | ||
| @@ -1256,338 +1260,329 @@ zoran_setup_videocodec (struct zoran *zr, | |||
| 1256 | * Scan for a Buz card (actually for the PCI controller ZR36057), | 1260 | * Scan for a Buz card (actually for the PCI controller ZR36057), |
| 1257 | * request the irq and map the io memory | 1261 | * request the irq and map the io memory |
| 1258 | */ | 1262 | */ |
| 1259 | static int __devinit | 1263 | static int __devinit zoran_probe(struct pci_dev *pdev, |
| 1260 | find_zr36057 (void) | 1264 | const struct pci_device_id *ent) |
| 1261 | { | 1265 | { |
| 1262 | unsigned char latency, need_latency; | 1266 | unsigned char latency, need_latency; |
| 1263 | struct zoran *zr; | 1267 | struct zoran *zr; |
| 1264 | struct pci_dev *dev = NULL; | ||
| 1265 | int result; | 1268 | int result; |
| 1266 | struct videocodec_master *master_vfe = NULL; | 1269 | struct videocodec_master *master_vfe = NULL; |
| 1267 | struct videocodec_master *master_codec = NULL; | 1270 | struct videocodec_master *master_codec = NULL; |
| 1268 | int card_num; | 1271 | int card_num; |
| 1269 | char *i2c_enc_name, *i2c_dec_name, *codec_name, *vfe_name; | 1272 | char *i2c_enc_name, *i2c_dec_name, *codec_name, *vfe_name; |
| 1273 | unsigned int nr; | ||
| 1270 | 1274 | ||
| 1271 | zoran_num = 0; | ||
| 1272 | while (zoran_num < BUZ_MAX && | ||
| 1273 | (dev = pci_get_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057, dev)) != NULL) { | ||
| 1274 | card_num = card[zoran_num]; | ||
| 1275 | zr = kzalloc(sizeof(struct zoran), GFP_KERNEL); | ||
| 1276 | if (!zr) { | ||
| 1277 | dprintk(1, | ||
| 1278 | KERN_ERR | ||
| 1279 | "%s: find_zr36057() - kzalloc failed\n", | ||
| 1280 | ZORAN_NAME); | ||
| 1281 | continue; | ||
| 1282 | } | ||
| 1283 | zr->pci_dev = dev; | ||
| 1284 | //zr->zr36057_mem = NULL; | ||
| 1285 | zr->id = zoran_num; | ||
| 1286 | snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "MJPEG[%u]", zr->id); | ||
| 1287 | spin_lock_init(&zr->spinlock); | ||
| 1288 | mutex_init(&zr->resource_lock); | ||
| 1289 | if (pci_enable_device(dev)) | ||
| 1290 | goto zr_free_mem; | ||
| 1291 | zr->zr36057_adr = pci_resource_start(zr->pci_dev, 0); | ||
| 1292 | pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION, | ||
| 1293 | &zr->revision); | ||
| 1294 | if (zr->revision < 2) { | ||
| 1295 | dprintk(1, | ||
| 1296 | KERN_INFO | ||
| 1297 | "%s: Zoran ZR36057 (rev %d) irq: %d, memory: 0x%08x.\n", | ||
| 1298 | ZR_DEVNAME(zr), zr->revision, zr->pci_dev->irq, | ||
| 1299 | zr->zr36057_adr); | ||
| 1300 | 1275 | ||
| 1301 | if (card_num == -1) { | 1276 | nr = zoran_num++; |
| 1302 | dprintk(1, | 1277 | if (nr >= BUZ_MAX) { |
| 1303 | KERN_ERR | 1278 | dprintk(1, |
| 1304 | "%s: find_zr36057() - no card specified, please use the card=X insmod option\n", | 1279 | KERN_ERR |
| 1305 | ZR_DEVNAME(zr)); | 1280 | "%s: driver limited to %d card(s) maximum\n", |
| 1306 | goto zr_free_mem; | 1281 | ZORAN_NAME, BUZ_MAX); |
| 1307 | } | 1282 | return -ENOENT; |
| 1308 | } else { | 1283 | } |
| 1309 | int i; | ||
| 1310 | unsigned short ss_vendor, ss_device; | ||
| 1311 | 1284 | ||
| 1312 | ss_vendor = zr->pci_dev->subsystem_vendor; | 1285 | zr = kzalloc(sizeof(struct zoran), GFP_KERNEL); |
| 1313 | ss_device = zr->pci_dev->subsystem_device; | 1286 | if (!zr) { |
| 1287 | dprintk(1, | ||
| 1288 | KERN_ERR | ||
| 1289 | "%s: find_zr36057() - kzalloc failed\n", | ||
| 1290 | ZORAN_NAME); | ||
| 1291 | return -ENOMEM; | ||
| 1292 | } | ||
| 1293 | zr->pci_dev = pdev; | ||
| 1294 | zr->id = nr; | ||
| 1295 | snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "MJPEG[%u]", zr->id); | ||
| 1296 | spin_lock_init(&zr->spinlock); | ||
| 1297 | mutex_init(&zr->resource_lock); | ||
| 1298 | if (pci_enable_device(pdev)) | ||
| 1299 | goto zr_free_mem; | ||
| 1300 | pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION, &zr->revision); | ||
| 1301 | |||
| 1302 | dprintk(1, | ||
| 1303 | KERN_INFO | ||
| 1304 | "%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n", | ||
| 1305 | ZR_DEVNAME(zr), zr->revision < 2 ? '5' : '6', zr->revision, | ||
| 1306 | zr->pci_dev->irq, (uint64_t)pci_resource_start(zr->pci_dev, 0)); | ||
| 1307 | if (zr->revision >= 2) { | ||
| 1308 | dprintk(1, | ||
| 1309 | KERN_INFO | ||
| 1310 | "%s: Subsystem vendor=0x%04x id=0x%04x\n", | ||
| 1311 | ZR_DEVNAME(zr), zr->pci_dev->subsystem_vendor, | ||
| 1312 | zr->pci_dev->subsystem_device); | ||
| 1313 | } | ||
| 1314 | |||
| 1315 | /* Use auto-detected card type? */ | ||
| 1316 | if (card[nr] == -1) { | ||
| 1317 | if (zr->revision < 2) { | ||
| 1314 | dprintk(1, | 1318 | dprintk(1, |
| 1315 | KERN_INFO | 1319 | KERN_ERR |
| 1316 | "%s: Zoran ZR36067 (rev %d) irq: %d, memory: 0x%08x\n", | 1320 | "%s: No card type specified, please use the card=X module parameter\n", |
| 1317 | ZR_DEVNAME(zr), zr->revision, zr->pci_dev->irq, | 1321 | ZR_DEVNAME(zr)); |
| 1318 | zr->zr36057_adr); | ||
| 1319 | dprintk(1, | 1322 | dprintk(1, |
| 1320 | KERN_INFO | ||
| 1321 | "%s: subsystem vendor=0x%04x id=0x%04x\n", | ||
| 1322 | ZR_DEVNAME(zr), ss_vendor, ss_device); | ||
| 1323 | if (card_num == -1) { | ||
| 1324 | dprintk(3, | ||
| 1325 | KERN_DEBUG | ||
| 1326 | "%s: find_zr36057() - trying to autodetect card type\n", | ||
| 1327 | ZR_DEVNAME(zr)); | ||
| 1328 | for (i=0;i<NUM_CARDS;i++) { | ||
| 1329 | if (ss_vendor == zoran_cards[i].vendor_id && | ||
| 1330 | ss_device == zoran_cards[i].device_id) { | ||
| 1331 | dprintk(3, | ||
| 1332 | KERN_DEBUG | ||
| 1333 | "%s: find_zr36057() - card %s detected\n", | ||
| 1334 | ZR_DEVNAME(zr), | ||
| 1335 | zoran_cards[i].name); | ||
| 1336 | card_num = i; | ||
| 1337 | break; | ||
| 1338 | } | ||
| 1339 | } | ||
| 1340 | if (i == NUM_CARDS) { | ||
| 1341 | dprintk(1, | ||
| 1342 | KERN_ERR | ||
| 1343 | "%s: find_zr36057() - unknown card\n", | ||
| 1344 | ZR_DEVNAME(zr)); | ||
| 1345 | goto zr_free_mem; | ||
| 1346 | } | ||
| 1347 | } | ||
| 1348 | } | ||
| 1349 | |||
| 1350 | if (card_num < 0 || card_num >= NUM_CARDS) { | ||
| 1351 | dprintk(2, | ||
| 1352 | KERN_ERR | 1323 | KERN_ERR |
| 1353 | "%s: find_zr36057() - invalid cardnum %d\n", | 1324 | "%s: It is not possible to auto-detect ZR36057 based cards\n", |
| 1354 | ZR_DEVNAME(zr), card_num); | 1325 | ZR_DEVNAME(zr)); |
| 1355 | goto zr_free_mem; | 1326 | goto zr_free_mem; |
| 1356 | } | 1327 | } |
| 1357 | 1328 | ||
| 1358 | /* even though we make this a non pointer and thus | 1329 | card_num = ent->driver_data; |
| 1359 | * theoretically allow for making changes to this struct | 1330 | if (card_num >= NUM_CARDS) { |
| 1360 | * on a per-individual card basis at runtime, this is | ||
| 1361 | * strongly discouraged. This structure is intended to | ||
| 1362 | * keep general card information, no settings or anything */ | ||
| 1363 | zr->card = zoran_cards[card_num]; | ||
| 1364 | snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), | ||
| 1365 | "%s[%u]", zr->card.name, zr->id); | ||
| 1366 | |||
| 1367 | zr->zr36057_mem = ioremap_nocache(zr->zr36057_adr, 0x1000); | ||
| 1368 | if (!zr->zr36057_mem) { | ||
| 1369 | dprintk(1, | 1331 | dprintk(1, |
| 1370 | KERN_ERR | 1332 | KERN_ERR |
| 1371 | "%s: find_zr36057() - ioremap failed\n", | 1333 | "%s: Unknown card, try specifying card=X module parameter\n", |
| 1372 | ZR_DEVNAME(zr)); | 1334 | ZR_DEVNAME(zr)); |
| 1373 | goto zr_free_mem; | 1335 | goto zr_free_mem; |
| 1374 | } | 1336 | } |
| 1375 | 1337 | dprintk(3, | |
| 1376 | result = request_irq(zr->pci_dev->irq, | 1338 | KERN_DEBUG |
| 1377 | zoran_irq, | 1339 | "%s: %s() - card %s detected\n", |
| 1378 | IRQF_SHARED | IRQF_DISABLED, | 1340 | ZR_DEVNAME(zr), __func__, zoran_cards[card_num].name); |
| 1379 | ZR_DEVNAME(zr), | 1341 | } else { |
| 1380 | (void *) zr); | 1342 | card_num = card[nr]; |
| 1381 | if (result < 0) { | 1343 | if (card_num >= NUM_CARDS || card_num < 0) { |
| 1382 | if (result == -EINVAL) { | 1344 | dprintk(1, |
| 1383 | dprintk(1, | 1345 | KERN_ERR |
| 1384 | KERN_ERR | 1346 | "%s: User specified card type %d out of range (0 .. %d)\n", |
| 1385 | "%s: find_zr36057() - bad irq number or handler\n", | 1347 | ZR_DEVNAME(zr), card_num, NUM_CARDS - 1); |
| 1386 | ZR_DEVNAME(zr)); | 1348 | goto zr_free_mem; |
| 1387 | } else if (result == -EBUSY) { | ||
| 1388 | dprintk(1, | ||
| 1389 | KERN_ERR | ||
| 1390 | "%s: find_zr36057() - IRQ %d busy, change your PnP config in BIOS\n", | ||
| 1391 | ZR_DEVNAME(zr), zr->pci_dev->irq); | ||
| 1392 | } else { | ||
| 1393 | dprintk(1, | ||
| 1394 | KERN_ERR | ||
| 1395 | "%s: find_zr36057() - can't assign irq, error code %d\n", | ||
| 1396 | ZR_DEVNAME(zr), result); | ||
| 1397 | } | ||
| 1398 | goto zr_unmap; | ||
| 1399 | } | ||
| 1400 | |||
| 1401 | /* set PCI latency timer */ | ||
| 1402 | pci_read_config_byte(zr->pci_dev, PCI_LATENCY_TIMER, | ||
| 1403 | &latency); | ||
| 1404 | need_latency = zr->revision > 1 ? 32 : 48; | ||
| 1405 | if (latency != need_latency) { | ||
| 1406 | dprintk(2, | ||
| 1407 | KERN_INFO | ||
| 1408 | "%s: Changing PCI latency from %d to %d.\n", | ||
| 1409 | ZR_DEVNAME(zr), latency, need_latency); | ||
| 1410 | pci_write_config_byte(zr->pci_dev, | ||
| 1411 | PCI_LATENCY_TIMER, | ||
| 1412 | need_latency); | ||
| 1413 | } | 1349 | } |
| 1350 | } | ||
| 1414 | 1351 | ||
| 1415 | zr36057_restart(zr); | 1352 | /* even though we make this a non pointer and thus |
| 1416 | /* i2c */ | 1353 | * theoretically allow for making changes to this struct |
| 1417 | dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n", | 1354 | * on a per-individual card basis at runtime, this is |
| 1418 | ZR_DEVNAME(zr)); | 1355 | * strongly discouraged. This structure is intended to |
| 1356 | * keep general card information, no settings or anything */ | ||
| 1357 | zr->card = zoran_cards[card_num]; | ||
| 1358 | snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), | ||
| 1359 | "%s[%u]", zr->card.name, zr->id); | ||
| 1360 | |||
| 1361 | zr->zr36057_mem = pci_ioremap_bar(zr->pci_dev, 0); | ||
| 1362 | if (!zr->zr36057_mem) { | ||
| 1363 | dprintk(1, | ||
| 1364 | KERN_ERR | ||
| 1365 | "%s: %s() - ioremap failed\n", | ||
| 1366 | ZR_DEVNAME(zr), __func__); | ||
| 1367 | goto zr_free_mem; | ||
| 1368 | } | ||
| 1419 | 1369 | ||
| 1420 | /* i2c decoder */ | 1370 | result = request_irq(zr->pci_dev->irq, zoran_irq, |
| 1421 | if (decoder[zr->id] != -1) { | 1371 | IRQF_SHARED | IRQF_DISABLED, ZR_DEVNAME(zr), zr); |
| 1422 | i2c_dec_name = i2cid_to_modulename(decoder[zr->id]); | 1372 | if (result < 0) { |
| 1423 | zr->card.i2c_decoder = decoder[zr->id]; | 1373 | if (result == -EINVAL) { |
| 1424 | } else if (zr->card.i2c_decoder != 0) { | 1374 | dprintk(1, |
| 1425 | i2c_dec_name = | 1375 | KERN_ERR |
| 1426 | i2cid_to_modulename(zr->card.i2c_decoder); | 1376 | "%s: find_zr36057() - bad irq number or handler\n", |
| 1377 | ZR_DEVNAME(zr)); | ||
| 1378 | } else if (result == -EBUSY) { | ||
| 1379 | dprintk(1, | ||
| 1380 | KERN_ERR | ||
| 1381 | "%s: find_zr36057() - IRQ %d busy, change your PnP config in BIOS\n", | ||
| 1382 | ZR_DEVNAME(zr), zr->pci_dev->irq); | ||
| 1427 | } else { | 1383 | } else { |
| 1428 | i2c_dec_name = NULL; | 1384 | dprintk(1, |
| 1385 | KERN_ERR | ||
| 1386 | "%s: find_zr36057() - can't assign irq, error code %d\n", | ||
| 1387 | ZR_DEVNAME(zr), result); | ||
| 1429 | } | 1388 | } |
| 1389 | goto zr_unmap; | ||
| 1390 | } | ||
| 1430 | 1391 | ||
| 1431 | if (i2c_dec_name) { | 1392 | /* set PCI latency timer */ |
| 1432 | if ((result = request_module(i2c_dec_name)) < 0) { | 1393 | pci_read_config_byte(zr->pci_dev, PCI_LATENCY_TIMER, |
| 1433 | dprintk(1, | 1394 | &latency); |
| 1434 | KERN_ERR | 1395 | need_latency = zr->revision > 1 ? 32 : 48; |
| 1435 | "%s: failed to load module %s: %d\n", | 1396 | if (latency != need_latency) { |
| 1436 | ZR_DEVNAME(zr), i2c_dec_name, result); | 1397 | dprintk(2, |
| 1437 | } | 1398 | KERN_INFO |
| 1438 | } | 1399 | "%s: Changing PCI latency from %d to %d\n", |
| 1400 | ZR_DEVNAME(zr), latency, need_latency); | ||
| 1401 | pci_write_config_byte(zr->pci_dev, PCI_LATENCY_TIMER, | ||
| 1402 | need_latency); | ||
| 1403 | } | ||
| 1439 | 1404 | ||
| 1440 | /* i2c encoder */ | 1405 | zr36057_restart(zr); |
| 1441 | if (encoder[zr->id] != -1) { | 1406 | /* i2c */ |
| 1442 | i2c_enc_name = i2cid_to_modulename(encoder[zr->id]); | 1407 | dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n", |
| 1443 | zr->card.i2c_encoder = encoder[zr->id]; | 1408 | ZR_DEVNAME(zr)); |
| 1444 | } else if (zr->card.i2c_encoder != 0) { | 1409 | |
| 1445 | i2c_enc_name = | 1410 | /* i2c decoder */ |
| 1446 | i2cid_to_modulename(zr->card.i2c_encoder); | 1411 | if (decoder[zr->id] != -1) { |
| 1447 | } else { | 1412 | i2c_dec_name = i2cid_to_modulename(decoder[zr->id]); |
| 1448 | i2c_enc_name = NULL; | 1413 | zr->card.i2c_decoder = decoder[zr->id]; |
| 1449 | } | 1414 | } else if (zr->card.i2c_decoder != 0) { |
| 1415 | i2c_dec_name = i2cid_to_modulename(zr->card.i2c_decoder); | ||
| 1416 | } else { | ||
| 1417 | i2c_dec_name = NULL; | ||
| 1418 | } | ||
| 1450 | 1419 | ||
| 1451 | if (i2c_enc_name) { | 1420 | if (i2c_dec_name) { |
| 1452 | if ((result = request_module(i2c_enc_name)) < 0) { | 1421 | result = request_module(i2c_dec_name); |
| 1453 | dprintk(1, | 1422 | if (result < 0) { |
| 1454 | KERN_ERR | 1423 | dprintk(1, |
| 1455 | "%s: failed to load module %s: %d\n", | 1424 | KERN_ERR |
| 1456 | ZR_DEVNAME(zr), i2c_enc_name, result); | 1425 | "%s: failed to load module %s: %d\n", |
| 1457 | } | 1426 | ZR_DEVNAME(zr), i2c_dec_name, result); |
| 1458 | } | 1427 | } |
| 1428 | } | ||
| 1429 | |||
| 1430 | /* i2c encoder */ | ||
| 1431 | if (encoder[zr->id] != -1) { | ||
| 1432 | i2c_enc_name = i2cid_to_modulename(encoder[zr->id]); | ||
| 1433 | zr->card.i2c_encoder = encoder[zr->id]; | ||
| 1434 | } else if (zr->card.i2c_encoder != 0) { | ||
| 1435 | i2c_enc_name = i2cid_to_modulename(zr->card.i2c_encoder); | ||
| 1436 | } else { | ||
| 1437 | i2c_enc_name = NULL; | ||
| 1438 | } | ||
| 1459 | 1439 | ||
| 1460 | if (zoran_register_i2c(zr) < 0) { | 1440 | if (i2c_enc_name) { |
| 1441 | result = request_module(i2c_enc_name); | ||
| 1442 | if (result < 0) { | ||
| 1461 | dprintk(1, | 1443 | dprintk(1, |
| 1462 | KERN_ERR | 1444 | KERN_ERR |
| 1463 | "%s: find_zr36057() - can't initialize i2c bus\n", | 1445 | "%s: failed to load module %s: %d\n", |
| 1464 | ZR_DEVNAME(zr)); | 1446 | ZR_DEVNAME(zr), i2c_enc_name, result); |
| 1465 | goto zr_free_irq; | ||
| 1466 | } | 1447 | } |
| 1448 | } | ||
| 1467 | 1449 | ||
| 1468 | dprintk(2, | 1450 | if (zoran_register_i2c(zr) < 0) { |
| 1469 | KERN_INFO "%s: Initializing videocodec bus...\n", | 1451 | dprintk(1, |
| 1452 | KERN_ERR | ||
| 1453 | "%s: find_zr36057() - can't initialize i2c bus\n", | ||
| 1470 | ZR_DEVNAME(zr)); | 1454 | ZR_DEVNAME(zr)); |
| 1455 | goto zr_free_irq; | ||
| 1456 | } | ||
| 1471 | 1457 | ||
| 1472 | if (zr->card.video_codec != 0 && | 1458 | dprintk(2, |
| 1473 | (codec_name = | 1459 | KERN_INFO "%s: Initializing videocodec bus...\n", |
| 1474 | codecid_to_modulename(zr->card.video_codec)) != NULL) { | 1460 | ZR_DEVNAME(zr)); |
| 1475 | if ((result = request_module(codec_name)) < 0) { | 1461 | |
| 1462 | if (zr->card.video_codec) { | ||
| 1463 | codec_name = codecid_to_modulename(zr->card.video_codec); | ||
| 1464 | if (codec_name) { | ||
| 1465 | result = request_module(codec_name); | ||
| 1466 | if (result) { | ||
| 1476 | dprintk(1, | 1467 | dprintk(1, |
| 1477 | KERN_ERR | 1468 | KERN_ERR |
| 1478 | "%s: failed to load modules %s: %d\n", | 1469 | "%s: failed to load modules %s: %d\n", |
| 1479 | ZR_DEVNAME(zr), codec_name, result); | 1470 | ZR_DEVNAME(zr), codec_name, result); |
| 1480 | } | 1471 | } |
| 1481 | } | 1472 | } |
| 1482 | if (zr->card.video_vfe != 0 && | 1473 | } |
| 1483 | (vfe_name = | 1474 | if (zr->card.video_vfe) { |
| 1484 | codecid_to_modulename(zr->card.video_vfe)) != NULL) { | 1475 | vfe_name = codecid_to_modulename(zr->card.video_vfe); |
| 1485 | if ((result = request_module(vfe_name)) < 0) { | 1476 | if (vfe_name) { |
| 1477 | result = request_module(vfe_name); | ||
| 1478 | if (result < 0) { | ||
| 1486 | dprintk(1, | 1479 | dprintk(1, |
| 1487 | KERN_ERR | 1480 | KERN_ERR |
| 1488 | "%s: failed to load modules %s: %d\n", | 1481 | "%s: failed to load modules %s: %d\n", |
| 1489 | ZR_DEVNAME(zr), vfe_name, result); | 1482 | ZR_DEVNAME(zr), vfe_name, result); |
| 1490 | } | 1483 | } |
| 1491 | } | 1484 | } |
| 1485 | } | ||
| 1492 | 1486 | ||
| 1493 | /* reset JPEG codec */ | 1487 | /* reset JPEG codec */ |
| 1494 | jpeg_codec_sleep(zr, 1); | 1488 | jpeg_codec_sleep(zr, 1); |
| 1495 | jpeg_codec_reset(zr); | 1489 | jpeg_codec_reset(zr); |
| 1496 | /* video bus enabled */ | 1490 | /* video bus enabled */ |
| 1497 | /* display codec revision */ | 1491 | /* display codec revision */ |
| 1498 | if (zr->card.video_codec != 0) { | 1492 | if (zr->card.video_codec != 0) { |
| 1499 | master_codec = zoran_setup_videocodec(zr, | 1493 | master_codec = zoran_setup_videocodec(zr, zr->card.video_codec); |
| 1500 | zr->card.video_codec); | 1494 | if (!master_codec) |
| 1501 | if (!master_codec) | 1495 | goto zr_unreg_i2c; |
| 1502 | goto zr_unreg_i2c; | 1496 | zr->codec = videocodec_attach(master_codec); |
| 1503 | zr->codec = videocodec_attach(master_codec); | 1497 | if (!zr->codec) { |
| 1504 | if (!zr->codec) { | 1498 | dprintk(1, |
| 1505 | dprintk(1, | 1499 | KERN_ERR |
| 1506 | KERN_ERR | 1500 | "%s: find_zr36057() - no codec found\n", |
| 1507 | "%s: find_zr36057() - no codec found\n", | 1501 | ZR_DEVNAME(zr)); |
| 1508 | ZR_DEVNAME(zr)); | 1502 | goto zr_free_codec; |
| 1509 | goto zr_free_codec; | ||
| 1510 | } | ||
| 1511 | if (zr->codec->type != zr->card.video_codec) { | ||
| 1512 | dprintk(1, | ||
| 1513 | KERN_ERR | ||
| 1514 | "%s: find_zr36057() - wrong codec\n", | ||
| 1515 | ZR_DEVNAME(zr)); | ||
| 1516 | goto zr_detach_codec; | ||
| 1517 | } | ||
| 1518 | } | 1503 | } |
| 1519 | if (zr->card.video_vfe != 0) { | 1504 | if (zr->codec->type != zr->card.video_codec) { |
| 1520 | master_vfe = zoran_setup_videocodec(zr, | 1505 | dprintk(1, |
| 1521 | zr->card.video_vfe); | 1506 | KERN_ERR |
| 1522 | if (!master_vfe) | 1507 | "%s: find_zr36057() - wrong codec\n", |
| 1523 | goto zr_detach_codec; | 1508 | ZR_DEVNAME(zr)); |
| 1524 | zr->vfe = videocodec_attach(master_vfe); | 1509 | goto zr_detach_codec; |
| 1525 | if (!zr->vfe) { | 1510 | } |
| 1526 | dprintk(1, | 1511 | } |
| 1527 | KERN_ERR | 1512 | if (zr->card.video_vfe != 0) { |
| 1528 | "%s: find_zr36057() - no VFE found\n", | 1513 | master_vfe = zoran_setup_videocodec(zr, zr->card.video_vfe); |
| 1529 | ZR_DEVNAME(zr)); | 1514 | if (!master_vfe) |
| 1530 | goto zr_free_vfe; | 1515 | goto zr_detach_codec; |
| 1531 | } | 1516 | zr->vfe = videocodec_attach(master_vfe); |
| 1532 | if (zr->vfe->type != zr->card.video_vfe) { | 1517 | if (!zr->vfe) { |
| 1533 | dprintk(1, | 1518 | dprintk(1, |
| 1534 | KERN_ERR | 1519 | KERN_ERR |
| 1535 | "%s: find_zr36057() = wrong VFE\n", | 1520 | "%s: find_zr36057() - no VFE found\n", |
| 1536 | ZR_DEVNAME(zr)); | 1521 | ZR_DEVNAME(zr)); |
| 1537 | goto zr_detach_vfe; | 1522 | goto zr_free_vfe; |
| 1538 | } | 1523 | } |
| 1524 | if (zr->vfe->type != zr->card.video_vfe) { | ||
| 1525 | dprintk(1, | ||
| 1526 | KERN_ERR | ||
| 1527 | "%s: find_zr36057() = wrong VFE\n", | ||
| 1528 | ZR_DEVNAME(zr)); | ||
| 1529 | goto zr_detach_vfe; | ||
| 1539 | } | 1530 | } |
| 1540 | /* Success so keep the pci_dev referenced */ | ||
| 1541 | pci_dev_get(zr->pci_dev); | ||
| 1542 | zoran[zoran_num++] = zr; | ||
| 1543 | continue; | ||
| 1544 | |||
| 1545 | // Init errors | ||
| 1546 | zr_detach_vfe: | ||
| 1547 | videocodec_detach(zr->vfe); | ||
| 1548 | zr_free_vfe: | ||
| 1549 | kfree(master_vfe); | ||
| 1550 | zr_detach_codec: | ||
| 1551 | videocodec_detach(zr->codec); | ||
| 1552 | zr_free_codec: | ||
| 1553 | kfree(master_codec); | ||
| 1554 | zr_unreg_i2c: | ||
| 1555 | zoran_unregister_i2c(zr); | ||
| 1556 | zr_free_irq: | ||
| 1557 | btwrite(0, ZR36057_SPGPPCR); | ||
| 1558 | free_irq(zr->pci_dev->irq, zr); | ||
| 1559 | zr_unmap: | ||
| 1560 | iounmap(zr->zr36057_mem); | ||
| 1561 | zr_free_mem: | ||
| 1562 | kfree(zr); | ||
| 1563 | continue; | ||
| 1564 | } | 1531 | } |
| 1565 | if (dev) /* Clean up ref count on early exit */ | ||
| 1566 | pci_dev_put(dev); | ||
| 1567 | 1532 | ||
| 1568 | if (zoran_num == 0) { | 1533 | /* take care of Natoma chipset and a revision 1 zr36057 */ |
| 1569 | dprintk(1, KERN_INFO "No known MJPEG cards found.\n"); | 1534 | if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) { |
| 1535 | zr->jpg_buffers.need_contiguous = 1; | ||
| 1536 | dprintk(1, | ||
| 1537 | KERN_INFO | ||
| 1538 | "%s: ZR36057/Natoma bug, max. buffer size is 128K\n", | ||
| 1539 | ZR_DEVNAME(zr)); | ||
| 1570 | } | 1540 | } |
| 1571 | return zoran_num; | 1541 | |
| 1542 | if (zr36057_init(zr) < 0) | ||
| 1543 | goto zr_detach_vfe; | ||
| 1544 | |||
| 1545 | zoran_proc_init(zr); | ||
| 1546 | |||
| 1547 | pci_set_drvdata(pdev, zr); | ||
| 1548 | |||
| 1549 | return 0; | ||
| 1550 | |||
| 1551 | zr_detach_vfe: | ||
| 1552 | videocodec_detach(zr->vfe); | ||
| 1553 | zr_free_vfe: | ||
| 1554 | kfree(master_vfe); | ||
| 1555 | zr_detach_codec: | ||
| 1556 | videocodec_detach(zr->codec); | ||
| 1557 | zr_free_codec: | ||
| 1558 | kfree(master_codec); | ||
| 1559 | zr_unreg_i2c: | ||
| 1560 | zoran_unregister_i2c(zr); | ||
| 1561 | zr_free_irq: | ||
| 1562 | btwrite(0, ZR36057_SPGPPCR); | ||
| 1563 | free_irq(zr->pci_dev->irq, zr); | ||
| 1564 | zr_unmap: | ||
| 1565 | iounmap(zr->zr36057_mem); | ||
| 1566 | zr_free_mem: | ||
| 1567 | kfree(zr); | ||
| 1568 | |||
| 1569 | return -ENODEV; | ||
| 1572 | } | 1570 | } |
| 1573 | 1571 | ||
| 1574 | static int __init | 1572 | static struct pci_driver zoran_driver = { |
| 1575 | init_dc10_cards (void) | 1573 | .name = "zr36067", |
| 1574 | .id_table = zr36067_pci_tbl, | ||
| 1575 | .probe = zoran_probe, | ||
| 1576 | .remove = zoran_remove, | ||
| 1577 | }; | ||
| 1578 | |||
| 1579 | static int __init zoran_init(void) | ||
| 1576 | { | 1580 | { |
| 1577 | int i; | 1581 | int res; |
| 1578 | 1582 | ||
| 1579 | memset(zoran, 0, sizeof(zoran)); | ||
| 1580 | printk(KERN_INFO "Zoran MJPEG board driver version %d.%d.%d\n", | 1583 | printk(KERN_INFO "Zoran MJPEG board driver version %d.%d.%d\n", |
| 1581 | MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION); | 1584 | MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION); |
| 1582 | 1585 | ||
| 1583 | /* Look for cards */ | ||
| 1584 | if (find_zr36057() < 0) { | ||
| 1585 | return -EIO; | ||
| 1586 | } | ||
| 1587 | if (zoran_num == 0) | ||
| 1588 | return -ENODEV; | ||
| 1589 | dprintk(1, KERN_INFO "%s: %d card(s) found\n", ZORAN_NAME, | ||
| 1590 | zoran_num); | ||
| 1591 | /* check the parameters we have been given, adjust if necessary */ | 1586 | /* check the parameters we have been given, adjust if necessary */ |
| 1592 | if (v4l_nbufs < 2) | 1587 | if (v4l_nbufs < 2) |
| 1593 | v4l_nbufs = 2; | 1588 | v4l_nbufs = 2; |
| @@ -1629,37 +1624,22 @@ init_dc10_cards (void) | |||
| 1629 | ZORAN_NAME); | 1624 | ZORAN_NAME); |
| 1630 | } | 1625 | } |
| 1631 | 1626 | ||
| 1632 | /* take care of Natoma chipset and a revision 1 zr36057 */ | 1627 | res = pci_register_driver(&zoran_driver); |
| 1633 | for (i = 0; i < zoran_num; i++) { | 1628 | if (res) { |
| 1634 | struct zoran *zr = zoran[i]; | 1629 | dprintk(1, |
| 1635 | 1630 | KERN_ERR | |
| 1636 | if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) { | 1631 | "%s: Unable to register ZR36057 driver\n", |
| 1637 | zr->jpg_buffers.need_contiguous = 1; | 1632 | ZORAN_NAME); |
| 1638 | dprintk(1, | 1633 | return res; |
| 1639 | KERN_INFO | ||
| 1640 | "%s: ZR36057/Natoma bug, max. buffer size is 128K\n", | ||
| 1641 | ZR_DEVNAME(zr)); | ||
| 1642 | } | ||
| 1643 | |||
| 1644 | if (zr36057_init(zr) < 0) { | ||
| 1645 | for (i = 0; i < zoran_num; i++) | ||
| 1646 | zoran_release(zoran[i]); | ||
| 1647 | return -EIO; | ||
| 1648 | } | ||
| 1649 | zoran_proc_init(zr); | ||
| 1650 | } | 1634 | } |
| 1651 | 1635 | ||
| 1652 | return 0; | 1636 | return 0; |
| 1653 | } | 1637 | } |
| 1654 | 1638 | ||
| 1655 | static void __exit | 1639 | static void __exit zoran_exit(void) |
| 1656 | unload_dc10_cards (void) | ||
| 1657 | { | 1640 | { |
| 1658 | int i; | 1641 | pci_unregister_driver(&zoran_driver); |
| 1659 | |||
| 1660 | for (i = 0; i < zoran_num; i++) | ||
| 1661 | zoran_release(zoran[i]); | ||
| 1662 | } | 1642 | } |
| 1663 | 1643 | ||
| 1664 | module_init(init_dc10_cards); | 1644 | module_init(zoran_init); |
| 1665 | module_exit(unload_dc10_cards); | 1645 | module_exit(zoran_exit); |
diff --git a/drivers/media/video/zoran/zoran_card.h b/drivers/media/video/zoran/zoran_card.h index e4dc9d29b404..4507bdc5e338 100644 --- a/drivers/media/video/zoran/zoran_card.h +++ b/drivers/media/video/zoran/zoran_card.h | |||
| @@ -40,8 +40,6 @@ extern int zr36067_debug; | |||
| 40 | 40 | ||
| 41 | /* Anybody who uses more than four? */ | 41 | /* Anybody who uses more than four? */ |
| 42 | #define BUZ_MAX 4 | 42 | #define BUZ_MAX 4 |
| 43 | extern int zoran_num; | ||
| 44 | extern struct zoran *zoran[BUZ_MAX]; | ||
| 45 | 43 | ||
| 46 | extern struct video_device zoran_template; | 44 | extern struct video_device zoran_template; |
| 47 | 45 | ||
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index b58b9dda715c..120ef235e63d 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
| @@ -1196,83 +1196,54 @@ zoran_close_end_session (struct file *file) | |||
| 1196 | * Open a zoran card. Right now the flags stuff is just playing | 1196 | * Open a zoran card. Right now the flags stuff is just playing |
| 1197 | */ | 1197 | */ |
| 1198 | 1198 | ||
| 1199 | static int | 1199 | static int zoran_open(struct file *file) |
| 1200 | zoran_open(struct file *file) | ||
| 1201 | { | 1200 | { |
| 1202 | unsigned int minor = video_devdata(file)->minor; | 1201 | struct zoran *zr = video_drvdata(file); |
| 1203 | struct zoran *zr = NULL; | ||
| 1204 | struct zoran_fh *fh; | 1202 | struct zoran_fh *fh; |
| 1205 | int i, res, first_open = 0, have_module_locks = 0; | 1203 | int res, first_open = 0; |
| 1206 | 1204 | ||
| 1207 | lock_kernel(); | 1205 | dprintk(2, KERN_INFO "%s: zoran_open(%s, pid=[%d]), users(-)=%d\n", |
| 1208 | /* find the device */ | 1206 | ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user + 1); |
| 1209 | for (i = 0; i < zoran_num; i++) { | ||
| 1210 | if (zoran[i]->video_dev->minor == minor) { | ||
| 1211 | zr = zoran[i]; | ||
| 1212 | break; | ||
| 1213 | } | ||
| 1214 | } | ||
| 1215 | 1207 | ||
| 1216 | if (!zr) { | 1208 | lock_kernel(); |
| 1217 | dprintk(1, KERN_ERR "%s: device not found!\n", ZORAN_NAME); | ||
| 1218 | res = -ENODEV; | ||
| 1219 | goto open_unlock_and_return; | ||
| 1220 | } | ||
| 1221 | 1209 | ||
| 1222 | /* see fs/device.c - the kernel already locks during open(), | 1210 | /* see fs/device.c - the kernel already locks during open(), |
| 1223 | * so locking ourselves only causes deadlocks */ | 1211 | * so locking ourselves only causes deadlocks */ |
| 1224 | /*mutex_lock(&zr->resource_lock);*/ | 1212 | /*mutex_lock(&zr->resource_lock);*/ |
| 1225 | 1213 | ||
| 1214 | if (zr->user >= 2048) { | ||
| 1215 | dprintk(1, KERN_ERR "%s: too many users (%d) on device\n", | ||
| 1216 | ZR_DEVNAME(zr), zr->user); | ||
| 1217 | res = -EBUSY; | ||
| 1218 | goto fail_unlock; | ||
| 1219 | } | ||
| 1220 | |||
| 1226 | if (!zr->decoder) { | 1221 | if (!zr->decoder) { |
| 1227 | dprintk(1, | 1222 | dprintk(1, |
| 1228 | KERN_ERR "%s: no TV decoder loaded for device!\n", | 1223 | KERN_ERR "%s: no TV decoder loaded for device!\n", |
| 1229 | ZR_DEVNAME(zr)); | 1224 | ZR_DEVNAME(zr)); |
| 1230 | res = -EIO; | 1225 | res = -EIO; |
| 1231 | goto open_unlock_and_return; | 1226 | goto fail_unlock; |
| 1232 | } | 1227 | } |
| 1233 | 1228 | ||
| 1234 | /* try to grab a module lock */ | ||
| 1235 | if (!try_module_get(THIS_MODULE)) { | ||
| 1236 | dprintk(1, | ||
| 1237 | KERN_ERR | ||
| 1238 | "%s: failed to acquire my own lock! PANIC!\n", | ||
| 1239 | ZR_DEVNAME(zr)); | ||
| 1240 | res = -ENODEV; | ||
| 1241 | goto open_unlock_and_return; | ||
| 1242 | } | ||
| 1243 | if (!try_module_get(zr->decoder->driver->driver.owner)) { | 1229 | if (!try_module_get(zr->decoder->driver->driver.owner)) { |
| 1244 | dprintk(1, | 1230 | dprintk(1, |
| 1245 | KERN_ERR | 1231 | KERN_ERR |
| 1246 | "%s: failed to grab ownership of i2c decoder\n", | 1232 | "%s: failed to grab ownership of video decoder\n", |
| 1247 | ZR_DEVNAME(zr)); | 1233 | ZR_DEVNAME(zr)); |
| 1248 | res = -EIO; | 1234 | res = -EIO; |
| 1249 | module_put(THIS_MODULE); | 1235 | goto fail_unlock; |
| 1250 | goto open_unlock_and_return; | ||
| 1251 | } | 1236 | } |
| 1252 | if (zr->encoder && | 1237 | if (zr->encoder && |
| 1253 | !try_module_get(zr->encoder->driver->driver.owner)) { | 1238 | !try_module_get(zr->encoder->driver->driver.owner)) { |
| 1254 | dprintk(1, | 1239 | dprintk(1, |
| 1255 | KERN_ERR | 1240 | KERN_ERR |
| 1256 | "%s: failed to grab ownership of i2c encoder\n", | 1241 | "%s: failed to grab ownership of video encoder\n", |
| 1257 | ZR_DEVNAME(zr)); | 1242 | ZR_DEVNAME(zr)); |
| 1258 | res = -EIO; | 1243 | res = -EIO; |
| 1259 | module_put(zr->decoder->driver->driver.owner); | 1244 | goto fail_decoder; |
| 1260 | module_put(THIS_MODULE); | ||
| 1261 | goto open_unlock_and_return; | ||
| 1262 | } | 1245 | } |
| 1263 | 1246 | ||
| 1264 | have_module_locks = 1; | ||
| 1265 | |||
| 1266 | if (zr->user >= 2048) { | ||
| 1267 | dprintk(1, KERN_ERR "%s: too many users (%d) on device\n", | ||
| 1268 | ZR_DEVNAME(zr), zr->user); | ||
| 1269 | res = -EBUSY; | ||
| 1270 | goto open_unlock_and_return; | ||
| 1271 | } | ||
| 1272 | |||
| 1273 | dprintk(1, KERN_INFO "%s: zoran_open(%s, pid=[%d]), users(-)=%d\n", | ||
| 1274 | ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user); | ||
| 1275 | |||
| 1276 | /* now, create the open()-specific file_ops struct */ | 1247 | /* now, create the open()-specific file_ops struct */ |
| 1277 | fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL); | 1248 | fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL); |
| 1278 | if (!fh) { | 1249 | if (!fh) { |
| @@ -1281,7 +1252,7 @@ zoran_open(struct file *file) | |||
| 1281 | "%s: zoran_open() - allocation of zoran_fh failed\n", | 1252 | "%s: zoran_open() - allocation of zoran_fh failed\n", |
| 1282 | ZR_DEVNAME(zr)); | 1253 | ZR_DEVNAME(zr)); |
| 1283 | res = -ENOMEM; | 1254 | res = -ENOMEM; |
| 1284 | goto open_unlock_and_return; | 1255 | goto fail_encoder; |
| 1285 | } | 1256 | } |
| 1286 | /* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows | 1257 | /* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows |
| 1287 | * on norm-change! */ | 1258 | * on norm-change! */ |
| @@ -1292,9 +1263,8 @@ zoran_open(struct file *file) | |||
| 1292 | KERN_ERR | 1263 | KERN_ERR |
| 1293 | "%s: zoran_open() - allocation of overlay_mask failed\n", | 1264 | "%s: zoran_open() - allocation of overlay_mask failed\n", |
| 1294 | ZR_DEVNAME(zr)); | 1265 | ZR_DEVNAME(zr)); |
| 1295 | kfree(fh); | ||
| 1296 | res = -ENOMEM; | 1266 | res = -ENOMEM; |
| 1297 | goto open_unlock_and_return; | 1267 | goto fail_fh; |
| 1298 | } | 1268 | } |
| 1299 | 1269 | ||
| 1300 | if (zr->user++ == 0) | 1270 | if (zr->user++ == 0) |
| @@ -1319,22 +1289,19 @@ zoran_open(struct file *file) | |||
| 1319 | 1289 | ||
| 1320 | return 0; | 1290 | return 0; |
| 1321 | 1291 | ||
| 1322 | open_unlock_and_return: | 1292 | fail_fh: |
| 1323 | /* if we grabbed locks, release them accordingly */ | 1293 | kfree(fh); |
| 1324 | if (have_module_locks) { | 1294 | fail_encoder: |
| 1325 | module_put(zr->decoder->driver->driver.owner); | 1295 | if (zr->encoder) |
| 1326 | if (zr->encoder) { | 1296 | module_put(zr->encoder->driver->driver.owner); |
| 1327 | module_put(zr->encoder->driver->driver.owner); | 1297 | fail_decoder: |
| 1328 | } | 1298 | module_put(zr->decoder->driver->driver.owner); |
| 1329 | module_put(THIS_MODULE); | 1299 | fail_unlock: |
| 1330 | } | ||
| 1331 | |||
| 1332 | /* if there's no device found, we didn't obtain the lock either */ | ||
| 1333 | if (zr) { | ||
| 1334 | /*mutex_unlock(&zr->resource_lock);*/ | ||
| 1335 | } | ||
| 1336 | unlock_kernel(); | 1300 | unlock_kernel(); |
| 1337 | 1301 | ||
| 1302 | dprintk(2, KERN_INFO "%s: open failed (%d), users(-)=%d\n", | ||
| 1303 | ZR_DEVNAME(zr), res, zr->user); | ||
| 1304 | |||
| 1338 | return res; | 1305 | return res; |
| 1339 | } | 1306 | } |
| 1340 | 1307 | ||
| @@ -1344,8 +1311,8 @@ zoran_close(struct file *file) | |||
| 1344 | struct zoran_fh *fh = file->private_data; | 1311 | struct zoran_fh *fh = file->private_data; |
| 1345 | struct zoran *zr = fh->zr; | 1312 | struct zoran *zr = fh->zr; |
| 1346 | 1313 | ||
| 1347 | dprintk(1, KERN_INFO "%s: zoran_close(%s, pid=[%d]), users(+)=%d\n", | 1314 | dprintk(2, KERN_INFO "%s: zoran_close(%s, pid=[%d]), users(+)=%d\n", |
| 1348 | ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user); | 1315 | ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user - 1); |
| 1349 | 1316 | ||
| 1350 | /* kernel locks (fs/device.c), so don't do that ourselves | 1317 | /* kernel locks (fs/device.c), so don't do that ourselves |
| 1351 | * (prevents deadlocks) */ | 1318 | * (prevents deadlocks) */ |
| @@ -1391,10 +1358,8 @@ zoran_close(struct file *file) | |||
| 1391 | 1358 | ||
| 1392 | /* release locks on the i2c modules */ | 1359 | /* release locks on the i2c modules */ |
| 1393 | module_put(zr->decoder->driver->driver.owner); | 1360 | module_put(zr->decoder->driver->driver.owner); |
| 1394 | if (zr->encoder) { | 1361 | if (zr->encoder) |
| 1395 | module_put(zr->encoder->driver->driver.owner); | 1362 | module_put(zr->encoder->driver->driver.owner); |
| 1396 | } | ||
| 1397 | module_put(THIS_MODULE); | ||
| 1398 | 1363 | ||
| 1399 | /*mutex_unlock(&zr->resource_lock);*/ | 1364 | /*mutex_unlock(&zr->resource_lock);*/ |
| 1400 | 1365 | ||
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 0efa390978bd..99d4b28d52ed 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -145,6 +145,16 @@ config MMC_IMX | |||
| 145 | 145 | ||
| 146 | If unsure, say N. | 146 | If unsure, say N. |
| 147 | 147 | ||
| 148 | config MMC_MXC | ||
| 149 | tristate "Freescale i.MX2/3 Multimedia Card Interface support" | ||
| 150 | depends on ARCH_MXC | ||
| 151 | help | ||
| 152 | This selects the Freescale i.MX2/3 Multimedia card Interface. | ||
| 153 | If you have a i.MX platform with a Multimedia Card slot, | ||
| 154 | say Y or M here. | ||
| 155 | |||
| 156 | If unsure, say N. | ||
| 157 | |||
| 148 | config MMC_TIFM_SD | 158 | config MMC_TIFM_SD |
| 149 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" | 159 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" |
| 150 | depends on EXPERIMENTAL && PCI | 160 | depends on EXPERIMENTAL && PCI |
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 98cab84829b8..dedec55861d9 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile | |||
| @@ -9,6 +9,7 @@ endif | |||
| 9 | obj-$(CONFIG_MMC_ARMMMCI) += mmci.o | 9 | obj-$(CONFIG_MMC_ARMMMCI) += mmci.o |
| 10 | obj-$(CONFIG_MMC_PXA) += pxamci.o | 10 | obj-$(CONFIG_MMC_PXA) += pxamci.o |
| 11 | obj-$(CONFIG_MMC_IMX) += imxmmc.o | 11 | obj-$(CONFIG_MMC_IMX) += imxmmc.o |
| 12 | obj-$(CONFIG_MMC_MXC) += mxcmmc.o | ||
| 12 | obj-$(CONFIG_MMC_SDHCI) += sdhci.o | 13 | obj-$(CONFIG_MMC_SDHCI) += sdhci.o |
| 13 | obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o | 14 | obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o |
| 14 | obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o | 15 | obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 1bcbdd6763ac..2909bbc8ad00 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -430,6 +430,8 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 430 | clk = 255; | 430 | clk = 255; |
| 431 | host->cclk = host->mclk / (2 * (clk + 1)); | 431 | host->cclk = host->mclk / (2 * (clk + 1)); |
| 432 | } | 432 | } |
| 433 | if (host->hw_designer == 0x80) | ||
| 434 | clk |= MCI_FCEN; /* Bug fix in ST IP block */ | ||
| 433 | clk |= MCI_CLK_ENABLE; | 435 | clk |= MCI_CLK_ENABLE; |
| 434 | } | 436 | } |
| 435 | 437 | ||
| @@ -440,15 +442,27 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 440 | case MMC_POWER_OFF: | 442 | case MMC_POWER_OFF: |
| 441 | break; | 443 | break; |
| 442 | case MMC_POWER_UP: | 444 | case MMC_POWER_UP: |
| 443 | pwr |= MCI_PWR_UP; | 445 | /* The ST version does not have this, fall through to POWER_ON */ |
| 444 | break; | 446 | if (host->hw_designer != 0x80) { |
| 447 | pwr |= MCI_PWR_UP; | ||
| 448 | break; | ||
| 449 | } | ||
| 445 | case MMC_POWER_ON: | 450 | case MMC_POWER_ON: |
| 446 | pwr |= MCI_PWR_ON; | 451 | pwr |= MCI_PWR_ON; |
| 447 | break; | 452 | break; |
| 448 | } | 453 | } |
| 449 | 454 | ||
| 450 | if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) | 455 | if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) { |
| 451 | pwr |= MCI_ROD; | 456 | if (host->hw_designer != 0x80) |
| 457 | pwr |= MCI_ROD; | ||
| 458 | else { | ||
| 459 | /* | ||
| 460 | * The ST Micro variant use the ROD bit for something | ||
| 461 | * else and only has OD (Open Drain). | ||
| 462 | */ | ||
| 463 | pwr |= MCI_OD; | ||
| 464 | } | ||
| 465 | } | ||
| 452 | 466 | ||
| 453 | writel(clk, host->base + MMCICLOCK); | 467 | writel(clk, host->base + MMCICLOCK); |
| 454 | 468 | ||
| @@ -500,6 +514,12 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
| 500 | } | 514 | } |
| 501 | 515 | ||
| 502 | host = mmc_priv(mmc); | 516 | host = mmc_priv(mmc); |
| 517 | /* Bits 12 thru 19 is the designer */ | ||
| 518 | host->hw_designer = (dev->periphid >> 12) & 0xff; | ||
| 519 | /* Bits 20 thru 23 is the revison */ | ||
| 520 | host->hw_revision = (dev->periphid >> 20) & 0xf; | ||
| 521 | DBG(host, "designer ID = 0x%02x\n", host->hw_designer); | ||
| 522 | DBG(host, "revision = 0x%01x\n", host->hw_revision); | ||
| 503 | host->clk = clk_get(&dev->dev, NULL); | 523 | host->clk = clk_get(&dev->dev, NULL); |
| 504 | if (IS_ERR(host->clk)) { | 524 | if (IS_ERR(host->clk)) { |
| 505 | ret = PTR_ERR(host->clk); | 525 | ret = PTR_ERR(host->clk); |
| @@ -693,6 +713,15 @@ static struct amba_id mmci_ids[] = { | |||
| 693 | .id = 0x00041181, | 713 | .id = 0x00041181, |
| 694 | .mask = 0x000fffff, | 714 | .mask = 0x000fffff, |
| 695 | }, | 715 | }, |
| 716 | /* ST Micro variants */ | ||
| 717 | { | ||
| 718 | .id = 0x00180180, | ||
| 719 | .mask = 0x00ffffff, | ||
| 720 | }, | ||
| 721 | { | ||
| 722 | .id = 0x00280180, | ||
| 723 | .mask = 0x00ffffff, | ||
| 724 | }, | ||
| 696 | { 0, 0 }, | 725 | { 0, 0 }, |
| 697 | }; | 726 | }; |
| 698 | 727 | ||
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 0f39c490f022..0441bac1c0ec 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h | |||
| @@ -11,13 +11,23 @@ | |||
| 11 | #define MCI_PWR_OFF 0x00 | 11 | #define MCI_PWR_OFF 0x00 |
| 12 | #define MCI_PWR_UP 0x02 | 12 | #define MCI_PWR_UP 0x02 |
| 13 | #define MCI_PWR_ON 0x03 | 13 | #define MCI_PWR_ON 0x03 |
| 14 | #define MCI_DATA2DIREN (1 << 2) | ||
| 15 | #define MCI_CMDDIREN (1 << 3) | ||
| 16 | #define MCI_DATA0DIREN (1 << 4) | ||
| 17 | #define MCI_DATA31DIREN (1 << 5) | ||
| 14 | #define MCI_OD (1 << 6) | 18 | #define MCI_OD (1 << 6) |
| 15 | #define MCI_ROD (1 << 7) | 19 | #define MCI_ROD (1 << 7) |
| 20 | /* The ST Micro version does not have ROD */ | ||
| 21 | #define MCI_FBCLKEN (1 << 7) | ||
| 22 | #define MCI_DATA74DIREN (1 << 8) | ||
| 16 | 23 | ||
| 17 | #define MMCICLOCK 0x004 | 24 | #define MMCICLOCK 0x004 |
| 18 | #define MCI_CLK_ENABLE (1 << 8) | 25 | #define MCI_CLK_ENABLE (1 << 8) |
| 19 | #define MCI_CLK_PWRSAVE (1 << 9) | 26 | #define MCI_CLK_PWRSAVE (1 << 9) |
| 20 | #define MCI_CLK_BYPASS (1 << 10) | 27 | #define MCI_CLK_BYPASS (1 << 10) |
| 28 | #define MCI_WIDE_BUS (1 << 11) | ||
| 29 | /* HW flow control on the ST Micro version */ | ||
| 30 | #define MCI_FCEN (1 << 13) | ||
| 21 | 31 | ||
| 22 | #define MMCIARGUMENT 0x008 | 32 | #define MMCIARGUMENT 0x008 |
| 23 | #define MMCICOMMAND 0x00c | 33 | #define MMCICOMMAND 0x00c |
| @@ -26,6 +36,10 @@ | |||
| 26 | #define MCI_CPSM_INTERRUPT (1 << 8) | 36 | #define MCI_CPSM_INTERRUPT (1 << 8) |
| 27 | #define MCI_CPSM_PENDING (1 << 9) | 37 | #define MCI_CPSM_PENDING (1 << 9) |
| 28 | #define MCI_CPSM_ENABLE (1 << 10) | 38 | #define MCI_CPSM_ENABLE (1 << 10) |
| 39 | #define MCI_SDIO_SUSP (1 << 11) | ||
| 40 | #define MCI_ENCMD_COMPL (1 << 12) | ||
| 41 | #define MCI_NIEN (1 << 13) | ||
| 42 | #define MCI_CE_ATACMD (1 << 14) | ||
| 29 | 43 | ||
| 30 | #define MMCIRESPCMD 0x010 | 44 | #define MMCIRESPCMD 0x010 |
| 31 | #define MMCIRESPONSE0 0x014 | 45 | #define MMCIRESPONSE0 0x014 |
| @@ -39,6 +53,11 @@ | |||
| 39 | #define MCI_DPSM_DIRECTION (1 << 1) | 53 | #define MCI_DPSM_DIRECTION (1 << 1) |
| 40 | #define MCI_DPSM_MODE (1 << 2) | 54 | #define MCI_DPSM_MODE (1 << 2) |
| 41 | #define MCI_DPSM_DMAENABLE (1 << 3) | 55 | #define MCI_DPSM_DMAENABLE (1 << 3) |
| 56 | #define MCI_DPSM_BLOCKSIZE (1 << 4) | ||
| 57 | #define MCI_DPSM_RWSTART (1 << 8) | ||
| 58 | #define MCI_DPSM_RWSTOP (1 << 9) | ||
| 59 | #define MCI_DPSM_RWMOD (1 << 10) | ||
| 60 | #define MCI_DPSM_SDIOEN (1 << 11) | ||
| 42 | 61 | ||
| 43 | #define MMCIDATACNT 0x030 | 62 | #define MMCIDATACNT 0x030 |
| 44 | #define MMCISTATUS 0x034 | 63 | #define MMCISTATUS 0x034 |
| @@ -63,6 +82,8 @@ | |||
| 63 | #define MCI_RXFIFOEMPTY (1 << 19) | 82 | #define MCI_RXFIFOEMPTY (1 << 19) |
| 64 | #define MCI_TXDATAAVLBL (1 << 20) | 83 | #define MCI_TXDATAAVLBL (1 << 20) |
| 65 | #define MCI_RXDATAAVLBL (1 << 21) | 84 | #define MCI_RXDATAAVLBL (1 << 21) |
| 85 | #define MCI_SDIOIT (1 << 22) | ||
| 86 | #define MCI_CEATAEND (1 << 23) | ||
| 66 | 87 | ||
| 67 | #define MMCICLEAR 0x038 | 88 | #define MMCICLEAR 0x038 |
| 68 | #define MCI_CMDCRCFAILCLR (1 << 0) | 89 | #define MCI_CMDCRCFAILCLR (1 << 0) |
| @@ -75,6 +96,8 @@ | |||
| 75 | #define MCI_CMDSENTCLR (1 << 7) | 96 | #define MCI_CMDSENTCLR (1 << 7) |
| 76 | #define MCI_DATAENDCLR (1 << 8) | 97 | #define MCI_DATAENDCLR (1 << 8) |
| 77 | #define MCI_DATABLOCKENDCLR (1 << 10) | 98 | #define MCI_DATABLOCKENDCLR (1 << 10) |
| 99 | #define MCI_SDIOITC (1 << 22) | ||
| 100 | #define MCI_CEATAENDC (1 << 23) | ||
| 78 | 101 | ||
| 79 | #define MMCIMASK0 0x03c | 102 | #define MMCIMASK0 0x03c |
| 80 | #define MCI_CMDCRCFAILMASK (1 << 0) | 103 | #define MCI_CMDCRCFAILMASK (1 << 0) |
| @@ -98,6 +121,8 @@ | |||
| 98 | #define MCI_RXFIFOEMPTYMASK (1 << 19) | 121 | #define MCI_RXFIFOEMPTYMASK (1 << 19) |
| 99 | #define MCI_TXDATAAVLBLMASK (1 << 20) | 122 | #define MCI_TXDATAAVLBLMASK (1 << 20) |
| 100 | #define MCI_RXDATAAVLBLMASK (1 << 21) | 123 | #define MCI_RXDATAAVLBLMASK (1 << 21) |
| 124 | #define MCI_SDIOITMASK (1 << 22) | ||
| 125 | #define MCI_CEATAENDMASK (1 << 23) | ||
| 101 | 126 | ||
| 102 | #define MMCIMASK1 0x040 | 127 | #define MMCIMASK1 0x040 |
| 103 | #define MMCIFIFOCNT 0x048 | 128 | #define MMCIFIFOCNT 0x048 |
| @@ -136,6 +161,9 @@ struct mmci_host { | |||
| 136 | u32 pwr; | 161 | u32 pwr; |
| 137 | struct mmc_platform_data *plat; | 162 | struct mmc_platform_data *plat; |
| 138 | 163 | ||
| 164 | u8 hw_designer; | ||
| 165 | u8 hw_revision:4; | ||
| 166 | |||
| 139 | struct timer_list timer; | 167 | struct timer_list timer; |
| 140 | unsigned int oldstat; | 168 | unsigned int oldstat; |
| 141 | 169 | ||
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c new file mode 100644 index 000000000000..dda0be4e25dc --- /dev/null +++ b/drivers/mmc/host/mxcmmc.c | |||
| @@ -0,0 +1,880 @@ | |||
| 1 | /* | ||
| 2 | * linux/drivers/mmc/host/mxcmmc.c - Freescale i.MX MMCI driver | ||
| 3 | * | ||
| 4 | * This is a driver for the SDHC controller found in Freescale MX2/MX3 | ||
| 5 | * SoCs. It is basically the same hardware as found on MX1 (imxmmc.c). | ||
| 6 | * Unlike the hardware found on MX1, this hardware just works and does | ||
| 7 | * not need all the quirks found in imxmmc.c, hence the seperate driver. | ||
| 8 | * | ||
| 9 | * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> | ||
| 10 | * Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com> | ||
| 11 | * | ||
| 12 | * derived from pxamci.c by Russell King | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify | ||
| 15 | * it under the terms of the GNU General Public License version 2 as | ||
| 16 | * published by the Free Software Foundation. | ||
| 17 | * | ||
| 18 | */ | ||
| 19 | |||
| 20 | #include <linux/module.h> | ||
| 21 | #include <linux/init.h> | ||
| 22 | #include <linux/ioport.h> | ||
| 23 | #include <linux/platform_device.h> | ||
| 24 | #include <linux/interrupt.h> | ||
| 25 | #include <linux/irq.h> | ||
| 26 | #include <linux/blkdev.h> | ||
| 27 | #include <linux/dma-mapping.h> | ||
| 28 | #include <linux/mmc/host.h> | ||
| 29 | #include <linux/mmc/card.h> | ||
| 30 | #include <linux/delay.h> | ||
| 31 | #include <linux/clk.h> | ||
| 32 | #include <linux/io.h> | ||
| 33 | #include <linux/gpio.h> | ||
| 34 | |||
| 35 | #include <asm/dma.h> | ||
| 36 | #include <asm/irq.h> | ||
| 37 | #include <asm/sizes.h> | ||
| 38 | #include <mach/mmc.h> | ||
| 39 | |||
| 40 | #ifdef CONFIG_ARCH_MX2 | ||
| 41 | #include <mach/dma-mx1-mx2.h> | ||
| 42 | #define HAS_DMA | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #define DRIVER_NAME "imx-mmc" | ||
| 46 | |||
| 47 | #define MMC_REG_STR_STP_CLK 0x00 | ||
| 48 | #define MMC_REG_STATUS 0x04 | ||
| 49 | #define MMC_REG_CLK_RATE 0x08 | ||
| 50 | #define MMC_REG_CMD_DAT_CONT 0x0C | ||
| 51 | #define MMC_REG_RES_TO 0x10 | ||
| 52 | #define MMC_REG_READ_TO 0x14 | ||
| 53 | #define MMC_REG_BLK_LEN 0x18 | ||
| 54 | #define MMC_REG_NOB 0x1C | ||
| 55 | #define MMC_REG_REV_NO 0x20 | ||
| 56 | #define MMC_REG_INT_CNTR 0x24 | ||
| 57 | #define MMC_REG_CMD 0x28 | ||
| 58 | #define MMC_REG_ARG 0x2C | ||
| 59 | #define MMC_REG_RES_FIFO 0x34 | ||
| 60 | #define MMC_REG_BUFFER_ACCESS 0x38 | ||
| 61 | |||
| 62 | #define STR_STP_CLK_RESET (1 << 3) | ||
| 63 | #define STR_STP_CLK_START_CLK (1 << 1) | ||
| 64 | #define STR_STP_CLK_STOP_CLK (1 << 0) | ||
| 65 | |||
| 66 | #define STATUS_CARD_INSERTION (1 << 31) | ||
| 67 | #define STATUS_CARD_REMOVAL (1 << 30) | ||
| 68 | #define STATUS_YBUF_EMPTY (1 << 29) | ||
| 69 | #define STATUS_XBUF_EMPTY (1 << 28) | ||
| 70 | #define STATUS_YBUF_FULL (1 << 27) | ||
| 71 | #define STATUS_XBUF_FULL (1 << 26) | ||
| 72 | #define STATUS_BUF_UND_RUN (1 << 25) | ||
| 73 | #define STATUS_BUF_OVFL (1 << 24) | ||
| 74 | #define STATUS_SDIO_INT_ACTIVE (1 << 14) | ||
| 75 | #define STATUS_END_CMD_RESP (1 << 13) | ||
| 76 | #define STATUS_WRITE_OP_DONE (1 << 12) | ||
| 77 | #define STATUS_DATA_TRANS_DONE (1 << 11) | ||
| 78 | #define STATUS_READ_OP_DONE (1 << 11) | ||
| 79 | #define STATUS_WR_CRC_ERROR_CODE_MASK (3 << 10) | ||
| 80 | #define STATUS_CARD_BUS_CLK_RUN (1 << 8) | ||
| 81 | #define STATUS_BUF_READ_RDY (1 << 7) | ||
| 82 | #define STATUS_BUF_WRITE_RDY (1 << 6) | ||
| 83 | #define STATUS_RESP_CRC_ERR (1 << 5) | ||
| 84 | #define STATUS_CRC_READ_ERR (1 << 3) | ||
| 85 | #define STATUS_CRC_WRITE_ERR (1 << 2) | ||
| 86 | #define STATUS_TIME_OUT_RESP (1 << 1) | ||
| 87 | #define STATUS_TIME_OUT_READ (1 << 0) | ||
| 88 | #define STATUS_ERR_MASK 0x2f | ||
| 89 | |||
| 90 | #define CMD_DAT_CONT_CMD_RESP_LONG_OFF (1 << 12) | ||
| 91 | #define CMD_DAT_CONT_STOP_READWAIT (1 << 11) | ||
| 92 | #define CMD_DAT_CONT_START_READWAIT (1 << 10) | ||
| 93 | #define CMD_DAT_CONT_BUS_WIDTH_4 (2 << 8) | ||
| 94 | #define CMD_DAT_CONT_INIT (1 << 7) | ||
| 95 | #define CMD_DAT_CONT_WRITE (1 << 4) | ||
| 96 | #define CMD_DAT_CONT_DATA_ENABLE (1 << 3) | ||
| 97 | #define CMD_DAT_CONT_RESPONSE_48BIT_CRC (1 << 0) | ||
| 98 | #define CMD_DAT_CONT_RESPONSE_136BIT (2 << 0) | ||
| 99 | #define CMD_DAT_CONT_RESPONSE_48BIT (3 << 0) | ||
| 100 | |||
| 101 | #define INT_SDIO_INT_WKP_EN (1 << 18) | ||
| 102 | #define INT_CARD_INSERTION_WKP_EN (1 << 17) | ||
| 103 | #define INT_CARD_REMOVAL_WKP_EN (1 << 16) | ||
| 104 | #define INT_CARD_INSERTION_EN (1 << 15) | ||
| 105 | #define INT_CARD_REMOVAL_EN (1 << 14) | ||
| 106 | #define INT_SDIO_IRQ_EN (1 << 13) | ||
| 107 | #define INT_DAT0_EN (1 << 12) | ||
| 108 | #define INT_BUF_READ_EN (1 << 4) | ||
| 109 | #define INT_BUF_WRITE_EN (1 << 3) | ||
| 110 | #define INT_END_CMD_RES_EN (1 << 2) | ||
| 111 | #define INT_WRITE_OP_DONE_EN (1 << 1) | ||
| 112 | #define INT_READ_OP_EN (1 << 0) | ||
| 113 | |||
| 114 | struct mxcmci_host { | ||
| 115 | struct mmc_host *mmc; | ||
| 116 | struct resource *res; | ||
| 117 | void __iomem *base; | ||
| 118 | int irq; | ||
| 119 | int detect_irq; | ||
| 120 | int dma; | ||
| 121 | int do_dma; | ||
| 122 | unsigned int power_mode; | ||
| 123 | struct imxmmc_platform_data *pdata; | ||
| 124 | |||
| 125 | struct mmc_request *req; | ||
| 126 | struct mmc_command *cmd; | ||
| 127 | struct mmc_data *data; | ||
| 128 | |||
| 129 | unsigned int dma_nents; | ||
| 130 | unsigned int datasize; | ||
| 131 | unsigned int dma_dir; | ||
| 132 | |||
| 133 | u16 rev_no; | ||
| 134 | unsigned int cmdat; | ||
| 135 | |||
| 136 | struct clk *clk; | ||
| 137 | |||
| 138 | int clock; | ||
| 139 | |||
| 140 | struct work_struct datawork; | ||
| 141 | }; | ||
| 142 | |||
| 143 | static inline int mxcmci_use_dma(struct mxcmci_host *host) | ||
| 144 | { | ||
| 145 | return host->do_dma; | ||
| 146 | } | ||
| 147 | |||
| 148 | static void mxcmci_softreset(struct mxcmci_host *host) | ||
| 149 | { | ||
| 150 | int i; | ||
| 151 | |||
| 152 | /* reset sequence */ | ||
| 153 | writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK); | ||
| 154 | writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK, | ||
| 155 | host->base + MMC_REG_STR_STP_CLK); | ||
| 156 | |||
| 157 | for (i = 0; i < 8; i++) | ||
| 158 | writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
| 159 | |||
| 160 | writew(0xff, host->base + MMC_REG_RES_TO); | ||
| 161 | } | ||
| 162 | |||
| 163 | static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data) | ||
| 164 | { | ||
| 165 | unsigned int nob = data->blocks; | ||
| 166 | unsigned int blksz = data->blksz; | ||
| 167 | unsigned int datasize = nob * blksz; | ||
| 168 | #ifdef HAS_DMA | ||
| 169 | struct scatterlist *sg; | ||
| 170 | int i; | ||
| 171 | #endif | ||
| 172 | if (data->flags & MMC_DATA_STREAM) | ||
| 173 | nob = 0xffff; | ||
| 174 | |||
| 175 | host->data = data; | ||
| 176 | data->bytes_xfered = 0; | ||
| 177 | |||
| 178 | writew(nob, host->base + MMC_REG_NOB); | ||
| 179 | writew(blksz, host->base + MMC_REG_BLK_LEN); | ||
| 180 | host->datasize = datasize; | ||
| 181 | |||
| 182 | #ifdef HAS_DMA | ||
| 183 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
| 184 | if (sg->offset & 3 || sg->length & 3) { | ||
| 185 | host->do_dma = 0; | ||
| 186 | return; | ||
| 187 | } | ||
| 188 | } | ||
| 189 | |||
| 190 | if (data->flags & MMC_DATA_READ) { | ||
| 191 | host->dma_dir = DMA_FROM_DEVICE; | ||
| 192 | host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg, | ||
| 193 | data->sg_len, host->dma_dir); | ||
| 194 | |||
| 195 | imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize, | ||
| 196 | host->res->start + MMC_REG_BUFFER_ACCESS, | ||
| 197 | DMA_MODE_READ); | ||
| 198 | } else { | ||
| 199 | host->dma_dir = DMA_TO_DEVICE; | ||
| 200 | host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg, | ||
| 201 | data->sg_len, host->dma_dir); | ||
| 202 | |||
| 203 | imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize, | ||
| 204 | host->res->start + MMC_REG_BUFFER_ACCESS, | ||
| 205 | DMA_MODE_WRITE); | ||
| 206 | } | ||
| 207 | |||
| 208 | wmb(); | ||
| 209 | |||
| 210 | imx_dma_enable(host->dma); | ||
| 211 | #endif /* HAS_DMA */ | ||
| 212 | } | ||
| 213 | |||
| 214 | static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd, | ||
| 215 | unsigned int cmdat) | ||
| 216 | { | ||
| 217 | WARN_ON(host->cmd != NULL); | ||
| 218 | host->cmd = cmd; | ||
| 219 | |||
| 220 | switch (mmc_resp_type(cmd)) { | ||
| 221 | case MMC_RSP_R1: /* short CRC, OPCODE */ | ||
| 222 | case MMC_RSP_R1B:/* short CRC, OPCODE, BUSY */ | ||
| 223 | cmdat |= CMD_DAT_CONT_RESPONSE_48BIT_CRC; | ||
| 224 | break; | ||
| 225 | case MMC_RSP_R2: /* long 136 bit + CRC */ | ||
| 226 | cmdat |= CMD_DAT_CONT_RESPONSE_136BIT; | ||
| 227 | break; | ||
| 228 | case MMC_RSP_R3: /* short */ | ||
| 229 | cmdat |= CMD_DAT_CONT_RESPONSE_48BIT; | ||
| 230 | break; | ||
| 231 | case MMC_RSP_NONE: | ||
| 232 | break; | ||
| 233 | default: | ||
| 234 | dev_err(mmc_dev(host->mmc), "unhandled response type 0x%x\n", | ||
| 235 | mmc_resp_type(cmd)); | ||
| 236 | cmd->error = -EINVAL; | ||
| 237 | return -EINVAL; | ||
| 238 | } | ||
| 239 | |||
| 240 | if (mxcmci_use_dma(host)) | ||
| 241 | writel(INT_READ_OP_EN | INT_WRITE_OP_DONE_EN | | ||
| 242 | INT_END_CMD_RES_EN, | ||
| 243 | host->base + MMC_REG_INT_CNTR); | ||
| 244 | else | ||
| 245 | writel(INT_END_CMD_RES_EN, host->base + MMC_REG_INT_CNTR); | ||
| 246 | |||
| 247 | writew(cmd->opcode, host->base + MMC_REG_CMD); | ||
| 248 | writel(cmd->arg, host->base + MMC_REG_ARG); | ||
| 249 | writew(cmdat, host->base + MMC_REG_CMD_DAT_CONT); | ||
| 250 | |||
| 251 | return 0; | ||
| 252 | } | ||
| 253 | |||
| 254 | static void mxcmci_finish_request(struct mxcmci_host *host, | ||
| 255 | struct mmc_request *req) | ||
| 256 | { | ||
| 257 | writel(0, host->base + MMC_REG_INT_CNTR); | ||
| 258 | |||
| 259 | host->req = NULL; | ||
| 260 | host->cmd = NULL; | ||
| 261 | host->data = NULL; | ||
| 262 | |||
| 263 | mmc_request_done(host->mmc, req); | ||
| 264 | } | ||
| 265 | |||
| 266 | static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat) | ||
| 267 | { | ||
| 268 | struct mmc_data *data = host->data; | ||
| 269 | int data_error; | ||
| 270 | |||
| 271 | #ifdef HAS_DMA | ||
| 272 | if (mxcmci_use_dma(host)) { | ||
| 273 | imx_dma_disable(host->dma); | ||
| 274 | dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_nents, | ||
| 275 | host->dma_dir); | ||
| 276 | } | ||
| 277 | #endif | ||
| 278 | |||
| 279 | if (stat & STATUS_ERR_MASK) { | ||
| 280 | dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n", | ||
| 281 | stat); | ||
| 282 | if (stat & STATUS_CRC_READ_ERR) { | ||
| 283 | data->error = -EILSEQ; | ||
| 284 | } else if (stat & STATUS_CRC_WRITE_ERR) { | ||
| 285 | u32 err_code = (stat >> 9) & 0x3; | ||
| 286 | if (err_code == 2) /* No CRC response */ | ||
| 287 | data->error = -ETIMEDOUT; | ||
| 288 | else | ||
| 289 | data->error = -EILSEQ; | ||
| 290 | } else if (stat & STATUS_TIME_OUT_READ) { | ||
| 291 | data->error = -ETIMEDOUT; | ||
| 292 | } else { | ||
| 293 | data->error = -EIO; | ||
| 294 | } | ||
| 295 | } else { | ||
| 296 | data->bytes_xfered = host->datasize; | ||
| 297 | } | ||
| 298 | |||
| 299 | data_error = data->error; | ||
| 300 | |||
| 301 | host->data = NULL; | ||
| 302 | |||
| 303 | return data_error; | ||
| 304 | } | ||
| 305 | |||
| 306 | static void mxcmci_read_response(struct mxcmci_host *host, unsigned int stat) | ||
| 307 | { | ||
| 308 | struct mmc_command *cmd = host->cmd; | ||
| 309 | int i; | ||
| 310 | u32 a, b, c; | ||
| 311 | |||
| 312 | if (!cmd) | ||
| 313 | return; | ||
| 314 | |||
| 315 | if (stat & STATUS_TIME_OUT_RESP) { | ||
| 316 | dev_dbg(mmc_dev(host->mmc), "CMD TIMEOUT\n"); | ||
| 317 | cmd->error = -ETIMEDOUT; | ||
| 318 | } else if (stat & STATUS_RESP_CRC_ERR && cmd->flags & MMC_RSP_CRC) { | ||
| 319 | dev_dbg(mmc_dev(host->mmc), "cmd crc error\n"); | ||
| 320 | cmd->error = -EILSEQ; | ||
| 321 | } | ||
| 322 | |||
| 323 | if (cmd->flags & MMC_RSP_PRESENT) { | ||
| 324 | if (cmd->flags & MMC_RSP_136) { | ||
| 325 | for (i = 0; i < 4; i++) { | ||
| 326 | a = readw(host->base + MMC_REG_RES_FIFO); | ||
| 327 | b = readw(host->base + MMC_REG_RES_FIFO); | ||
| 328 | cmd->resp[i] = a << 16 | b; | ||
| 329 | } | ||
| 330 | } else { | ||
| 331 | a = readw(host->base + MMC_REG_RES_FIFO); | ||
| 332 | b = readw(host->base + MMC_REG_RES_FIFO); | ||
| 333 | c = readw(host->base + MMC_REG_RES_FIFO); | ||
| 334 | cmd->resp[0] = a << 24 | b << 8 | c >> 8; | ||
| 335 | } | ||
| 336 | } | ||
| 337 | } | ||
| 338 | |||
| 339 | static int mxcmci_poll_status(struct mxcmci_host *host, u32 mask) | ||
| 340 | { | ||
| 341 | u32 stat; | ||
| 342 | unsigned long timeout = jiffies + HZ; | ||
| 343 | |||
| 344 | do { | ||
| 345 | stat = readl(host->base + MMC_REG_STATUS); | ||
| 346 | if (stat & STATUS_ERR_MASK) | ||
| 347 | return stat; | ||
| 348 | if (time_after(jiffies, timeout)) | ||
| 349 | return STATUS_TIME_OUT_READ; | ||
| 350 | if (stat & mask) | ||
| 351 | return 0; | ||
| 352 | cpu_relax(); | ||
| 353 | } while (1); | ||
| 354 | } | ||
| 355 | |||
| 356 | static int mxcmci_pull(struct mxcmci_host *host, void *_buf, int bytes) | ||
| 357 | { | ||
| 358 | unsigned int stat; | ||
| 359 | u32 *buf = _buf; | ||
| 360 | |||
| 361 | while (bytes > 3) { | ||
| 362 | stat = mxcmci_poll_status(host, | ||
| 363 | STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE); | ||
| 364 | if (stat) | ||
| 365 | return stat; | ||
| 366 | *buf++ = readl(host->base + MMC_REG_BUFFER_ACCESS); | ||
| 367 | bytes -= 4; | ||
| 368 | } | ||
| 369 | |||
| 370 | if (bytes) { | ||
| 371 | u8 *b = (u8 *)buf; | ||
| 372 | u32 tmp; | ||
| 373 | |||
| 374 | stat = mxcmci_poll_status(host, | ||
| 375 | STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE); | ||
| 376 | if (stat) | ||
| 377 | return stat; | ||
| 378 | tmp = readl(host->base + MMC_REG_BUFFER_ACCESS); | ||
| 379 | memcpy(b, &tmp, bytes); | ||
| 380 | } | ||
| 381 | |||
| 382 | return 0; | ||
| 383 | } | ||
| 384 | |||
| 385 | static int mxcmci_push(struct mxcmci_host *host, void *_buf, int bytes) | ||
| 386 | { | ||
| 387 | unsigned int stat; | ||
| 388 | u32 *buf = _buf; | ||
| 389 | |||
| 390 | while (bytes > 3) { | ||
| 391 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
| 392 | if (stat) | ||
| 393 | return stat; | ||
| 394 | writel(*buf++, host->base + MMC_REG_BUFFER_ACCESS); | ||
| 395 | bytes -= 4; | ||
| 396 | } | ||
| 397 | |||
| 398 | if (bytes) { | ||
| 399 | u8 *b = (u8 *)buf; | ||
| 400 | u32 tmp; | ||
| 401 | |||
| 402 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
| 403 | if (stat) | ||
| 404 | return stat; | ||
| 405 | |||
| 406 | memcpy(&tmp, b, bytes); | ||
| 407 | writel(tmp, host->base + MMC_REG_BUFFER_ACCESS); | ||
| 408 | } | ||
| 409 | |||
| 410 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
| 411 | if (stat) | ||
| 412 | return stat; | ||
| 413 | |||
| 414 | return 0; | ||
| 415 | } | ||
| 416 | |||
| 417 | static int mxcmci_transfer_data(struct mxcmci_host *host) | ||
| 418 | { | ||
| 419 | struct mmc_data *data = host->req->data; | ||
| 420 | struct scatterlist *sg; | ||
| 421 | int stat, i; | ||
| 422 | |||
| 423 | host->datasize = 0; | ||
| 424 | |||
| 425 | host->data = data; | ||
| 426 | host->datasize = 0; | ||
| 427 | |||
| 428 | if (data->flags & MMC_DATA_READ) { | ||
| 429 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
| 430 | stat = mxcmci_pull(host, sg_virt(sg), sg->length); | ||
| 431 | if (stat) | ||
| 432 | return stat; | ||
| 433 | host->datasize += sg->length; | ||
| 434 | } | ||
| 435 | } else { | ||
| 436 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
| 437 | stat = mxcmci_push(host, sg_virt(sg), sg->length); | ||
| 438 | if (stat) | ||
| 439 | return stat; | ||
| 440 | host->datasize += sg->length; | ||
| 441 | } | ||
| 442 | stat = mxcmci_poll_status(host, STATUS_WRITE_OP_DONE); | ||
| 443 | if (stat) | ||
| 444 | return stat; | ||
| 445 | } | ||
| 446 | return 0; | ||
| 447 | } | ||
| 448 | |||
| 449 | static void mxcmci_datawork(struct work_struct *work) | ||
| 450 | { | ||
| 451 | struct mxcmci_host *host = container_of(work, struct mxcmci_host, | ||
| 452 | datawork); | ||
| 453 | int datastat = mxcmci_transfer_data(host); | ||
| 454 | mxcmci_finish_data(host, datastat); | ||
| 455 | |||
| 456 | if (host->req->stop) { | ||
| 457 | if (mxcmci_start_cmd(host, host->req->stop, 0)) { | ||
| 458 | mxcmci_finish_request(host, host->req); | ||
| 459 | return; | ||
| 460 | } | ||
| 461 | } else { | ||
| 462 | mxcmci_finish_request(host, host->req); | ||
| 463 | } | ||
| 464 | } | ||
| 465 | |||
| 466 | #ifdef HAS_DMA | ||
| 467 | static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat) | ||
| 468 | { | ||
| 469 | struct mmc_data *data = host->data; | ||
| 470 | int data_error; | ||
| 471 | |||
| 472 | if (!data) | ||
| 473 | return; | ||
| 474 | |||
| 475 | data_error = mxcmci_finish_data(host, stat); | ||
| 476 | |||
| 477 | mxcmci_read_response(host, stat); | ||
| 478 | host->cmd = NULL; | ||
| 479 | |||
| 480 | if (host->req->stop) { | ||
| 481 | if (mxcmci_start_cmd(host, host->req->stop, 0)) { | ||
| 482 | mxcmci_finish_request(host, host->req); | ||
| 483 | return; | ||
| 484 | } | ||
| 485 | } else { | ||
| 486 | mxcmci_finish_request(host, host->req); | ||
| 487 | } | ||
| 488 | } | ||
| 489 | #endif /* HAS_DMA */ | ||
| 490 | |||
| 491 | static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) | ||
| 492 | { | ||
| 493 | mxcmci_read_response(host, stat); | ||
| 494 | host->cmd = NULL; | ||
| 495 | |||
| 496 | if (!host->data && host->req) { | ||
| 497 | mxcmci_finish_request(host, host->req); | ||
| 498 | return; | ||
| 499 | } | ||
| 500 | |||
| 501 | /* For the DMA case the DMA engine handles the data transfer | ||
| 502 | * automatically. For non DMA we have to to it ourselves. | ||
| 503 | * Don't do it in interrupt context though. | ||
| 504 | */ | ||
| 505 | if (!mxcmci_use_dma(host) && host->data) | ||
| 506 | schedule_work(&host->datawork); | ||
| 507 | |||
| 508 | } | ||
| 509 | |||
| 510 | static irqreturn_t mxcmci_irq(int irq, void *devid) | ||
| 511 | { | ||
| 512 | struct mxcmci_host *host = devid; | ||
| 513 | u32 stat; | ||
| 514 | |||
| 515 | stat = readl(host->base + MMC_REG_STATUS); | ||
| 516 | writel(stat, host->base + MMC_REG_STATUS); | ||
| 517 | |||
| 518 | dev_dbg(mmc_dev(host->mmc), "%s: 0x%08x\n", __func__, stat); | ||
| 519 | |||
| 520 | if (stat & STATUS_END_CMD_RESP) | ||
| 521 | mxcmci_cmd_done(host, stat); | ||
| 522 | #ifdef HAS_DMA | ||
| 523 | if (mxcmci_use_dma(host) && | ||
| 524 | (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE))) | ||
| 525 | mxcmci_data_done(host, stat); | ||
| 526 | #endif | ||
| 527 | return IRQ_HANDLED; | ||
| 528 | } | ||
| 529 | |||
| 530 | static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req) | ||
| 531 | { | ||
| 532 | struct mxcmci_host *host = mmc_priv(mmc); | ||
| 533 | unsigned int cmdat = host->cmdat; | ||
| 534 | |||
| 535 | WARN_ON(host->req != NULL); | ||
| 536 | |||
| 537 | host->req = req; | ||
| 538 | host->cmdat &= ~CMD_DAT_CONT_INIT; | ||
| 539 | #ifdef HAS_DMA | ||
| 540 | host->do_dma = 1; | ||
| 541 | #endif | ||
| 542 | if (req->data) { | ||
| 543 | mxcmci_setup_data(host, req->data); | ||
| 544 | |||
| 545 | cmdat |= CMD_DAT_CONT_DATA_ENABLE; | ||
| 546 | |||
| 547 | if (req->data->flags & MMC_DATA_WRITE) | ||
| 548 | cmdat |= CMD_DAT_CONT_WRITE; | ||
| 549 | } | ||
| 550 | |||
| 551 | if (mxcmci_start_cmd(host, req->cmd, cmdat)) | ||
| 552 | mxcmci_finish_request(host, req); | ||
| 553 | } | ||
| 554 | |||
| 555 | static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios) | ||
| 556 | { | ||
| 557 | unsigned int divider; | ||
| 558 | int prescaler = 0; | ||
| 559 | unsigned int clk_in = clk_get_rate(host->clk); | ||
| 560 | |||
| 561 | while (prescaler <= 0x800) { | ||
| 562 | for (divider = 1; divider <= 0xF; divider++) { | ||
| 563 | int x; | ||
| 564 | |||
| 565 | x = (clk_in / (divider + 1)); | ||
| 566 | |||
| 567 | if (prescaler) | ||
| 568 | x /= (prescaler * 2); | ||
| 569 | |||
| 570 | if (x <= clk_ios) | ||
| 571 | break; | ||
| 572 | } | ||
| 573 | if (divider < 0x10) | ||
| 574 | break; | ||
| 575 | |||
| 576 | if (prescaler == 0) | ||
| 577 | prescaler = 1; | ||
| 578 | else | ||
| 579 | prescaler <<= 1; | ||
| 580 | } | ||
| 581 | |||
| 582 | writew((prescaler << 4) | divider, host->base + MMC_REG_CLK_RATE); | ||
| 583 | |||
| 584 | dev_dbg(mmc_dev(host->mmc), "scaler: %d divider: %d in: %d out: %d\n", | ||
| 585 | prescaler, divider, clk_in, clk_ios); | ||
| 586 | } | ||
| 587 | |||
| 588 | static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | ||
| 589 | { | ||
| 590 | struct mxcmci_host *host = mmc_priv(mmc); | ||
| 591 | #ifdef HAS_DMA | ||
| 592 | unsigned int blen; | ||
| 593 | /* | ||
| 594 | * use burstlen of 64 in 4 bit mode (--> reg value 0) | ||
| 595 | * use burstlen of 16 in 1 bit mode (--> reg value 16) | ||
| 596 | */ | ||
| 597 | if (ios->bus_width == MMC_BUS_WIDTH_4) | ||
| 598 | blen = 0; | ||
| 599 | else | ||
| 600 | blen = 16; | ||
| 601 | |||
| 602 | imx_dma_config_burstlen(host->dma, blen); | ||
| 603 | #endif | ||
| 604 | if (ios->bus_width == MMC_BUS_WIDTH_4) | ||
| 605 | host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4; | ||
| 606 | else | ||
| 607 | host->cmdat &= ~CMD_DAT_CONT_BUS_WIDTH_4; | ||
| 608 | |||
| 609 | if (host->power_mode != ios->power_mode) { | ||
| 610 | if (host->pdata && host->pdata->setpower) | ||
| 611 | host->pdata->setpower(mmc_dev(mmc), ios->vdd); | ||
| 612 | host->power_mode = ios->power_mode; | ||
| 613 | if (ios->power_mode == MMC_POWER_ON) | ||
| 614 | host->cmdat |= CMD_DAT_CONT_INIT; | ||
| 615 | } | ||
| 616 | |||
| 617 | if (ios->clock) { | ||
| 618 | mxcmci_set_clk_rate(host, ios->clock); | ||
| 619 | writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
| 620 | } else { | ||
| 621 | writew(STR_STP_CLK_STOP_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
| 622 | } | ||
| 623 | |||
| 624 | host->clock = ios->clock; | ||
| 625 | } | ||
| 626 | |||
| 627 | static irqreturn_t mxcmci_detect_irq(int irq, void *data) | ||
| 628 | { | ||
| 629 | struct mmc_host *mmc = data; | ||
| 630 | |||
| 631 | dev_dbg(mmc_dev(mmc), "%s\n", __func__); | ||
| 632 | |||
| 633 | mmc_detect_change(mmc, msecs_to_jiffies(250)); | ||
| 634 | return IRQ_HANDLED; | ||
| 635 | } | ||
| 636 | |||
| 637 | static int mxcmci_get_ro(struct mmc_host *mmc) | ||
| 638 | { | ||
| 639 | struct mxcmci_host *host = mmc_priv(mmc); | ||
| 640 | |||
| 641 | if (host->pdata && host->pdata->get_ro) | ||
| 642 | return !!host->pdata->get_ro(mmc_dev(mmc)); | ||
| 643 | /* | ||
| 644 | * Board doesn't support read only detection; let the mmc core | ||
| 645 | * decide what to do. | ||
| 646 | */ | ||
| 647 | return -ENOSYS; | ||
| 648 | } | ||
| 649 | |||
| 650 | |||
| 651 | static const struct mmc_host_ops mxcmci_ops = { | ||
| 652 | .request = mxcmci_request, | ||
| 653 | .set_ios = mxcmci_set_ios, | ||
| 654 | .get_ro = mxcmci_get_ro, | ||
| 655 | }; | ||
| 656 | |||
| 657 | static int mxcmci_probe(struct platform_device *pdev) | ||
| 658 | { | ||
| 659 | struct mmc_host *mmc; | ||
| 660 | struct mxcmci_host *host = NULL; | ||
| 661 | struct resource *r; | ||
| 662 | int ret = 0, irq; | ||
| 663 | |||
| 664 | printk(KERN_INFO "i.MX SDHC driver\n"); | ||
| 665 | |||
| 666 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 667 | irq = platform_get_irq(pdev, 0); | ||
| 668 | if (!r || irq < 0) | ||
| 669 | return -EINVAL; | ||
| 670 | |||
| 671 | r = request_mem_region(r->start, resource_size(r), pdev->name); | ||
| 672 | if (!r) | ||
| 673 | return -EBUSY; | ||
| 674 | |||
| 675 | mmc = mmc_alloc_host(sizeof(struct mxcmci_host), &pdev->dev); | ||
| 676 | if (!mmc) { | ||
| 677 | ret = -ENOMEM; | ||
| 678 | goto out_release_mem; | ||
| 679 | } | ||
| 680 | |||
| 681 | mmc->ops = &mxcmci_ops; | ||
| 682 | mmc->caps = MMC_CAP_4_BIT_DATA; | ||
| 683 | |||
| 684 | /* MMC core transfer sizes tunable parameters */ | ||
| 685 | mmc->max_hw_segs = 64; | ||
| 686 | mmc->max_phys_segs = 64; | ||
| 687 | mmc->max_blk_size = 2048; | ||
| 688 | mmc->max_blk_count = 65535; | ||
| 689 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | ||
| 690 | mmc->max_seg_size = mmc->max_seg_size; | ||
| 691 | |||
| 692 | host = mmc_priv(mmc); | ||
| 693 | host->base = ioremap(r->start, resource_size(r)); | ||
| 694 | if (!host->base) { | ||
| 695 | ret = -ENOMEM; | ||
| 696 | goto out_free; | ||
| 697 | } | ||
| 698 | |||
| 699 | host->mmc = mmc; | ||
| 700 | host->pdata = pdev->dev.platform_data; | ||
| 701 | |||
| 702 | if (host->pdata && host->pdata->ocr_avail) | ||
| 703 | mmc->ocr_avail = host->pdata->ocr_avail; | ||
| 704 | else | ||
| 705 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; | ||
| 706 | |||
| 707 | host->res = r; | ||
| 708 | host->irq = irq; | ||
| 709 | |||
| 710 | host->clk = clk_get(&pdev->dev, "sdhc_clk"); | ||
| 711 | if (IS_ERR(host->clk)) { | ||
| 712 | ret = PTR_ERR(host->clk); | ||
| 713 | goto out_iounmap; | ||
| 714 | } | ||
| 715 | clk_enable(host->clk); | ||
| 716 | |||
| 717 | mxcmci_softreset(host); | ||
| 718 | |||
| 719 | host->rev_no = readw(host->base + MMC_REG_REV_NO); | ||
| 720 | if (host->rev_no != 0x400) { | ||
| 721 | ret = -ENODEV; | ||
| 722 | dev_err(mmc_dev(host->mmc), "wrong rev.no. 0x%08x. aborting.\n", | ||
| 723 | host->rev_no); | ||
| 724 | goto out_clk_put; | ||
| 725 | } | ||
| 726 | |||
| 727 | mmc->f_min = clk_get_rate(host->clk) >> 7; | ||
| 728 | mmc->f_max = clk_get_rate(host->clk) >> 1; | ||
| 729 | |||
| 730 | /* recommended in data sheet */ | ||
| 731 | writew(0x2db4, host->base + MMC_REG_READ_TO); | ||
| 732 | |||
| 733 | writel(0, host->base + MMC_REG_INT_CNTR); | ||
| 734 | |||
| 735 | #ifdef HAS_DMA | ||
| 736 | host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW); | ||
| 737 | if (host->dma < 0) { | ||
| 738 | dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n"); | ||
| 739 | ret = -EBUSY; | ||
| 740 | goto out_clk_put; | ||
| 741 | } | ||
| 742 | |||
| 743 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
| 744 | if (!r) { | ||
| 745 | ret = -EINVAL; | ||
| 746 | goto out_free_dma; | ||
| 747 | } | ||
| 748 | |||
| 749 | ret = imx_dma_config_channel(host->dma, | ||
| 750 | IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_FIFO, | ||
| 751 | IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR, | ||
| 752 | r->start, 0); | ||
| 753 | if (ret) { | ||
| 754 | dev_err(mmc_dev(host->mmc), "failed to config DMA channel\n"); | ||
| 755 | goto out_free_dma; | ||
| 756 | } | ||
| 757 | #endif | ||
| 758 | INIT_WORK(&host->datawork, mxcmci_datawork); | ||
| 759 | |||
| 760 | ret = request_irq(host->irq, mxcmci_irq, 0, DRIVER_NAME, host); | ||
| 761 | if (ret) | ||
| 762 | goto out_free_dma; | ||
| 763 | |||
| 764 | platform_set_drvdata(pdev, mmc); | ||
| 765 | |||
| 766 | if (host->pdata && host->pdata->init) { | ||
| 767 | ret = host->pdata->init(&pdev->dev, mxcmci_detect_irq, | ||
| 768 | host->mmc); | ||
| 769 | if (ret) | ||
| 770 | goto out_free_irq; | ||
| 771 | } | ||
| 772 | |||
| 773 | mmc_add_host(mmc); | ||
| 774 | |||
| 775 | return 0; | ||
| 776 | |||
| 777 | out_free_irq: | ||
| 778 | free_irq(host->irq, host); | ||
| 779 | out_free_dma: | ||
| 780 | #ifdef HAS_DMA | ||
| 781 | imx_dma_free(host->dma); | ||
| 782 | #endif | ||
| 783 | out_clk_put: | ||
| 784 | clk_disable(host->clk); | ||
| 785 | clk_put(host->clk); | ||
| 786 | out_iounmap: | ||
| 787 | iounmap(host->base); | ||
| 788 | out_free: | ||
| 789 | mmc_free_host(mmc); | ||
| 790 | out_release_mem: | ||
| 791 | release_mem_region(host->res->start, resource_size(host->res)); | ||
| 792 | return ret; | ||
| 793 | } | ||
| 794 | |||
| 795 | static int mxcmci_remove(struct platform_device *pdev) | ||
| 796 | { | ||
| 797 | struct mmc_host *mmc = platform_get_drvdata(pdev); | ||
| 798 | struct mxcmci_host *host = mmc_priv(mmc); | ||
| 799 | |||
| 800 | platform_set_drvdata(pdev, NULL); | ||
| 801 | |||
| 802 | mmc_remove_host(mmc); | ||
| 803 | |||
| 804 | if (host->pdata && host->pdata->exit) | ||
| 805 | host->pdata->exit(&pdev->dev, mmc); | ||
| 806 | |||
| 807 | free_irq(host->irq, host); | ||
| 808 | iounmap(host->base); | ||
| 809 | #ifdef HAS_DMA | ||
| 810 | imx_dma_free(host->dma); | ||
| 811 | #endif | ||
| 812 | clk_disable(host->clk); | ||
| 813 | clk_put(host->clk); | ||
| 814 | |||
| 815 | release_mem_region(host->res->start, resource_size(host->res)); | ||
| 816 | release_resource(host->res); | ||
| 817 | |||
| 818 | mmc_free_host(mmc); | ||
| 819 | |||
| 820 | return 0; | ||
| 821 | } | ||
| 822 | |||
| 823 | #ifdef CONFIG_PM | ||
| 824 | static int mxcmci_suspend(struct platform_device *dev, pm_message_t state) | ||
| 825 | { | ||
| 826 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
| 827 | int ret = 0; | ||
| 828 | |||
| 829 | if (mmc) | ||
| 830 | ret = mmc_suspend_host(mmc, state); | ||
| 831 | |||
| 832 | return ret; | ||
| 833 | } | ||
| 834 | |||
| 835 | static int mxcmci_resume(struct platform_device *dev) | ||
| 836 | { | ||
| 837 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
| 838 | struct mxcmci_host *host; | ||
| 839 | int ret = 0; | ||
| 840 | |||
| 841 | if (mmc) { | ||
| 842 | host = mmc_priv(mmc); | ||
| 843 | ret = mmc_resume_host(mmc); | ||
| 844 | } | ||
| 845 | |||
| 846 | return ret; | ||
| 847 | } | ||
| 848 | #else | ||
| 849 | #define mxcmci_suspend NULL | ||
| 850 | #define mxcmci_resume NULL | ||
| 851 | #endif /* CONFIG_PM */ | ||
| 852 | |||
| 853 | static struct platform_driver mxcmci_driver = { | ||
| 854 | .probe = mxcmci_probe, | ||
| 855 | .remove = mxcmci_remove, | ||
| 856 | .suspend = mxcmci_suspend, | ||
| 857 | .resume = mxcmci_resume, | ||
| 858 | .driver = { | ||
| 859 | .name = DRIVER_NAME, | ||
| 860 | .owner = THIS_MODULE, | ||
| 861 | } | ||
| 862 | }; | ||
| 863 | |||
| 864 | static int __init mxcmci_init(void) | ||
| 865 | { | ||
| 866 | return platform_driver_register(&mxcmci_driver); | ||
| 867 | } | ||
| 868 | |||
| 869 | static void __exit mxcmci_exit(void) | ||
| 870 | { | ||
| 871 | platform_driver_unregister(&mxcmci_driver); | ||
| 872 | } | ||
| 873 | |||
| 874 | module_init(mxcmci_init); | ||
| 875 | module_exit(mxcmci_exit); | ||
| 876 | |||
| 877 | MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver"); | ||
| 878 | MODULE_AUTHOR("Sascha Hauer, Pengutronix"); | ||
| 879 | MODULE_LICENSE("GPL"); | ||
| 880 | MODULE_ALIAS("platform:imx-mmc"); | ||
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 3c5483b75da4..9702ad3774cf 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -180,7 +180,15 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 180 | else | 180 | else |
| 181 | DALGN &= ~(1 << host->dma); | 181 | DALGN &= ~(1 << host->dma); |
| 182 | DDADR(host->dma) = host->sg_dma; | 182 | DDADR(host->dma) = host->sg_dma; |
| 183 | DCSR(host->dma) = DCSR_RUN; | 183 | |
| 184 | /* | ||
| 185 | * workaround for erratum #91: | ||
| 186 | * only start DMA now if we are doing a read, | ||
| 187 | * otherwise we wait until CMD/RESP has finished | ||
| 188 | * before starting DMA. | ||
| 189 | */ | ||
| 190 | if (!cpu_is_pxa27x() || data->flags & MMC_DATA_READ) | ||
| 191 | DCSR(host->dma) = DCSR_RUN; | ||
| 184 | } | 192 | } |
| 185 | 193 | ||
| 186 | static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, unsigned int cmdat) | 194 | static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, unsigned int cmdat) |
| @@ -251,23 +259,28 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat) | |||
| 251 | if (stat & STAT_TIME_OUT_RESPONSE) { | 259 | if (stat & STAT_TIME_OUT_RESPONSE) { |
| 252 | cmd->error = -ETIMEDOUT; | 260 | cmd->error = -ETIMEDOUT; |
| 253 | } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) { | 261 | } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) { |
| 254 | #ifdef CONFIG_PXA27x | ||
| 255 | /* | 262 | /* |
| 256 | * workaround for erratum #42: | 263 | * workaround for erratum #42: |
| 257 | * Intel PXA27x Family Processor Specification Update Rev 001 | 264 | * Intel PXA27x Family Processor Specification Update Rev 001 |
| 258 | * A bogus CRC error can appear if the msb of a 136 bit | 265 | * A bogus CRC error can appear if the msb of a 136 bit |
| 259 | * response is a one. | 266 | * response is a one. |
| 260 | */ | 267 | */ |
| 261 | if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) { | 268 | if (cpu_is_pxa27x() && |
| 269 | (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000)) | ||
| 262 | pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode); | 270 | pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode); |
| 263 | } else | 271 | else |
| 264 | #endif | 272 | cmd->error = -EILSEQ; |
| 265 | cmd->error = -EILSEQ; | ||
| 266 | } | 273 | } |
| 267 | 274 | ||
| 268 | pxamci_disable_irq(host, END_CMD_RES); | 275 | pxamci_disable_irq(host, END_CMD_RES); |
| 269 | if (host->data && !cmd->error) { | 276 | if (host->data && !cmd->error) { |
| 270 | pxamci_enable_irq(host, DATA_TRAN_DONE); | 277 | pxamci_enable_irq(host, DATA_TRAN_DONE); |
| 278 | /* | ||
| 279 | * workaround for erratum #91, if doing write | ||
| 280 | * enable DMA late | ||
| 281 | */ | ||
| 282 | if (cpu_is_pxa27x() && host->data->flags & MMC_DATA_WRITE) | ||
| 283 | DCSR(host->dma) = DCSR_RUN; | ||
| 271 | } else { | 284 | } else { |
| 272 | pxamci_finish_request(host, host->mrq); | 285 | pxamci_finish_request(host, host->mrq); |
| 273 | } | 286 | } |
diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c index be9e7b32b34e..f62790513322 100644 --- a/drivers/mmc/host/ricoh_mmc.c +++ b/drivers/mmc/host/ricoh_mmc.c | |||
| @@ -196,7 +196,7 @@ static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) | |||
| 196 | pci_set_drvdata(pdev, NULL); | 196 | pci_set_drvdata(pdev, NULL); |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) | 199 | static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) |
| 200 | { | 200 | { |
| 201 | struct pci_dev *fw_dev = NULL; | 201 | struct pci_dev *fw_dev = NULL; |
| 202 | 202 | ||
| @@ -210,7 +210,7 @@ static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 210 | return 0; | 210 | return 0; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | static int ricoh_mmc_resume(struct pci_dev *pdev) | 213 | static int ricoh_mmc_resume_early(struct pci_dev *pdev) |
| 214 | { | 214 | { |
| 215 | struct pci_dev *fw_dev = NULL; | 215 | struct pci_dev *fw_dev = NULL; |
| 216 | 216 | ||
| @@ -229,8 +229,8 @@ static struct pci_driver ricoh_mmc_driver = { | |||
| 229 | .id_table = pci_ids, | 229 | .id_table = pci_ids, |
| 230 | .probe = ricoh_mmc_probe, | 230 | .probe = ricoh_mmc_probe, |
| 231 | .remove = __devexit_p(ricoh_mmc_remove), | 231 | .remove = __devexit_p(ricoh_mmc_remove), |
| 232 | .suspend = ricoh_mmc_suspend, | 232 | .suspend_late = ricoh_mmc_suspend_late, |
| 233 | .resume = ricoh_mmc_resume, | 233 | .resume_early = ricoh_mmc_resume_early, |
| 234 | }; | 234 | }; |
| 235 | 235 | ||
| 236 | /*****************************************************************************\ | 236 | /*****************************************************************************\ |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index ec2314246682..335da4831ab3 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
| @@ -2168,7 +2168,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl, | |||
| 2168 | complete(&wl->assoc_done); | 2168 | complete(&wl->assoc_done); |
| 2169 | netif_carrier_on(port_to_netdev(wl_port(wl))); | 2169 | netif_carrier_on(port_to_netdev(wl_port(wl))); |
| 2170 | } else | 2170 | } else |
| 2171 | pr_debug("%s: event %#lx under wpa\n", | 2171 | pr_debug("%s: event %#llx under wpa\n", |
| 2172 | __func__, event); | 2172 | __func__, event); |
| 2173 | } | 2173 | } |
| 2174 | 2174 | ||
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index e31fb91652ce..2aa117c8cd87 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile | |||
| @@ -5,11 +5,15 @@ | |||
| 5 | obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o | 5 | obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o |
| 6 | obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o | 6 | obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o |
| 7 | obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o | 7 | obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o |
| 8 | |||
| 9 | # pciehp should be linked before acpiphp in order to allow the native driver | ||
| 10 | # to attempt to bind first. We can then fall back to generic support. | ||
| 11 | |||
| 12 | obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o | ||
| 8 | obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o | 13 | obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o |
| 9 | obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o | 14 | obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o |
| 10 | obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o | 15 | obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o |
| 11 | obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o | 16 | obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o |
| 12 | obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o | ||
| 13 | obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o | 17 | obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o |
| 14 | obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o | 18 | obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o |
| 15 | obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o | 19 | obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o |
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index b0e7de9e536d..d8649e127298 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -195,13 +195,13 @@ static void remove_slot_worker(struct work_struct *work) | |||
| 195 | * Tries hard not to re-enable already existing devices; | 195 | * Tries hard not to re-enable already existing devices; |
| 196 | * also handles scanning of subfunctions. | 196 | * also handles scanning of subfunctions. |
| 197 | */ | 197 | */ |
| 198 | static void pci_rescan_slot(struct pci_dev *temp) | 198 | static int pci_rescan_slot(struct pci_dev *temp) |
| 199 | { | 199 | { |
| 200 | struct pci_bus *bus = temp->bus; | 200 | struct pci_bus *bus = temp->bus; |
| 201 | struct pci_dev *dev; | 201 | struct pci_dev *dev; |
| 202 | int func; | 202 | int func; |
| 203 | int retval; | ||
| 204 | u8 hdr_type; | 203 | u8 hdr_type; |
| 204 | int count = 0; | ||
| 205 | 205 | ||
| 206 | if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) { | 206 | if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) { |
| 207 | temp->hdr_type = hdr_type & 0x7f; | 207 | temp->hdr_type = hdr_type & 0x7f; |
| @@ -213,17 +213,12 @@ static void pci_rescan_slot(struct pci_dev *temp) | |||
| 213 | dbg("New device on %s function %x:%x\n", | 213 | dbg("New device on %s function %x:%x\n", |
| 214 | bus->name, temp->devfn >> 3, | 214 | bus->name, temp->devfn >> 3, |
| 215 | temp->devfn & 7); | 215 | temp->devfn & 7); |
| 216 | retval = pci_bus_add_device(dev); | 216 | count++; |
| 217 | if (retval) | ||
| 218 | dev_err(&dev->dev, "error adding " | ||
| 219 | "device, continuing.\n"); | ||
| 220 | else | ||
| 221 | add_slot(dev); | ||
| 222 | } | 217 | } |
| 223 | } | 218 | } |
| 224 | /* multifunction device? */ | 219 | /* multifunction device? */ |
| 225 | if (!(hdr_type & 0x80)) | 220 | if (!(hdr_type & 0x80)) |
| 226 | return; | 221 | return count; |
| 227 | 222 | ||
| 228 | /* continue scanning for other functions */ | 223 | /* continue scanning for other functions */ |
| 229 | for (func = 1, temp->devfn++; func < 8; func++, temp->devfn++) { | 224 | for (func = 1, temp->devfn++; func < 8; func++, temp->devfn++) { |
| @@ -239,16 +234,13 @@ static void pci_rescan_slot(struct pci_dev *temp) | |||
| 239 | dbg("New device on %s function %x:%x\n", | 234 | dbg("New device on %s function %x:%x\n", |
| 240 | bus->name, temp->devfn >> 3, | 235 | bus->name, temp->devfn >> 3, |
| 241 | temp->devfn & 7); | 236 | temp->devfn & 7); |
| 242 | retval = pci_bus_add_device(dev); | 237 | count++; |
| 243 | if (retval) | ||
| 244 | dev_err(&dev->dev, "error adding " | ||
| 245 | "device, continuing.\n"); | ||
| 246 | else | ||
| 247 | add_slot(dev); | ||
| 248 | } | 238 | } |
| 249 | } | 239 | } |
| 250 | } | 240 | } |
| 251 | } | 241 | } |
| 242 | |||
| 243 | return count; | ||
| 252 | } | 244 | } |
| 253 | 245 | ||
| 254 | 246 | ||
| @@ -262,6 +254,8 @@ static void pci_rescan_bus(const struct pci_bus *bus) | |||
| 262 | { | 254 | { |
| 263 | unsigned int devfn; | 255 | unsigned int devfn; |
| 264 | struct pci_dev *dev; | 256 | struct pci_dev *dev; |
| 257 | int retval; | ||
| 258 | int found = 0; | ||
| 265 | dev = alloc_pci_dev(); | 259 | dev = alloc_pci_dev(); |
| 266 | if (!dev) | 260 | if (!dev) |
| 267 | return; | 261 | return; |
| @@ -270,7 +264,23 @@ static void pci_rescan_bus(const struct pci_bus *bus) | |||
| 270 | dev->sysdata = bus->sysdata; | 264 | dev->sysdata = bus->sysdata; |
| 271 | for (devfn = 0; devfn < 0x100; devfn += 8) { | 265 | for (devfn = 0; devfn < 0x100; devfn += 8) { |
| 272 | dev->devfn = devfn; | 266 | dev->devfn = devfn; |
| 273 | pci_rescan_slot(dev); | 267 | found += pci_rescan_slot(dev); |
| 268 | } | ||
| 269 | |||
| 270 | if (found) { | ||
| 271 | pci_bus_assign_resources(bus); | ||
| 272 | list_for_each_entry(dev, &bus->devices, bus_list) { | ||
| 273 | /* Skip already-added devices */ | ||
| 274 | if (dev->is_added) | ||
| 275 | continue; | ||
| 276 | retval = pci_bus_add_device(dev); | ||
| 277 | if (retval) | ||
| 278 | dev_err(&dev->dev, | ||
| 279 | "Error adding device, continuing\n"); | ||
| 280 | else | ||
| 281 | add_slot(dev); | ||
| 282 | } | ||
| 283 | pci_bus_add_devices(bus); | ||
| 274 | } | 284 | } |
| 275 | kfree(dev); | 285 | kfree(dev); |
| 276 | } | 286 | } |
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 896a15d70f5b..44f15ff70c1d 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -103,6 +103,16 @@ static void msix_set_enable(struct pci_dev *dev, int enable) | |||
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | /* | ||
| 107 | * Essentially, this is ((1 << (1 << x)) - 1), but without the | ||
| 108 | * undefinedness of a << 32. | ||
| 109 | */ | ||
| 110 | static inline __attribute_const__ u32 msi_mask(unsigned x) | ||
| 111 | { | ||
| 112 | static const u32 mask[] = { 1, 2, 4, 0xf, 0xff, 0xffff, 0xffffffff }; | ||
| 113 | return mask[x]; | ||
| 114 | } | ||
| 115 | |||
| 106 | static void msix_flush_writes(struct irq_desc *desc) | 116 | static void msix_flush_writes(struct irq_desc *desc) |
| 107 | { | 117 | { |
| 108 | struct msi_desc *entry; | 118 | struct msi_desc *entry; |
| @@ -407,8 +417,7 @@ static int msi_capability_init(struct pci_dev *dev) | |||
| 407 | 417 | ||
| 408 | /* All MSIs are unmasked by default, Mask them all */ | 418 | /* All MSIs are unmasked by default, Mask them all */ |
| 409 | pci_read_config_dword(dev, base, &maskbits); | 419 | pci_read_config_dword(dev, base, &maskbits); |
| 410 | temp = (1 << multi_msi_capable(control)); | 420 | temp = msi_mask((control & PCI_MSI_FLAGS_QMASK) >> 1); |
| 411 | temp = ((temp - 1) & ~temp); | ||
| 412 | maskbits |= temp; | 421 | maskbits |= temp; |
| 413 | pci_write_config_dword(dev, base, maskbits); | 422 | pci_write_config_dword(dev, base, maskbits); |
| 414 | entry->msi_attrib.maskbits_mask = temp; | 423 | entry->msi_attrib.maskbits_mask = temp; |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 9de07b75b993..ab1d615425a8 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
| @@ -370,6 +370,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) | |||
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | pci_save_state(pci_dev); | 372 | pci_save_state(pci_dev); |
| 373 | pci_dev->state_saved = true; | ||
| 373 | /* | 374 | /* |
| 374 | * This is for compatibility with existing code with legacy PM support. | 375 | * This is for compatibility with existing code with legacy PM support. |
| 375 | */ | 376 | */ |
| @@ -419,6 +420,7 @@ static int pci_legacy_resume(struct device *dev) | |||
| 419 | static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev) | 420 | static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev) |
| 420 | { | 421 | { |
| 421 | pci_restore_standard_config(pci_dev); | 422 | pci_restore_standard_config(pci_dev); |
| 423 | pci_dev->state_saved = false; | ||
| 422 | pci_fixup_device(pci_fixup_resume_early, pci_dev); | 424 | pci_fixup_device(pci_fixup_resume_early, pci_dev); |
| 423 | } | 425 | } |
| 424 | 426 | ||
| @@ -555,6 +557,13 @@ static int pci_pm_resume(struct device *dev) | |||
| 555 | struct device_driver *drv = dev->driver; | 557 | struct device_driver *drv = dev->driver; |
| 556 | int error = 0; | 558 | int error = 0; |
| 557 | 559 | ||
| 560 | /* | ||
| 561 | * This is necessary for the suspend error path in which resume is | ||
| 562 | * called without restoring the standard config registers of the device. | ||
| 563 | */ | ||
| 564 | if (pci_dev->state_saved) | ||
| 565 | pci_restore_standard_config(pci_dev); | ||
| 566 | |||
| 558 | if (pci_has_legacy_pm_support(pci_dev)) | 567 | if (pci_has_legacy_pm_support(pci_dev)) |
| 559 | return pci_legacy_resume(dev); | 568 | return pci_legacy_resume(dev); |
| 560 | 569 | ||
| @@ -660,7 +669,10 @@ static int pci_pm_poweroff(struct device *dev) | |||
| 660 | if (pci_has_legacy_pm_support(pci_dev)) | 669 | if (pci_has_legacy_pm_support(pci_dev)) |
| 661 | return pci_legacy_suspend(dev, PMSG_HIBERNATE); | 670 | return pci_legacy_suspend(dev, PMSG_HIBERNATE); |
| 662 | 671 | ||
| 663 | if (drv && drv->pm && drv->pm->poweroff) { | 672 | if (!drv || !drv->pm) |
| 673 | return 0; | ||
| 674 | |||
| 675 | if (drv->pm->poweroff) { | ||
| 664 | error = drv->pm->poweroff(dev); | 676 | error = drv->pm->poweroff(dev); |
| 665 | suspend_report_result(drv->pm->poweroff, error); | 677 | suspend_report_result(drv->pm->poweroff, error); |
| 666 | } | 678 | } |
| @@ -710,6 +722,13 @@ static int pci_pm_restore(struct device *dev) | |||
| 710 | struct device_driver *drv = dev->driver; | 722 | struct device_driver *drv = dev->driver; |
| 711 | int error = 0; | 723 | int error = 0; |
| 712 | 724 | ||
| 725 | /* | ||
| 726 | * This is necessary for the hibernation error path in which restore is | ||
| 727 | * called without restoring the standard config registers of the device. | ||
| 728 | */ | ||
| 729 | if (pci_dev->state_saved) | ||
| 730 | pci_restore_standard_config(pci_dev); | ||
| 731 | |||
| 713 | if (pci_has_legacy_pm_support(pci_dev)) | 732 | if (pci_has_legacy_pm_support(pci_dev)) |
| 714 | return pci_legacy_resume(dev); | 733 | return pci_legacy_resume(dev); |
| 715 | 734 | ||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 17bd9325a245..48807556b47a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1393,35 +1393,35 @@ int pci_restore_standard_config(struct pci_dev *dev) | |||
| 1393 | pci_power_t prev_state; | 1393 | pci_power_t prev_state; |
| 1394 | int error; | 1394 | int error; |
| 1395 | 1395 | ||
| 1396 | pci_restore_state(dev); | ||
| 1397 | pci_update_current_state(dev, PCI_D0); | 1396 | pci_update_current_state(dev, PCI_D0); |
| 1398 | 1397 | ||
| 1399 | prev_state = dev->current_state; | 1398 | prev_state = dev->current_state; |
| 1400 | if (prev_state == PCI_D0) | 1399 | if (prev_state == PCI_D0) |
| 1401 | return 0; | 1400 | goto Restore; |
| 1402 | 1401 | ||
| 1403 | error = pci_raw_set_power_state(dev, PCI_D0, false); | 1402 | error = pci_raw_set_power_state(dev, PCI_D0, false); |
| 1404 | if (error) | 1403 | if (error) |
| 1405 | return error; | 1404 | return error; |
| 1406 | 1405 | ||
| 1407 | if (pci_is_bridge(dev)) { | 1406 | /* |
| 1408 | if (prev_state > PCI_D1) | 1407 | * This assumes that we won't get a bus in B2 or B3 from the BIOS, but |
| 1409 | mdelay(PCI_PM_BUS_WAIT); | 1408 | * we've made this assumption forever and it appears to be universally |
| 1410 | } else { | 1409 | * satisfied. |
| 1411 | switch(prev_state) { | 1410 | */ |
| 1412 | case PCI_D3cold: | 1411 | switch(prev_state) { |
| 1413 | case PCI_D3hot: | 1412 | case PCI_D3cold: |
| 1414 | mdelay(pci_pm_d3_delay); | 1413 | case PCI_D3hot: |
| 1415 | break; | 1414 | mdelay(pci_pm_d3_delay); |
| 1416 | case PCI_D2: | 1415 | break; |
| 1417 | udelay(PCI_PM_D2_DELAY); | 1416 | case PCI_D2: |
| 1418 | break; | 1417 | udelay(PCI_PM_D2_DELAY); |
| 1419 | } | 1418 | break; |
| 1420 | } | 1419 | } |
| 1421 | 1420 | ||
| 1422 | dev->current_state = PCI_D0; | 1421 | dev->current_state = PCI_D0; |
| 1423 | 1422 | ||
| 1424 | return 0; | 1423 | Restore: |
| 1424 | return pci_restore_state(dev); | ||
| 1425 | } | 1425 | } |
| 1426 | 1426 | ||
| 1427 | /** | 1427 | /** |
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c index 577c0d29849d..2291c5f5af51 100644 --- a/drivers/usb/host/whci/asl.c +++ b/drivers/usb/host/whci/asl.c | |||
| @@ -170,12 +170,17 @@ void asl_stop(struct whc *whc) | |||
| 170 | void asl_update(struct whc *whc, uint32_t wusbcmd) | 170 | void asl_update(struct whc *whc, uint32_t wusbcmd) |
| 171 | { | 171 | { |
| 172 | struct wusbhc *wusbhc = &whc->wusbhc; | 172 | struct wusbhc *wusbhc = &whc->wusbhc; |
| 173 | long t; | ||
| 173 | 174 | ||
| 174 | mutex_lock(&wusbhc->mutex); | 175 | mutex_lock(&wusbhc->mutex); |
| 175 | if (wusbhc->active) { | 176 | if (wusbhc->active) { |
| 176 | whc_write_wusbcmd(whc, wusbcmd, wusbcmd); | 177 | whc_write_wusbcmd(whc, wusbcmd, wusbcmd); |
| 177 | wait_event(whc->async_list_wq, | 178 | t = wait_event_timeout( |
| 178 | (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0); | 179 | whc->async_list_wq, |
| 180 | (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0, | ||
| 181 | msecs_to_jiffies(1000)); | ||
| 182 | if (t == 0) | ||
| 183 | whc_hw_error(whc, "ASL update timeout"); | ||
| 179 | } | 184 | } |
| 180 | mutex_unlock(&wusbhc->mutex); | 185 | mutex_unlock(&wusbhc->mutex); |
| 181 | } | 186 | } |
diff --git a/drivers/usb/host/whci/hw.c b/drivers/usb/host/whci/hw.c index d498e7203217..6afa2e379160 100644 --- a/drivers/usb/host/whci/hw.c +++ b/drivers/usb/host/whci/hw.c | |||
| @@ -87,3 +87,18 @@ out: | |||
| 87 | 87 | ||
| 88 | return ret; | 88 | return ret; |
| 89 | } | 89 | } |
| 90 | |||
| 91 | /** | ||
| 92 | * whc_hw_error - recover from a hardware error | ||
| 93 | * @whc: the WHCI HC that broke. | ||
| 94 | * @reason: a description of the failure. | ||
| 95 | * | ||
| 96 | * Recover from broken hardware with a full reset. | ||
| 97 | */ | ||
| 98 | void whc_hw_error(struct whc *whc, const char *reason) | ||
| 99 | { | ||
| 100 | struct wusbhc *wusbhc = &whc->wusbhc; | ||
| 101 | |||
| 102 | dev_err(&whc->umc->dev, "hardware error: %s\n", reason); | ||
| 103 | wusbhc_reset_all(wusbhc); | ||
| 104 | } | ||
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c index 2ae5abf69a6a..7dc85a0bee7c 100644 --- a/drivers/usb/host/whci/pzl.c +++ b/drivers/usb/host/whci/pzl.c | |||
| @@ -183,12 +183,17 @@ void pzl_stop(struct whc *whc) | |||
| 183 | void pzl_update(struct whc *whc, uint32_t wusbcmd) | 183 | void pzl_update(struct whc *whc, uint32_t wusbcmd) |
| 184 | { | 184 | { |
| 185 | struct wusbhc *wusbhc = &whc->wusbhc; | 185 | struct wusbhc *wusbhc = &whc->wusbhc; |
| 186 | long t; | ||
| 186 | 187 | ||
| 187 | mutex_lock(&wusbhc->mutex); | 188 | mutex_lock(&wusbhc->mutex); |
| 188 | if (wusbhc->active) { | 189 | if (wusbhc->active) { |
| 189 | whc_write_wusbcmd(whc, wusbcmd, wusbcmd); | 190 | whc_write_wusbcmd(whc, wusbcmd, wusbcmd); |
| 190 | wait_event(whc->periodic_list_wq, | 191 | t = wait_event_timeout( |
| 191 | (le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0); | 192 | whc->periodic_list_wq, |
| 193 | (le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0, | ||
| 194 | msecs_to_jiffies(1000)); | ||
| 195 | if (t == 0) | ||
| 196 | whc_hw_error(whc, "PZL update timeout"); | ||
| 192 | } | 197 | } |
| 193 | mutex_unlock(&wusbhc->mutex); | 198 | mutex_unlock(&wusbhc->mutex); |
| 194 | } | 199 | } |
diff --git a/drivers/usb/host/whci/whcd.h b/drivers/usb/host/whci/whcd.h index 0f3540f04f53..d3543a181dc9 100644 --- a/drivers/usb/host/whci/whcd.h +++ b/drivers/usb/host/whci/whcd.h | |||
| @@ -137,6 +137,7 @@ void whc_clean_up(struct whc *whc); | |||
| 137 | /* hw.c */ | 137 | /* hw.c */ |
| 138 | void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val); | 138 | void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val); |
| 139 | int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len); | 139 | int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len); |
| 140 | void whc_hw_error(struct whc *whc, const char *reason); | ||
| 140 | 141 | ||
| 141 | /* wusb.c */ | 142 | /* wusb.c */ |
| 142 | int whc_wusbhc_start(struct wusbhc *wusbhc); | 143 | int whc_wusbhc_start(struct wusbhc *wusbhc); |
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c index e2e7e4bc8463..8e18141bb2e0 100644 --- a/drivers/usb/wusbcore/devconnect.c +++ b/drivers/usb/wusbcore/devconnect.c | |||
| @@ -386,6 +386,7 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, | |||
| 386 | | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED); | 386 | | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED); |
| 387 | port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE; | 387 | port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE; |
| 388 | if (wusb_dev) { | 388 | if (wusb_dev) { |
| 389 | dev_dbg(wusbhc->dev, "disconnecting device from port %d\n", wusb_dev->port_idx); | ||
| 389 | if (!list_empty(&wusb_dev->cack_node)) | 390 | if (!list_empty(&wusb_dev->cack_node)) |
| 390 | list_del_init(&wusb_dev->cack_node); | 391 | list_del_init(&wusb_dev->cack_node); |
| 391 | /* For the one in cack_add() */ | 392 | /* For the one in cack_add() */ |
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c index 3937bf6f8cef..9fe4246cecb9 100644 --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c | |||
| @@ -100,6 +100,9 @@ static int wusbhc_rh_port_reset(struct wusbhc *wusbhc, u8 port_idx) | |||
| 100 | struct wusb_port *port = wusb_port_by_idx(wusbhc, port_idx); | 100 | struct wusb_port *port = wusb_port_by_idx(wusbhc, port_idx); |
| 101 | struct wusb_dev *wusb_dev = port->wusb_dev; | 101 | struct wusb_dev *wusb_dev = port->wusb_dev; |
| 102 | 102 | ||
| 103 | if (wusb_dev == NULL) | ||
| 104 | return -ENOTCONN; | ||
| 105 | |||
| 103 | port->status |= USB_PORT_STAT_RESET; | 106 | port->status |= USB_PORT_STAT_RESET; |
| 104 | port->change |= USB_PORT_STAT_C_RESET; | 107 | port->change |= USB_PORT_STAT_C_RESET; |
| 105 | 108 | ||
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c index c8185e6b0cd5..c13cec7dcbc5 100644 --- a/drivers/uwb/allocator.c +++ b/drivers/uwb/allocator.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/version.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/uwb.h> | 19 | #include <linux/uwb.h> |
| 21 | 20 | ||
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c index 2b4f9406789d..4f5ca99a04b9 100644 --- a/drivers/uwb/drp.c +++ b/drivers/uwb/drp.c | |||
| @@ -66,14 +66,14 @@ static void uwb_rc_set_drp_cmd_done(struct uwb_rc *rc, void *arg, | |||
| 66 | } else | 66 | } else |
| 67 | dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n"); | 67 | dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n"); |
| 68 | 68 | ||
| 69 | spin_lock(&rc->rsvs_lock); | 69 | spin_lock_bh(&rc->rsvs_lock); |
| 70 | if (rc->set_drp_ie_pending > 1) { | 70 | if (rc->set_drp_ie_pending > 1) { |
| 71 | rc->set_drp_ie_pending = 0; | 71 | rc->set_drp_ie_pending = 0; |
| 72 | uwb_rsv_queue_update(rc); | 72 | uwb_rsv_queue_update(rc); |
| 73 | } else { | 73 | } else { |
| 74 | rc->set_drp_ie_pending = 0; | 74 | rc->set_drp_ie_pending = 0; |
| 75 | } | 75 | } |
| 76 | spin_unlock(&rc->rsvs_lock); | 76 | spin_unlock_bh(&rc->rsvs_lock); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | /** | 79 | /** |
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index ec6eecb32f30..6b76f4bb4cc7 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c | |||
| @@ -114,7 +114,8 @@ void uwb_rsv_dump(char *text, struct uwb_rsv *rsv) | |||
| 114 | devaddr = rsv->target.devaddr; | 114 | devaddr = rsv->target.devaddr; |
| 115 | uwb_dev_addr_print(target, sizeof(target), &devaddr); | 115 | uwb_dev_addr_print(target, sizeof(target), &devaddr); |
| 116 | 116 | ||
| 117 | dev_dbg(dev, "rsv %s -> %s: %s\n", owner, target, uwb_rsv_state_str(rsv->state)); | 117 | dev_dbg(dev, "rsv %s %s -> %s: %s\n", |
| 118 | text, owner, target, uwb_rsv_state_str(rsv->state)); | ||
| 118 | } | 119 | } |
| 119 | 120 | ||
| 120 | static void uwb_rsv_release(struct kref *kref) | 121 | static void uwb_rsv_release(struct kref *kref) |
| @@ -511,8 +512,7 @@ void uwb_rsv_remove(struct uwb_rsv *rsv) | |||
| 511 | 512 | ||
| 512 | if (uwb_rsv_is_owner(rsv)) | 513 | if (uwb_rsv_is_owner(rsv)) |
| 513 | uwb_rsv_put_stream(rsv); | 514 | uwb_rsv_put_stream(rsv); |
| 514 | 515 | ||
| 515 | del_timer_sync(&rsv->timer); | ||
| 516 | uwb_dev_put(rsv->owner); | 516 | uwb_dev_put(rsv->owner); |
| 517 | if (rsv->target.type == UWB_RSV_TARGET_DEV) | 517 | if (rsv->target.type == UWB_RSV_TARGET_DEV) |
| 518 | uwb_dev_put(rsv->target.dev); | 518 | uwb_dev_put(rsv->target.dev); |
| @@ -870,7 +870,7 @@ void uwb_rsv_queue_update(struct uwb_rc *rc) | |||
| 870 | */ | 870 | */ |
| 871 | void uwb_rsv_sched_update(struct uwb_rc *rc) | 871 | void uwb_rsv_sched_update(struct uwb_rc *rc) |
| 872 | { | 872 | { |
| 873 | spin_lock(&rc->rsvs_lock); | 873 | spin_lock_bh(&rc->rsvs_lock); |
| 874 | if (!delayed_work_pending(&rc->rsv_update_work)) { | 874 | if (!delayed_work_pending(&rc->rsv_update_work)) { |
| 875 | if (rc->set_drp_ie_pending > 0) { | 875 | if (rc->set_drp_ie_pending > 0) { |
| 876 | rc->set_drp_ie_pending++; | 876 | rc->set_drp_ie_pending++; |
| @@ -879,7 +879,7 @@ void uwb_rsv_sched_update(struct uwb_rc *rc) | |||
| 879 | uwb_rsv_queue_update(rc); | 879 | uwb_rsv_queue_update(rc); |
| 880 | } | 880 | } |
| 881 | unlock: | 881 | unlock: |
| 882 | spin_unlock(&rc->rsvs_lock); | 882 | spin_unlock_bh(&rc->rsvs_lock); |
| 883 | } | 883 | } |
| 884 | 884 | ||
| 885 | /* | 885 | /* |
| @@ -943,13 +943,22 @@ void uwb_rsv_remove_all(struct uwb_rc *rc) | |||
| 943 | 943 | ||
| 944 | mutex_lock(&rc->rsvs_mutex); | 944 | mutex_lock(&rc->rsvs_mutex); |
| 945 | list_for_each_entry_safe(rsv, t, &rc->reservations, rc_node) { | 945 | list_for_each_entry_safe(rsv, t, &rc->reservations, rc_node) { |
| 946 | uwb_rsv_remove(rsv); | 946 | if (rsv->state != UWB_RSV_STATE_NONE) |
| 947 | uwb_rsv_set_state(rsv, UWB_RSV_STATE_NONE); | ||
| 948 | del_timer_sync(&rsv->timer); | ||
| 947 | } | 949 | } |
| 948 | /* Cancel any postponed update. */ | 950 | /* Cancel any postponed update. */ |
| 949 | rc->set_drp_ie_pending = 0; | 951 | rc->set_drp_ie_pending = 0; |
| 950 | mutex_unlock(&rc->rsvs_mutex); | 952 | mutex_unlock(&rc->rsvs_mutex); |
| 951 | 953 | ||
| 952 | cancel_delayed_work_sync(&rc->rsv_update_work); | 954 | cancel_delayed_work_sync(&rc->rsv_update_work); |
| 955 | flush_workqueue(rc->rsv_workq); | ||
| 956 | |||
| 957 | mutex_lock(&rc->rsvs_mutex); | ||
| 958 | list_for_each_entry_safe(rsv, t, &rc->reservations, rc_node) { | ||
| 959 | uwb_rsv_remove(rsv); | ||
| 960 | } | ||
| 961 | mutex_unlock(&rc->rsvs_mutex); | ||
| 953 | } | 962 | } |
| 954 | 963 | ||
| 955 | void uwb_rsv_init(struct uwb_rc *rc) | 964 | void uwb_rsv_init(struct uwb_rc *rc) |
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c index c50c7cf26fe9..2745b8539485 100644 --- a/drivers/video/aty/mach64_ct.c +++ b/drivers/video/aty/mach64_ct.c | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #include <asm/io.h> | 8 | #include <asm/io.h> |
| 9 | #include <video/mach64.h> | 9 | #include <video/mach64.h> |
| 10 | #include "atyfb.h" | 10 | #include "atyfb.h" |
| 11 | #ifdef CONFIG_PPC | ||
| 12 | #include <asm/machdep.h> | ||
| 13 | #endif | ||
| 11 | 14 | ||
| 12 | #undef DEBUG | 15 | #undef DEBUG |
| 13 | 16 | ||
| @@ -536,6 +539,14 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, | |||
| 536 | pll->ct.xclk_post_div_real = postdividers[xpost_div]; | 539 | pll->ct.xclk_post_div_real = postdividers[xpost_div]; |
| 537 | pll->ct.mclk_fb_div = q * pll->ct.xclk_post_div_real / 8; | 540 | pll->ct.mclk_fb_div = q * pll->ct.xclk_post_div_real / 8; |
| 538 | 541 | ||
| 542 | #ifdef CONFIG_PPC | ||
| 543 | if (machine_is(powermac)) { | ||
| 544 | /* Override PLL_EXT_CNTL & 0x07. */ | ||
| 545 | pll->ct.xclk_post_div = xpost_div; | ||
| 546 | pll->ct.xclk_ref_div = 1; | ||
| 547 | } | ||
| 548 | #endif | ||
| 549 | |||
| 539 | #ifdef DEBUG | 550 | #ifdef DEBUG |
| 540 | pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) / | 551 | pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) / |
| 541 | (par->ref_clk_per * pll->ct.pll_ref_div); | 552 | (par->ref_clk_per * pll->ct.pll_ref_div); |
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index bef6b45e8a5c..330aacbdec1f 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -192,7 +192,7 @@ static irqreturn_t vp_interrupt(int irq, void *opaque) | |||
| 192 | drv = container_of(vp_dev->vdev.dev.driver, | 192 | drv = container_of(vp_dev->vdev.dev.driver, |
| 193 | struct virtio_driver, driver); | 193 | struct virtio_driver, driver); |
| 194 | 194 | ||
| 195 | if (drv->config_changed) | 195 | if (drv && drv->config_changed) |
| 196 | drv->config_changed(&vp_dev->vdev); | 196 | drv->config_changed(&vp_dev->vdev); |
| 197 | } | 197 | } |
| 198 | 198 | ||
diff --git a/include/linux/bio.h b/include/linux/bio.h index 0942765cf8c0..2aa283ab062b 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
| @@ -451,12 +451,13 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; | |||
| 451 | 451 | ||
| 452 | #ifdef CONFIG_HIGHMEM | 452 | #ifdef CONFIG_HIGHMEM |
| 453 | /* | 453 | /* |
| 454 | * remember to add offset! and never ever reenable interrupts between a | 454 | * remember never ever reenable interrupts between a bvec_kmap_irq and |
| 455 | * bvec_kmap_irq and bvec_kunmap_irq!! | 455 | * bvec_kunmap_irq! |
| 456 | * | 456 | * |
| 457 | * This function MUST be inlined - it plays with the CPU interrupt flags. | 457 | * This function MUST be inlined - it plays with the CPU interrupt flags. |
| 458 | */ | 458 | */ |
| 459 | static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) | 459 | static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, |
| 460 | unsigned long *flags) | ||
| 460 | { | 461 | { |
| 461 | unsigned long addr; | 462 | unsigned long addr; |
| 462 | 463 | ||
| @@ -472,7 +473,8 @@ static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) | |||
| 472 | return (char *) addr + bvec->bv_offset; | 473 | return (char *) addr + bvec->bv_offset; |
| 473 | } | 474 | } |
| 474 | 475 | ||
| 475 | static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) | 476 | static __always_inline void bvec_kunmap_irq(char *buffer, |
| 477 | unsigned long *flags) | ||
| 476 | { | 478 | { |
| 477 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; | 479 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; |
| 478 | 480 | ||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d08c4b8219a6..dcaa0fd84b02 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -455,7 +455,7 @@ struct request_queue | |||
| 455 | 455 | ||
| 456 | #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ | 456 | #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ |
| 457 | (1 << QUEUE_FLAG_CLUSTER) | \ | 457 | (1 << QUEUE_FLAG_CLUSTER) | \ |
| 458 | 1 << QUEUE_FLAG_STACKABLE) | 458 | (1 << QUEUE_FLAG_STACKABLE)) |
| 459 | 459 | ||
| 460 | static inline int queue_is_locked(struct request_queue *q) | 460 | static inline int queue_is_locked(struct request_queue *q) |
| 461 | { | 461 | { |
diff --git a/include/linux/module.h b/include/linux/module.h index 4f7ea12463d3..f3b8329eb5b8 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -219,11 +219,6 @@ void *__symbol_get_gpl(const char *symbol); | |||
| 219 | 219 | ||
| 220 | #endif | 220 | #endif |
| 221 | 221 | ||
| 222 | struct module_ref | ||
| 223 | { | ||
| 224 | local_t count; | ||
| 225 | } ____cacheline_aligned; | ||
| 226 | |||
| 227 | enum module_state | 222 | enum module_state |
| 228 | { | 223 | { |
| 229 | MODULE_STATE_LIVE, | 224 | MODULE_STATE_LIVE, |
| @@ -344,8 +339,11 @@ struct module | |||
| 344 | /* Destruction function. */ | 339 | /* Destruction function. */ |
| 345 | void (*exit)(void); | 340 | void (*exit)(void); |
| 346 | 341 | ||
| 347 | /* Reference counts */ | 342 | #ifdef CONFIG_SMP |
| 348 | struct module_ref ref[NR_CPUS]; | 343 | char *refptr; |
| 344 | #else | ||
| 345 | local_t ref; | ||
| 346 | #endif | ||
| 349 | #endif | 347 | #endif |
| 350 | }; | 348 | }; |
| 351 | #ifndef MODULE_ARCH_INIT | 349 | #ifndef MODULE_ARCH_INIT |
| @@ -395,13 +393,22 @@ void __symbol_put(const char *symbol); | |||
| 395 | #define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x) | 393 | #define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x) |
| 396 | void symbol_put_addr(void *addr); | 394 | void symbol_put_addr(void *addr); |
| 397 | 395 | ||
| 396 | static inline local_t *__module_ref_addr(struct module *mod, int cpu) | ||
| 397 | { | ||
| 398 | #ifdef CONFIG_SMP | ||
| 399 | return (local_t *) (mod->refptr + per_cpu_offset(cpu)); | ||
| 400 | #else | ||
| 401 | return &mod->ref; | ||
| 402 | #endif | ||
| 403 | } | ||
| 404 | |||
| 398 | /* Sometimes we know we already have a refcount, and it's easier not | 405 | /* Sometimes we know we already have a refcount, and it's easier not |
| 399 | to handle the error case (which only happens with rmmod --wait). */ | 406 | to handle the error case (which only happens with rmmod --wait). */ |
| 400 | static inline void __module_get(struct module *module) | 407 | static inline void __module_get(struct module *module) |
| 401 | { | 408 | { |
| 402 | if (module) { | 409 | if (module) { |
| 403 | BUG_ON(module_refcount(module) == 0); | 410 | BUG_ON(module_refcount(module) == 0); |
| 404 | local_inc(&module->ref[get_cpu()].count); | 411 | local_inc(__module_ref_addr(module, get_cpu())); |
| 405 | put_cpu(); | 412 | put_cpu(); |
| 406 | } | 413 | } |
| 407 | } | 414 | } |
| @@ -413,7 +420,7 @@ static inline int try_module_get(struct module *module) | |||
| 413 | if (module) { | 420 | if (module) { |
| 414 | unsigned int cpu = get_cpu(); | 421 | unsigned int cpu = get_cpu(); |
| 415 | if (likely(module_is_live(module))) | 422 | if (likely(module_is_live(module))) |
| 416 | local_inc(&module->ref[cpu].count); | 423 | local_inc(__module_ref_addr(module, cpu)); |
| 417 | else | 424 | else |
| 418 | ret = 0; | 425 | ret = 0; |
| 419 | put_cpu(); | 426 | put_cpu(); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index febc10ed3858..52a9fe08451c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2425,6 +2425,7 @@ | |||
| 2425 | #define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8 | 2425 | #define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8 |
| 2426 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 | 2426 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 |
| 2427 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 | 2427 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 |
| 2428 | #define PCI_DEVICE_ID_INTEL_TGP_LPC 0x27bc | ||
| 2428 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd | 2429 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd |
| 2429 | #define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da | 2430 | #define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da |
| 2430 | #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd | 2431 | #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd |
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index 39c3a5eb8ebe..6ca6a7b66d75 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h | |||
| @@ -43,10 +43,7 @@ static inline void *kmalloc(size_t size, gfp_t flags) | |||
| 43 | i++; | 43 | i++; |
| 44 | #include <linux/kmalloc_sizes.h> | 44 | #include <linux/kmalloc_sizes.h> |
| 45 | #undef CACHE | 45 | #undef CACHE |
| 46 | { | 46 | return NULL; |
| 47 | extern void __you_cannot_kmalloc_that_much(void); | ||
| 48 | __you_cannot_kmalloc_that_much(); | ||
| 49 | } | ||
| 50 | found: | 47 | found: |
| 51 | #ifdef CONFIG_ZONE_DMA | 48 | #ifdef CONFIG_ZONE_DMA |
| 52 | if (flags & GFP_DMA) | 49 | if (flags & GFP_DMA) |
| @@ -77,10 +74,7 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node) | |||
| 77 | i++; | 74 | i++; |
| 78 | #include <linux/kmalloc_sizes.h> | 75 | #include <linux/kmalloc_sizes.h> |
| 79 | #undef CACHE | 76 | #undef CACHE |
| 80 | { | 77 | return NULL; |
| 81 | extern void __you_cannot_kmalloc_that_much(void); | ||
| 82 | __you_cannot_kmalloc_that_much(); | ||
| 83 | } | ||
| 84 | found: | 78 | found: |
| 85 | #ifdef CONFIG_ZONE_DMA | 79 | #ifdef CONFIG_ZONE_DMA |
| 86 | if (flags & GFP_DMA) | 80 | if (flags & GFP_DMA) |
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 9bf4ccc93dbf..55e41afd95ef 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
| @@ -94,16 +94,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); | |||
| 94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
| 95 | match them all). Ignore any errors. Note that you cannot add or delete | 95 | match them all). Ignore any errors. Note that you cannot add or delete |
| 96 | a subdev while walking the subdevs list. */ | 96 | a subdev while walking the subdevs list. */ |
| 97 | #define v4l2_device_call_all(dev, grp_id, o, f, args...) \ | 97 | #define v4l2_device_call_all(dev, grpid, o, f, args...) \ |
| 98 | __v4l2_device_call_subdevs(dev, \ | 98 | __v4l2_device_call_subdevs(dev, \ |
| 99 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 99 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
| 100 | 100 | ||
| 101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
| 102 | match them all). If the callback returns an error other than 0 or | 102 | match them all). If the callback returns an error other than 0 or |
| 103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot | 103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot |
| 104 | add or delete a subdev while walking the subdevs list. */ | 104 | add or delete a subdev while walking the subdevs list. */ |
| 105 | #define v4l2_device_call_until_err(dev, grp_id, o, f, args...) \ | 105 | #define v4l2_device_call_until_err(dev, grpid, o, f, args...) \ |
| 106 | __v4l2_device_call_subdevs_until_err(dev, \ | 106 | __v4l2_device_call_subdevs_until_err(dev, \ |
| 107 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 107 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
| 108 | 108 | ||
| 109 | #endif | 109 | #endif |
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index a85678865c5e..f76db9dcaa05 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -61,6 +61,14 @@ | |||
| 61 | #include <linux/cgroup.h> | 61 | #include <linux/cgroup.h> |
| 62 | 62 | ||
| 63 | /* | 63 | /* |
| 64 | * Workqueue for cpuset related tasks. | ||
| 65 | * | ||
| 66 | * Using kevent workqueue may cause deadlock when memory_migrate | ||
| 67 | * is set. So we create a separate workqueue thread for cpuset. | ||
| 68 | */ | ||
| 69 | static struct workqueue_struct *cpuset_wq; | ||
| 70 | |||
| 71 | /* | ||
| 64 | * Tracks how many cpusets are currently defined in system. | 72 | * Tracks how many cpusets are currently defined in system. |
| 65 | * When there is only one cpuset (the root cpuset) we can | 73 | * When there is only one cpuset (the root cpuset) we can |
| 66 | * short circuit some hooks. | 74 | * short circuit some hooks. |
| @@ -831,7 +839,7 @@ static DECLARE_WORK(rebuild_sched_domains_work, do_rebuild_sched_domains); | |||
| 831 | */ | 839 | */ |
| 832 | static void async_rebuild_sched_domains(void) | 840 | static void async_rebuild_sched_domains(void) |
| 833 | { | 841 | { |
| 834 | schedule_work(&rebuild_sched_domains_work); | 842 | queue_work(cpuset_wq, &rebuild_sched_domains_work); |
| 835 | } | 843 | } |
| 836 | 844 | ||
| 837 | /* | 845 | /* |
| @@ -2111,6 +2119,9 @@ void __init cpuset_init_smp(void) | |||
| 2111 | 2119 | ||
| 2112 | hotcpu_notifier(cpuset_track_online_cpus, 0); | 2120 | hotcpu_notifier(cpuset_track_online_cpus, 0); |
| 2113 | hotplug_memory_notifier(cpuset_track_online_nodes, 10); | 2121 | hotplug_memory_notifier(cpuset_track_online_nodes, 10); |
| 2122 | |||
| 2123 | cpuset_wq = create_singlethread_workqueue("cpuset"); | ||
| 2124 | BUG_ON(!cpuset_wq); | ||
| 2114 | } | 2125 | } |
| 2115 | 2126 | ||
| 2116 | /** | 2127 | /** |
diff --git a/kernel/module.c b/kernel/module.c index e8b51d41dd72..ba22484a987e 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -573,13 +573,13 @@ static char last_unloaded_module[MODULE_NAME_LEN+1]; | |||
| 573 | /* Init the unload section of the module. */ | 573 | /* Init the unload section of the module. */ |
| 574 | static void module_unload_init(struct module *mod) | 574 | static void module_unload_init(struct module *mod) |
| 575 | { | 575 | { |
| 576 | unsigned int i; | 576 | int cpu; |
| 577 | 577 | ||
| 578 | INIT_LIST_HEAD(&mod->modules_which_use_me); | 578 | INIT_LIST_HEAD(&mod->modules_which_use_me); |
| 579 | for (i = 0; i < NR_CPUS; i++) | 579 | for_each_possible_cpu(cpu) |
| 580 | local_set(&mod->ref[i].count, 0); | 580 | local_set(__module_ref_addr(mod, cpu), 0); |
| 581 | /* Hold reference count during initialization. */ | 581 | /* Hold reference count during initialization. */ |
| 582 | local_set(&mod->ref[raw_smp_processor_id()].count, 1); | 582 | local_set(__module_ref_addr(mod, raw_smp_processor_id()), 1); |
| 583 | /* Backwards compatibility macros put refcount during init. */ | 583 | /* Backwards compatibility macros put refcount during init. */ |
| 584 | mod->waiter = current; | 584 | mod->waiter = current; |
| 585 | } | 585 | } |
| @@ -717,10 +717,11 @@ static int try_stop_module(struct module *mod, int flags, int *forced) | |||
| 717 | 717 | ||
| 718 | unsigned int module_refcount(struct module *mod) | 718 | unsigned int module_refcount(struct module *mod) |
| 719 | { | 719 | { |
| 720 | unsigned int i, total = 0; | 720 | unsigned int total = 0; |
| 721 | int cpu; | ||
| 721 | 722 | ||
| 722 | for (i = 0; i < NR_CPUS; i++) | 723 | for_each_possible_cpu(cpu) |
| 723 | total += local_read(&mod->ref[i].count); | 724 | total += local_read(__module_ref_addr(mod, cpu)); |
| 724 | return total; | 725 | return total; |
| 725 | } | 726 | } |
| 726 | EXPORT_SYMBOL(module_refcount); | 727 | EXPORT_SYMBOL(module_refcount); |
| @@ -894,7 +895,7 @@ void module_put(struct module *module) | |||
| 894 | { | 895 | { |
| 895 | if (module) { | 896 | if (module) { |
| 896 | unsigned int cpu = get_cpu(); | 897 | unsigned int cpu = get_cpu(); |
| 897 | local_dec(&module->ref[cpu].count); | 898 | local_dec(__module_ref_addr(module, cpu)); |
| 898 | /* Maybe they're waiting for us to drop reference? */ | 899 | /* Maybe they're waiting for us to drop reference? */ |
| 899 | if (unlikely(!module_is_live(module))) | 900 | if (unlikely(!module_is_live(module))) |
| 900 | wake_up_process(module->waiter); | 901 | wake_up_process(module->waiter); |
| @@ -1464,7 +1465,10 @@ static void free_module(struct module *mod) | |||
| 1464 | kfree(mod->args); | 1465 | kfree(mod->args); |
| 1465 | if (mod->percpu) | 1466 | if (mod->percpu) |
| 1466 | percpu_modfree(mod->percpu); | 1467 | percpu_modfree(mod->percpu); |
| 1467 | 1468 | #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) | |
| 1469 | if (mod->refptr) | ||
| 1470 | percpu_modfree(mod->refptr); | ||
| 1471 | #endif | ||
| 1468 | /* Free lock-classes: */ | 1472 | /* Free lock-classes: */ |
| 1469 | lockdep_free_key_range(mod->module_core, mod->core_size); | 1473 | lockdep_free_key_range(mod->module_core, mod->core_size); |
| 1470 | 1474 | ||
| @@ -2011,6 +2015,14 @@ static noinline struct module *load_module(void __user *umod, | |||
| 2011 | if (err < 0) | 2015 | if (err < 0) |
| 2012 | goto free_mod; | 2016 | goto free_mod; |
| 2013 | 2017 | ||
| 2018 | #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) | ||
| 2019 | mod->refptr = percpu_modalloc(sizeof(local_t), __alignof__(local_t), | ||
| 2020 | mod->name); | ||
| 2021 | if (!mod->refptr) { | ||
| 2022 | err = -ENOMEM; | ||
| 2023 | goto free_mod; | ||
| 2024 | } | ||
| 2025 | #endif | ||
| 2014 | if (pcpuindex) { | 2026 | if (pcpuindex) { |
| 2015 | /* We have a special allocation for this section. */ | 2027 | /* We have a special allocation for this section. */ |
| 2016 | percpu = percpu_modalloc(sechdrs[pcpuindex].sh_size, | 2028 | percpu = percpu_modalloc(sechdrs[pcpuindex].sh_size, |
| @@ -2018,7 +2030,7 @@ static noinline struct module *load_module(void __user *umod, | |||
| 2018 | mod->name); | 2030 | mod->name); |
| 2019 | if (!percpu) { | 2031 | if (!percpu) { |
| 2020 | err = -ENOMEM; | 2032 | err = -ENOMEM; |
| 2021 | goto free_mod; | 2033 | goto free_percpu; |
| 2022 | } | 2034 | } |
| 2023 | sechdrs[pcpuindex].sh_flags &= ~(unsigned long)SHF_ALLOC; | 2035 | sechdrs[pcpuindex].sh_flags &= ~(unsigned long)SHF_ALLOC; |
| 2024 | mod->percpu = percpu; | 2036 | mod->percpu = percpu; |
| @@ -2282,6 +2294,9 @@ static noinline struct module *load_module(void __user *umod, | |||
| 2282 | free_percpu: | 2294 | free_percpu: |
| 2283 | if (percpu) | 2295 | if (percpu) |
| 2284 | percpu_modfree(percpu); | 2296 | percpu_modfree(percpu); |
| 2297 | #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) | ||
| 2298 | percpu_modfree(mod->refptr); | ||
| 2299 | #endif | ||
| 2285 | free_mod: | 2300 | free_mod: |
| 2286 | kfree(args); | 2301 | kfree(args); |
| 2287 | free_hdr: | 2302 | free_hdr: |
diff --git a/kernel/sched.c b/kernel/sched.c index 52bbf1c842a8..242d0d47a70d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -2266,6 +2266,16 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync) | |||
| 2266 | if (!sched_feat(SYNC_WAKEUPS)) | 2266 | if (!sched_feat(SYNC_WAKEUPS)) |
| 2267 | sync = 0; | 2267 | sync = 0; |
| 2268 | 2268 | ||
| 2269 | if (!sync) { | ||
| 2270 | if (current->se.avg_overlap < sysctl_sched_migration_cost && | ||
| 2271 | p->se.avg_overlap < sysctl_sched_migration_cost) | ||
| 2272 | sync = 1; | ||
| 2273 | } else { | ||
| 2274 | if (current->se.avg_overlap >= sysctl_sched_migration_cost || | ||
| 2275 | p->se.avg_overlap >= sysctl_sched_migration_cost) | ||
| 2276 | sync = 0; | ||
| 2277 | } | ||
| 2278 | |||
| 2269 | #ifdef CONFIG_SMP | 2279 | #ifdef CONFIG_SMP |
| 2270 | if (sched_feat(LB_WAKEUP_UPDATE)) { | 2280 | if (sched_feat(LB_WAKEUP_UPDATE)) { |
| 2271 | struct sched_domain *sd; | 2281 | struct sched_domain *sd; |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 5cc1c162044f..a7e50ba185ac 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -719,7 +719,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup) | |||
| 719 | __enqueue_entity(cfs_rq, se); | 719 | __enqueue_entity(cfs_rq, se); |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) | 722 | static void __clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) |
| 723 | { | 723 | { |
| 724 | if (cfs_rq->last == se) | 724 | if (cfs_rq->last == se) |
| 725 | cfs_rq->last = NULL; | 725 | cfs_rq->last = NULL; |
| @@ -728,6 +728,12 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 728 | cfs_rq->next = NULL; | 728 | cfs_rq->next = NULL; |
| 729 | } | 729 | } |
| 730 | 730 | ||
| 731 | static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) | ||
| 732 | { | ||
| 733 | for_each_sched_entity(se) | ||
| 734 | __clear_buddies(cfs_rq_of(se), se); | ||
| 735 | } | ||
| 736 | |||
| 731 | static void | 737 | static void |
| 732 | dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) | 738 | dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) |
| 733 | { | 739 | { |
| @@ -768,8 +774,14 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) | |||
| 768 | 774 | ||
| 769 | ideal_runtime = sched_slice(cfs_rq, curr); | 775 | ideal_runtime = sched_slice(cfs_rq, curr); |
| 770 | delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; | 776 | delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; |
| 771 | if (delta_exec > ideal_runtime) | 777 | if (delta_exec > ideal_runtime) { |
| 772 | resched_task(rq_of(cfs_rq)->curr); | 778 | resched_task(rq_of(cfs_rq)->curr); |
| 779 | /* | ||
| 780 | * The current task ran long enough, ensure it doesn't get | ||
| 781 | * re-elected due to buddy favours. | ||
| 782 | */ | ||
| 783 | clear_buddies(cfs_rq, curr); | ||
| 784 | } | ||
| 773 | } | 785 | } |
| 774 | 786 | ||
| 775 | static void | 787 | static void |
| @@ -1179,20 +1191,15 @@ wake_affine(struct sched_domain *this_sd, struct rq *this_rq, | |||
| 1179 | int idx, unsigned long load, unsigned long this_load, | 1191 | int idx, unsigned long load, unsigned long this_load, |
| 1180 | unsigned int imbalance) | 1192 | unsigned int imbalance) |
| 1181 | { | 1193 | { |
| 1182 | struct task_struct *curr = this_rq->curr; | ||
| 1183 | struct task_group *tg; | ||
| 1184 | unsigned long tl = this_load; | 1194 | unsigned long tl = this_load; |
| 1185 | unsigned long tl_per_task; | 1195 | unsigned long tl_per_task; |
| 1196 | struct task_group *tg; | ||
| 1186 | unsigned long weight; | 1197 | unsigned long weight; |
| 1187 | int balanced; | 1198 | int balanced; |
| 1188 | 1199 | ||
| 1189 | if (!(this_sd->flags & SD_WAKE_AFFINE) || !sched_feat(AFFINE_WAKEUPS)) | 1200 | if (!(this_sd->flags & SD_WAKE_AFFINE) || !sched_feat(AFFINE_WAKEUPS)) |
| 1190 | return 0; | 1201 | return 0; |
| 1191 | 1202 | ||
| 1192 | if (sync && (curr->se.avg_overlap > sysctl_sched_migration_cost || | ||
| 1193 | p->se.avg_overlap > sysctl_sched_migration_cost)) | ||
| 1194 | sync = 0; | ||
| 1195 | |||
| 1196 | /* | 1203 | /* |
| 1197 | * If sync wakeup then subtract the (maximum possible) | 1204 | * If sync wakeup then subtract the (maximum possible) |
| 1198 | * effect of the currently running task from the load | 1205 | * effect of the currently running task from the load |
| @@ -1419,9 +1426,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync) | |||
| 1419 | if (!sched_feat(WAKEUP_PREEMPT)) | 1426 | if (!sched_feat(WAKEUP_PREEMPT)) |
| 1420 | return; | 1427 | return; |
| 1421 | 1428 | ||
| 1422 | if (sched_feat(WAKEUP_OVERLAP) && (sync || | 1429 | if (sched_feat(WAKEUP_OVERLAP) && sync) { |
| 1423 | (se->avg_overlap < sysctl_sched_migration_cost && | ||
| 1424 | pse->avg_overlap < sysctl_sched_migration_cost))) { | ||
| 1425 | resched_task(curr); | 1430 | resched_task(curr); |
| 1426 | return; | 1431 | return; |
| 1427 | } | 1432 | } |
| @@ -1452,6 +1457,11 @@ static struct task_struct *pick_next_task_fair(struct rq *rq) | |||
| 1452 | 1457 | ||
| 1453 | do { | 1458 | do { |
| 1454 | se = pick_next_entity(cfs_rq); | 1459 | se = pick_next_entity(cfs_rq); |
| 1460 | /* | ||
| 1461 | * If se was a buddy, clear it so that it will have to earn | ||
| 1462 | * the favour again. | ||
| 1463 | */ | ||
| 1464 | __clear_buddies(cfs_rq, se); | ||
| 1455 | set_next_entity(cfs_rq, se); | 1465 | set_next_entity(cfs_rq, se); |
| 1456 | cfs_rq = group_cfs_rq(se); | 1466 | cfs_rq = group_cfs_rq(se); |
| 1457 | } while (cfs_rq); | 1467 | } while (cfs_rq); |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 954e1a81b796..bac1061cea2f 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -968,8 +968,8 @@ static inline int pick_optimal_cpu(int this_cpu, cpumask_t *mask) | |||
| 968 | if ((this_cpu != -1) && cpu_isset(this_cpu, *mask)) | 968 | if ((this_cpu != -1) && cpu_isset(this_cpu, *mask)) |
| 969 | return this_cpu; | 969 | return this_cpu; |
| 970 | 970 | ||
| 971 | first = first_cpu(*mask); | 971 | first = cpumask_first(mask); |
| 972 | if (first != NR_CPUS) | 972 | if (first < nr_cpu_ids) |
| 973 | return first; | 973 | return first; |
| 974 | 974 | ||
| 975 | return -1; | 975 | return -1; |
| @@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s, | |||
| 1996 | static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu) | 1996 | static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu) |
| 1997 | { | 1997 | { |
| 1998 | if (c < per_cpu(kmem_cache_cpu, cpu) || | 1998 | if (c < per_cpu(kmem_cache_cpu, cpu) || |
| 1999 | c > per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { | 1999 | c >= per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { |
| 2000 | kfree(c); | 2000 | kfree(c); |
| 2001 | return; | 2001 | return; |
| 2002 | } | 2002 | } |