linux-stable.git/arch/blackfin, branch linux-3.3.y Linux kernel stable tree Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-12T02:50:26+00:00 Linus Torvalds torvalds@linux-foundation.org 2012-01-12T02:50:26+00:00 7b67e751479d50b7f84d1a3cc5216eed5e534b66 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits) x86/PCI: Expand the x86_msi_ops to have a restore MSIs. PCI: Increase resource array mask bit size in pcim_iomap_regions() PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT) PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB x86/PCI: amd: factor out MMCONFIG discovery PCI: Enable ATS at the device state restore PCI: msi: fix imbalanced refcount of msi irq sysfs objects PCI: kconfig: English typo in pci/pcie/Kconfig PCI/PM/Runtime: make PCI traces quieter PCI: remove pci_create_bus() xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources sparc/PCI: convert to pci_create_root_bus() sh/PCI: convert to pci_scan_root_bus() for correct root bus resources powerpc/PCI: convert to pci_create_root_bus() powerpc/PCI: split PHB part out of pcibios_map_io_space() ... Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due to the same patches being applied in other branches. 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
blackfin: bf561: add adv7183 capture support 2012-01-09T02:26:17+00:00 Bob Liu lliubbo@gmail.com 2012-01-05T03:11:20+00:00 dda6779f04fe7c6b61846b672b438bc08c2e08ac Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: bf537: add capture support 2012-01-09T02:26:17+00:00 Bob Liu lliubbo@gmail.com 2012-01-05T03:08:30+00:00 bd5fd095fb0042614dd0d46e7ef05898121bb5f7 Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: bf548: add capture support 2012-01-09T02:26:16+00:00 Scott Jiang scott.jiang.linux@gmail.com 2011-12-31T19:08:38+00:00 df864c309d852b2310f105241db3403ae0062aec Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: time-ts: rm unused func broadcast_timer_setup() 2012-01-09T02:26:16+00:00 Bob Liu lliubbo@gmail.com 2012-01-05T03:25:15+00:00 e6171bbe4d5683960221d42c87195cbd366de4bf broadcast_timer_setup() has no user now, drop it. Signed-off-by: Bob Liu <lliubbo@gmail.com> 
broadcast_timer_setup() has no user now, drop it.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: i2c-lcd: change default clock rate 2012-01-09T02:26:16+00:00 Aaron Wu Aaron.Wu@analog.com 2011-12-12T10:04:54+00:00 7c8e62deeb98713fcce903662a66b16bd04dc602 Change default clock rate of GPIO based I2C operation for BF533 and BF561 to bring up the I2C interface LCD display Signed-off-by: Aaron Wu <Aaron.Wu@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Change default clock rate of GPIO based I2C operation for BF533
and BF561 to bring up the I2C interface LCD display

Signed-off-by: Aaron Wu <Aaron.Wu@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: mac: dsa: add vlan mask in board file 2012-01-09T02:26:16+00:00 Steven Miao realmz6@gmail.com 2011-12-07T09:39:56+00:00 1247f2f077eb556dc8c72e2e55928b3f01765cd5 Else push file through ftp/rcp will fail. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Else push file through ftp/rcp will fail.

Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: bf537: change num_chipselect for spi-sport 2012-01-09T02:26:16+00:00 Scott Jiang scott.jiang.linux@gmail.com 2011-12-06T21:13:43+00:00 8ded9709a171a52199c5ac64912c52f7290870a0 spi sport driver can support any gpio as its cs pin. Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
spi sport driver can support any gpio as its cs pin.

Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
blackfin: serial: bfin-uart: remove unused field 2012-01-09T02:26:16+00:00 Sonic Zhang sonic.zhang@analog.com 2011-12-06T02:00:35+00:00 6f2efbdeda5e45e7087f3ae0f8c354056a96491c Remove unused field for hardware flow control. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Remove unused field for hardware flow control.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
bf54x: get mem size: missing break in switch 2012-01-09T02:26:15+00:00 Steven Miao realmz6@gmail.com 2011-11-30T03:42:49+00:00 4dbeccdf7b7573e90b442b6bd896c10c1608e72d Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> 
Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>