Commit Graph

18 Commits

Author SHA1 Message Date
Rafael J. Wysocki 464ed18ebd PM: Eliminate CONFIG_PM_RUNTIME
Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
2014-12-19 22:55:06 +01:00
Murali Karicheri 97ef1af9b2 ARM: keystone: defconfig: add options to enable PCI controller
This patch enables PCI controller driver for Keystone SoCs by
default.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:29:39 -08:00
Grygorii Strashko 4d5702b5f9 ARM: keystone_defconfig: enable mdio and marvell eth phys
Enable MDIO support for Keystone 2 SoCs and also
enable Marvell Ethernet PHYs support for Keystone 2 K2H EVM
which has two 1G Marvell 88E1111-B2 PHYs installed.

For more information see:
- http://www.advantech.com/Support/TI-EVM/EVMK2HX.aspx

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:28:40 -08:00
Grygorii Strashko 930399bded ARM: keystone_defconfig: enable dsp irq and gpio support
Enable DSP IRQ controller and GPIOs support for Keystone 2.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:28:40 -08:00
Linus Torvalds 2dc24b0d06 ARM: SoC updates for 3.16 (part 2)
This is a small follow-up to the larger ARM SoC updates merged
 last week, almost entirely for the keystone platform.
 
 The main change here is to use the new dma-ranges parsing code
 that came in through Russell's ARM tree. This allows the keystone
 platform to do cache-coherent DMA and to finally support all the
 available physical memory when LPAE is enabled.
 
 Aside from this, the keystone reset driver has been rewritten,
 and there is a small bug fix to allow building the orion5x platform
 again.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAU5harmCrR//JCVInAQJuXhAA2v+IVK4HqkIric4Hj/7monhv/Gxm+7Fj
 +3GYX9QHncSnILQm0ke+OYKYoLNPDbDVyvsY5JWbewLC3TbvnKZoM25Q4Aj6Fcj5
 GAVgggMtc7dkk8VIDfUvjyYZsiiWcvhATvwlQg70oOC0LmRjPwQnBvyP+zvUiBUJ
 ++xBGiVsfScIRhbjB+cYZl7dhLXA+GKzaCw9sKVCS+ExmlAYBSy4cUkRCkw4AQI6
 s4udVuPtFi7++rNTdn2MBeyLyk0pOjQu+jepo/bwmKGaKS88KwZjTCPI1YRtrkrv
 ZjF4AY0kjUenoJuN9Dj9q6I6Ivc8YFDr411hF/LwiBF7+QUk0EnAEeAhDGan/ZCG
 1+xZbY54tQk+TNNgR2V/RzUWilhPmG3rdtq9MnvYrmQnyGeF07MCCAIqoH+B+hDm
 AvApocOT9sReD4yTNIBHYPKsp04jLXR5XKRZ98QkAOInEQaYTpFOU3LyrdgFLLB3
 fIfDf2ZHCc6cmp/wXKk83LVxFQqYbyw0Q93xB/X/8yqb/NyJ8hVaKWgAcofUuj3t
 M87I+XcljA/dx8FsELM3B+qSZXakdDUgXBkfNePkm7GGlq5NziBTMJnhbXiIVMe+
 4kZIyxRD3OZj0d1K3mHMSvoX/FY/98AJWk2eizwwIx64PskatiKQTkX9XFnYPXLb
 AtdWv8t3Ozc=
 =AqkT
 -----END PGP SIGNATURE-----

Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull part two of ARM SoC updates from Arnd Bergmann:
 "This is a small follow-up to the larger ARM SoC updates merged last
  week, almost entirely for the keystone platform.

  The main change here is to use the new dma-ranges parsing code that
  came in through Russell's ARM tree.  This allows the keystone platform
  to do cache-coherent DMA and to finally support all the available
  physical memory when LPAE is enabled.

  Aside from this, the keystone reset driver has been rewritten, and
  there is a small bug fix to allow building the orion5x platform again"

* tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: keystone: Drop use of meminfo since its not available anymore
  ARM: orion5x: fix mvebu_mbus_dt_init call
  ARM: configs: keystone: enable reset driver support
  ARM: dts: keystone: update reset node to work with reset driver
  ARM: keystone: remove redundant reset stuff
  ARM: keystone: Update the dma offset for non-dt platform devices
  ARM: keystone: Switch over to coherent memory address space
  ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
2014-06-11 11:03:24 -07:00
Greg Kroah-Hartman 7ca22cfa0f USB: remove CONFIG_USB_DEBUG from defconfig files
Now that CONFIG_USB_DEBUG is gone, remove it from a number of defconfig
files that were enabling it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-28 09:40:45 -07:00
Ivan Khoronzhuk 6234ca670d ARM: configs: keystone: enable reset driver support
Enable reset driver support in order to have opportunity
to reboot SoC by watchdog and by software.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
[santosh.shilimkar@ti.com: Fixed the subject line]
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-05-27 09:48:53 -04:00
Brian Norris 27379350a9 ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-05-08 15:34:28 -04:00
Lad Prabhakar efdd1946c4 ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
this patch removes COMMON_CLK_DEBUG config option
from defconfig file as this config option is obsolete.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-05-08 15:32:46 -04:00
Ivan Khoronzhuk d6bb841291 ARM: config: keystone: enable AEMIF/NAND support
Keystone SoC uses the same NAND driver as Davinci, so enable
Davinci NAND and AEIMF that provides interface for it.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-28 21:06:46 -05:00
Grygorii Strashko 25427bf5c5 ARM: config: keystone: enable led support
The Keystone GPIO functionality is ready for use, so LED support can be
enabled in config.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17 09:33:46 -05:00
Grygorii Strashko 82218c13e7 ARM: config: keystone: enable gpio support
Enable enable GPIO support for Keystone by setting CONFIG_GPIOLIB and
CONFIG_GPIO_DAVINCI options in keystone_defconfig.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17 09:33:45 -05:00
Ivan Khoronzhuk 76149c035c ARM: config: keystone: enable watchdog support
Keystone SoC uses the same watchdog driver as Davinci, so
enable WDT and core used by it.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17 09:33:45 -05:00
Grygorii Strashko e324f7c9ce ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
Drop automatic selection of TI_EDMA from Keystone Kconfig file,
as it produces build warning in case if CONFIG_DMADEVICES is not set:

warning: (ARCH_KEYSTONE) selects TI_EDMA which has unmet direct dependencies (DMADEVICES && (ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE))

Instead enable TI EDMA support from defconfig.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-31 15:03:53 -08:00
WingMan Kwok 8aad10f656 ARM: keystone: defconfig: enable USB support
Enable the USB support (Host mode only) on TI's Keystone platform.
It also enables the support of usb mass storage, FAT and Ext4
filesystems to test rootfs mount over an USB disk.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
2013-12-16 16:03:36 -05:00
Santosh Shilimkar 4385a83d19 ARM: keystone: Enable I2C and SPI bus support
Keystone I2C dnd SPI driver updates are already merged so lets
enable them in config.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2013-10-10 19:52:18 -04:00
Linus Torvalds ae7a835cc5 Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM updates from Gleb Natapov:
 "The highlights of the release are nested EPT and pv-ticketlocks
  support (hypervisor part, guest part, which is most of the code, goes
  through tip tree).  Apart of that there are many fixes for all arches"

Fix up semantic conflicts as discussed in the pull request thread..

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
  ARM: KVM: Add newlines to panic strings
  ARM: KVM: Work around older compiler bug
  ARM: KVM: Simplify tracepoint text
  ARM: KVM: Fix kvm_set_pte assignment
  ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
  ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
  ARM: KVM: vgic: fix GICD_ICFGRn access
  ARM: KVM: vgic: simplify vgic_get_target_reg
  KVM: MMU: remove unused parameter
  KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
  KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
  KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
  KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
  KVM: PPC: Book3S: Fix compile error in XICS emulation
  KVM: PPC: Book3S PR: return appropriate error when allocation fails
  arch: powerpc: kvm: add signed type cast for comparation
  KVM: x86: add comments where MMIO does not return to the emulator
  KVM: vmx: count exits to userspace during invalid guest emulation
  KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
  kvm: optimize away THP checks in kvm_is_mmio_pfn()
  ...
2013-09-04 18:15:06 -07:00
Santosh Shilimkar 828989ad87 ARM: keystone: Add minimal TI Keystone platform support
Texas Instruments Keystone family of multi-core devices are
based on ARM Cortex A15. Patch adds basic definitions for a
new Keystone sub-architecture in ARM.

The TCI66xxK2H Communications Infrastructure Keystone SoCs
are member of the C66x family based on TI's new KeyStone 2
multi-core SoC Architecture designed specifically for high
performance wireless and networking infrastructure applications.
The SOCs contains many subsystems like Cortex A15 ARM CorePacs,
C66XX DSP CorePacs, MSMC memory controller, Tera Net bus,
IP Network, Navigator, Hyperlink, 1G/10G Ethernet, Radio layers
and queue based communication systems.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: arm@kernel.org

Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2013-06-17 18:35:34 -04:00