28 Jan, 2015

1 commit

  • commit 40d1746d2eeec5e05956d749cca6364573b472b6 upstream.

    CONFIG_GENERIC_CPUFREQ_CPU0 disappeared with commit bbcf071969b20f
    ("cpufreq: cpu0: rename driver and internals to 'cpufreq_dt'")

    Use the renamed CONFIG_CPUFREQ_DT generic driver. It looks like with
    v3.18-rc1, commit bbcf071969b20f and fdc509b15eb3eb came in via
    different trees causing the resultant v3.18-rc1 to be non-functional for
    cpufreq as default supported with omap2plus_defconfig.

    Fixes: fdc509b15eb3eb ("ARM: omap2plus_defconfig: Add cpufreq to defconfig")
    Signed-off-by: Nishanth Menon
    Acked-by: Viresh Kumar
    Signed-off-by: Tony Lindgren
    Signed-off-by: Greg Kroah-Hartman

    Nishanth Menon
     

30 Oct, 2014

1 commit


28 Oct, 2014

1 commit

  • Commit 673ce00c5d6c (ARM: omap2plus_defconfig: Add support for
    distros with systemd) caused considerable bloat as noted by
    Paul Walmsley .

    Let's fix this issue by making what we can into loadable modules
    for the systemd options. That's only IPV6 and AUTOFS4_FS it
    seems, and IPv6 defaults to a loadable module.

    Reported-by: Paul Walmsley
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

10 Oct, 2014

1 commit


19 Sep, 2014

6 commits

  • Use drivers/misc/sram.c driver to manage SRAM on all DT only
    OMAP platforms (am33xx, am43xx, omap4 and omap5) instead of
    the existing private plat-omap/sram.c

    Address and size related data is removed from mach-omap2/sram.c
    and now passed to drivers/misc/sram.c from DT.

    Users can hence use general purpose allocator apis instead of
    OMAP private ones to manage and use SRAM.

    Signed-off-by: Rajendra Nayak
    Signed-off-by: Dave Gerlach
    Signed-off-by: Tony Lindgren

    Rajendra Nayak
     
  • Now that we have panel support for DT based booting,
    let's make it usable and enable most things as modules.

    Note that omap3 boards need also the ads7847 module for
    the panel that we're now changing to a loadable module.
    And n900 seems to require setting the brightness via
    sysfs for acx565akm/brightness after modprobe of
    panel_sony_acx565akm and omapfb.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • Since many omaps run on battery, we should have the battery
    drivers enabled. Let's also enable the reset driver.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • Some distros are now using systemd, so let's enable most of
    what's recommended at:

    http://cgit.freedesktop.org/systemd/systemd/tree/README

    Reviewed-by: Javier Martinez Canillas
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • Note that we can now use the CONFIG_GENERIC_CPUFREQ_CPU0,
    so let's only enable that. Let's use CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
    as suggested by Nishant.

    And also let's enable thermal as explained by Nishant Menon:

    Many TI SoCs using Highest frequency is not really too nice of an idea for
    long periods of time. And not everything is upstream to support things
    optimially - example avs class 0, 1.5 ABB consolidation with cpufreq etc..
    We definitely need thermal enabled as well for device safety needs.

    [tony@atomide.com: updated per Nishant's suggestions]
    Acked-by: Nishanth Menon
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • This saves few lines and makes it easier to make patches
    against omap2plus_defconfig.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

19 Jul, 2014

1 commit

  • …/git/tmlind/linux-omap into next/dt

    Merge "omap dts changes for v3.17 merge window, part1" from Tony Lindgren:

    First set of .dts changes for omaps for v3.17 merge window:

    - Enable irqchip crossbar interrupt mapping. These changes
    are based on an immutable irqchip branch set up by Jason
    Cooper to make it easier to merge the related .dts changes.

    - Removal of omap2 related static clock data that now comes
    from device tree.

    - Enabling of PHY regulators for various omaps

    - Enabling of PCIe for dra7

    - Add support for am437x starterkit

    - Enable audio for for omap5

    - Enable display and am335x-evmsk

    * tag 'omap-for-v3.17/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (43 commits)
    ARM: DTS: omap5-uevm: Enable basic audio (McPDM <-> twl6040)
    ARM: DTS: omap5-uevm: Add node for twl6040 audio codec
    ARM: DTS: omap5-uevm: Enable palmas clk32kgaudio clock
    ARM: dts: dra7: Add dt data for PCIe controller
    ARM: dts: dra7: Add dt data for PCIe PHY
    ARM: dts: dra7: Add dt data for PCIe PHY control module
    ARM: dts: dra7xx-clocks: Add missing clocks for second PCIe PHY instance
    ARM: dts: dra7xx-clocks: rename pcie clocks to accommodate second PHY instance
    ARM: dts: dra7xx-clocks: Add missing 32KHz clocks used for PHY
    ARM: dts: dra7xx-clocks: Change the parent of apll_pcie_in_clk_mux to dpll_pcie_ref_m2ldo_ck
    ARM: dts: dra7xx-clocks: Add divider table to optfclk_pciephy_div clock
    ARM: dts: dra7-evm: Add regulator information to USB2 PHYs
    ARM: omap2plus_defconfig: enable TPS65218 configs
    ARM: dts: AM437x: Add TPS65218 device tree nodes
    ARM: dts: AM437x: Fix i2c nodes indentation
    ARM: dts: AM43x: Add TPS65218 device tree nodes
    ARM: dts: Add devicetree for Gumstix Pepper board
    ARM: dts: dra7: add crossbar device binding
    ARM: dts: dra7: add routable-irqs property for gic node
    ARM: OMAP24xx: clock: remove legacy clock data
    ...

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

09 Jul, 2014

1 commit


17 Jun, 2014

1 commit

  • Commit d941f86fad41b ("ARM: l2c: AM43x: add L2 cache support") enabled
    the L2 cache support for the am43xx SoC, but caused a build regression
    when the driver for that cache controller is disabled:

    arch/arm/mach-omap2/built-in.o: In function `am43xx_init_early':
    :(.init.text+0xb20): undefined reference to `omap_l2_cache_init'

    This did not happen for OMAP4, which has the same call, but enables
    the l2x0 driver unconditionally. We could do the same thing for
    am43xx, but it seems better to allow turning it off and make the
    code work in either case.

    This adds an inline wrapper for omap_l2_cache_init for the disabled
    case, and removes the 'select' from OMAP4 so it becomes a user
    visible option.

    Signed-off-by: Arnd Bergmann
    Acked-by: Tony Lindgren
    Cc: linux-omap@vger.kernel.org

    Arnd Bergmann
     

04 Jun, 2014

1 commit

  • Pull USB driver updates from Greg KH:
    "Here is the big USB driver pull request for 3.16-rc1.

    Nothing huge here, but lots of little things in the USB core, and in
    lots of drivers. Hopefully the USB power management will be work
    better now that it has been reworked to do per-port power control
    dynamically. There's also a raft of gadget driver updates and fixes,
    CONFIG_USB_DEBUG is finally gone now that everything has been
    converted over to the dynamic debug inteface, the last hold-out
    drivers were cleaned up and the config option removed. There were
    also other minor things all through the drivers/usb/ tree, the
    shortlog shows this pretty well.

    All have been in linux-next, including the very last patch, which came
    from linux-next to fix a build issue on some platforms"

    * tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (314 commits)
    usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
    USB: orinoco_usb: remove CONFIG_USB_DEBUG support
    USB: media: lirc: igorplugusb: remove CONFIG_USB_DEBUG support
    USB: media: streamzap: remove CONFIG_USB_DEBUG
    USB: media: redrat3: remove CONFIG_USB_DEBUG usage
    USB: media: redrat3: remove unneeded tracing macro
    usb: qcserial: add additional Sierra Wireless QMI devices
    usb: host: max3421-hcd: Use module_spi_driver
    usb: host: max3421-hcd: Allow platform-data to specify Vbus polarity
    usb: host: max3421-hcd: fix "spi_rd8" uses dynamic stack allocation warning
    usb: host: max3421-hcd: Fix missing unlock in max3421_urb_enqueue()
    usb: qcserial: add Netgear AirCard 341U
    Documentation: dt-bindings: update xhci-platform DT binding for R-Car H2 and M2
    usb: host: xhci-plat: add xhci_plat_start()
    usb: host: max3421-hcd: Fix potential NULL urb dereference
    Revert "usb: gadget: net2280: Add support for PLX USB338X"
    USB: usbip: remove CONFIG_USB_DEBUG reference
    USB: remove CONFIG_USB_DEBUG from defconfig files
    usb: resume child device when port is powered on
    usb: hub_handle_remote_wakeup() depends on CONFIG_PM_RUNTIME=y
    ...

    Linus Torvalds
     

29 May, 2014

1 commit


07 May, 2014

2 commits

  • Enable CPUidle so it's easier for maintainers to notice
    if some future code changes cause regressions.

    Cc: Kevin Hilman
    Cc: Nishanth Menon
    Cc: Paul Walmsley
    Cc: Tero Kristo
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • On N900 there are nice LEDs that show the state of the
    sys_clkreq and sys_off_mode pins.

    These LEDs go low when the system enters deeper idle
    states. The left LED shows the state of the sys_clkreq
    pin, and goes off during retention idle. The right LED
    shows the state of sys_off_mode pin and both go off
    during off idle.

    As N900 is a battery operated device, these LEDs should
    be off most of the time. So let's enable them by default
    so we can make sure the system is mostly idle.

    This allows the maintainers to also immediately test
    patches for PM regressions by looking at the LEDs,
    which certainly makes my life easier.

    The LED can naturally be disabled during runtime with:

    # echo none > /sys/class/leds/debug::sleep/trigger

    Note that we don't currently have support for omap3
    errata 1.158 that remuxes GPIO pins to INPUT_PULLUP |
    MUX_MODE7 for the duration of idle. This means that the
    GPIO pins set high will go down during off idle. In this
    case it does not matter as the sys_off_mode goes down
    too, but there's still a slim chance of false off idle
    LED signals. If in doubt, false LED signals can be
    verified by the sys_off_mode or vdd_core values.

    Also note that to allow the UARTs to autoidle, the
    following needs to be run on N900 to enable off idle:

    #!/bin/sh
    uarts=$(find /sys/class/tty/ttyO*/device/power/ -type d)
    for uart in $uarts; do
    echo 3000 > $uart/autosuspend_delay_ms
    done

    uarts=$(find /sys/class/tty/ttyO*/power/ -type d)
    for uart in $uarts; do
    echo enabled > $uart/wakeup
    echo auto > $uart/control
    done

    echo 1 > /sys/kernel/debug/pm_debug/enable_off_mode

    For retention idle, change the above to set 0 to
    enable_off_mode.

    Also note that without the twl4030 PM scripts the actual
    voltage scaling won't happen for off idle so we only get
    voltage scaling over I2C4 for retention idle. I'll do
    some device tree patches for those also a bit later on.

    Cc: Kevin Hilman
    Cc: Nishanth Menon
    Cc: Pali Rohár
    Cc: Paul Walmsley
    Cc: Pavel Machek
    Cc: Sebastian Reichel
    Cc: Tero Kristo
    Acked-by: Aaro Koskinen
    [tony@atomide.com: also make sure the LEDs get built to see PM regressions]
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

19 Apr, 2014

1 commit

  • commit a70143 (drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY
    Framework) moved phy-omap-usb3 driver in drivers/usb/phy to drivers/phy and
    also renamed the file to phy-ti-pipe3. It also renamed the config from
    OMAP_USB3 to TI_PIPE3 in Kconfig. However the config name was not changed in
    omap2plus_defconfig. Fixed it here.

    Signed-off-by: Kishon Vijay Abraham I
    Acked-by: Felipe Balbi
    Signed-off-by: Tony Lindgren

    Kishon Vijay Abraham I
     

09 Apr, 2014

1 commit

  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.15:

    Core:
    - CONFIG_MMC_UNSAFE_RESUME=y is now default behavior
    - DT bindings for SDHCI UHS, eMMC HS200, high-speed DDR, at 1.8/1.2V
    - Add GPIO descriptor based slot-gpio card detect API

    Drivers:
    - dw_mmc: Refactor SOCFPGA support as a variant inside dw_mmc-pltfm.c
    - mmci: Support HW busy detection on ux500
    - omap: Support MMC_ERASE
    - omap_hsmmc: Support MMC_PM_KEEP_POWER, MMC_PM_WAKE_SDIO_IRQ, (a)cmd23
    - rtsx: Support pre-req/post-req async
    - sdhci: Add support for Realtek RTS5250 controllers
    - sdhci-acpi: Add support for 80860F16, fix 80860F14/SDIO card detect
    - sdhci-msm: Add new driver for Qualcomm SDHCI chipset support
    - sdhci-pxav3: Add support for Marvell Armada 380 and 385 SoCs"

    * tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (102 commits)
    mmc: sdhci-acpi: Intel SDIO has broken card detect
    mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller
    mmc: sdhci-msm: Add platform_execute_tuning implementation
    mmc: sdhci-msm: Initial support for Qualcomm chipsets
    mmc: sdhci-msm: Qualcomm SDHCI binding documentation
    sdhci: only reprogram retuning timer when flag is set
    mmc: rename ARCH_BCM to ARCH_BCM_MOBILE
    mmc: sdhci: Allow for irq being shared
    mmc: sdhci-acpi: Add device id 80860F16
    mmc: sdhci-acpi: Fix broken card detect for ACPI HID 80860F14
    mmc: slot-gpio: Add GPIO descriptor based CD GPIO API
    mmc: slot-gpio: Split out CD IRQ request into a separate function
    mmc: slot-gpio: Record GPIO descriptors instead of GPIO numbers
    Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
    mmc: sdhci-spear: use generic card detection gpio support
    mmc: sdhci-spear: remove support for power gpio
    mmc: sdhci-spear: simplify resource handling
    mmc: sdhci-spear: fix platform_data usage
    mmc: sdhci-spear: fix error handling paths for DT
    mmc: sdhci-bcm-kona: fix build errors when built-in
    ...

    Linus Torvalds
     

05 Mar, 2014

1 commit


01 Mar, 2014

1 commit


09 Jan, 2014

1 commit


08 Jan, 2014

1 commit


26 Nov, 2013

1 commit


12 Oct, 2013

3 commits


07 Sep, 2013

1 commit

  • Pull ARM SoC platform changes from Olof Johansson:
    "This branch contains mostly additions and changes to platform
    enablement and SoC-level drivers. Since there's sometimes a
    dependency on device-tree changes, there's also a fair amount of
    those in this branch.

    Pieces worth mentioning are:

    - Mbus driver for Marvell platforms, allowing kernel configuration
    and resource allocation of on-chip peripherals.
    - Enablement of the mbus infrastructure from Marvell PCI-e drivers.
    - Preparation of MSI support for Marvell platforms.
    - Addition of new PCI-e host controller driver for Tegra platforms
    - Some churn caused by sharing of macro names between i.MX 6Q and 6DL
    platforms in the device tree sources and header files.
    - Various suspend/PM updates for Tegra, including LP1 support.
    - Versatile Express support for MCPM, part of big little support.
    - Allwinner platform support for A20 and A31 SoCs (dual and quad
    Cortex-A7)
    - OMAP2+ support for DRA7, a new Cortex-A15-based SoC.

    The code that touches other architectures are patches moving MSI
    arch-specific functions over to weak symbols and removal of
    ARCH_SUPPORTS_MSI, acked by PCI maintainers"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
    tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
    PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
    ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
    ARM: dts: vf610-twr: enable i2c0 device
    ARM: dts: i.MX51: Add one more I2C2 pinmux entry
    ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
    ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
    ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
    ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
    ARM: dts: i.MX27: Disable AUDMUX in the template
    ARM: dts: wandboard: Add support for SDIO bcm4329
    ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
    ARM: dts: imx53-qsb: Make USBH1 functional
    ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
    ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
    ARM: dts: imx6qdl-sabresd: Add touchscreen support
    ARM: imx: add ocram clock for imx53
    ARM: dts: imx: ocram size is different between imx6q and imx6dl
    ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
    ARM: dts: i.MX27: Remove clock name from CPU node
    ...

    Linus Torvalds
     

06 Sep, 2013

1 commit

  • …/kernel/git/tomba/linux

    Pull OMAP specific fbdev changes from Tomi Valkeinen:
    "I've got this pull request separate from the main fbdev pull request,
    as this contains a bunch of OMAP board file changes and thus could
    possibly be rejected in case of bad conflicts.

    The removal of the old display drivers depend on the board file
    changes, so Tony Lindgren suggested taking them together via fbdev
    tree. These are in linux-next, and also Tony didn't see any conflicts
    with any of the branches he had, so they should go in clean.

    - Change the OMAP board files to use the new OMAP display drivers

    - Remove all the old drivers, and the related auxiliary code"

    * tag 'fbdev-3.12-omap-legacy-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (35 commits)
    OMAPDSS: rename omap_dss_device's 'device' field to 'dst'
    OMAPDSS: rename omap_dss_device's 'output' to 'src'
    OMAPDSS: DSS: remove legacy dss bus support
    OMAPDSS: RFBI: remove code related to old panel model
    OMAPDSS: VENC: remove code related to old panel model
    OMAPDSS: SDI: remove code related to old panel model
    OMAPDSS: DSI: remove code related to old panel model
    OMAPDSS: HDMI: remove code related to old panel model
    OMAPDSS: DPI: remove code related to old panel model
    OMAPDSS: remove all old panel drivers
    OMAPDSS: DPI: change regulator handling
    OMAPDSS: SDI: change regulator handling
    OMAPDSS: fix DPI and SDI device ids
    OMAPDSS: remove omap_dss_device->channel field
    OMAPDSS: RFBI: Mark RFBI as broken
    ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig
    ARM: OMAP: AM3517EVM: use new display drivers
    ARM: OMAP: Zoom: use new display drivers
    ARM: OMAP: Pandora: use new display drivers
    ARM: OMAP: OMAP3EVM: use new display drivers
    ...

    Linus Torvalds
     

05 Sep, 2013

1 commit

  • 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()
    ...

    Linus Torvalds
     

28 Aug, 2013

2 commits


13 Aug, 2013

1 commit


14 Jul, 2013

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "This is our first set of fixes from arm-soc for 3.11.
    - A handful of build and warning fixes from Arnd
    - A collection of OMAP fixes
    - defconfig updates to make the default configs more useful for real
    use (and testing) out of the box on hardware

    And a couple of other small fixes. Some of these have been recently
    applied but it's normally how we deal with fixes, with less bake time
    in -next needed"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
    arm: multi_v7_defconfig: Tweaks for omap and sunxi
    arm: multi_v7_defconfig: add i.MX options and NFS root
    ARM: omap2: add select of TI_PRIV_EDMA
    ARM: exynos: select PM_GENERIC_DOMAINS only when used
    ARM: ixp4xx: avoid circular header dependency
    ARM: OMAP: omap_common_late_init may be unused
    ARM: sti: move DEBUG_STI_UART into alphabetical order
    ARM: OMAP: build mach-omap code only if needed
    ARM: zynq: use DT_MACHINE_START
    ARM: omap5: omap5 has SCU and TWD
    ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
    ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
    ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
    ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
    ARM: OMAP2+: devices: remove duplicated include from devices.c
    ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
    ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
    ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
    ARM: OMAP2+: Remove obsolete Makefile line
    ARM: OMAP5: Enable Cortex A15 errata 798181
    ...

    Linus Torvalds
     

13 Jul, 2013

1 commit

  • …m/linux/kernel/git/tmlind/linux-omap into fixes

    Omap fixes and minor defconfig updates that would be good to
    get in before -rc1.

    * tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
    ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
    ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
    ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
    ARM: OMAP2+: devices: remove duplicated include from devices.c
    ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
    ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
    ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
    ARM: OMAP2+: Remove obsolete Makefile line
    ARM: OMAP5: Enable Cortex A15 errata 798181
    ARM: scu: provide inline dummy functions when SCU is not present
    ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
    ARM: OMAP2+: timer: initialize before using oh_name

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.

    Olof Johansson
     

10 Jul, 2013

1 commit

  • Pull networking updates from David Miller:
    "This is a re-do of the net-next pull request for the current merge
    window. The only difference from the one I made the other day is that
    this has Eliezer's interface renames and the timeout handling changes
    made based upon your feedback, as well as a few bug fixes that have
    trickeled in.

    Highlights:

    1) Low latency device polling, eliminating the cost of interrupt
    handling and context switches. Allows direct polling of a network
    device from socket operations, such as recvmsg() and poll().

    Currently ixgbe, mlx4, and bnx2x support this feature.

    Full high level description, performance numbers, and design in
    commit 0a4db187a999 ("Merge branch 'll_poll'")

    From Eliezer Tamir.

    2) With the routing cache removed, ip_check_mc_rcu() gets exercised
    more than ever before in the case where we have lots of multicast
    addresses. Use a hash table instead of a simple linked list, from
    Eric Dumazet.

    3) Add driver for Atheros CQA98xx 802.11ac wireless devices, from
    Bartosz Markowski, Janusz Dziedzic, Kalle Valo, Marek Kwaczynski,
    Marek Puzyniak, Michal Kazior, and Sujith Manoharan.

    4) Support reporting the TUN device persist flag to userspace, from
    Pavel Emelyanov.

    5) Allow controlling network device VF link state using netlink, from
    Rony Efraim.

    6) Support GRE tunneling in openvswitch, from Pravin B Shelar.

    7) Adjust SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF for modern times, from
    Daniel Borkmann and Eric Dumazet.

    8) Allow controlling of TCP quickack behavior on a per-route basis,
    from Cong Wang.

    9) Several bug fixes and improvements to vxlan from Stephen
    Hemminger, Pravin B Shelar, and Mike Rapoport. In particular,
    support receiving on multiple UDP ports.

    10) Major cleanups, particular in the area of debugging and cookie
    lifetime handline, to the SCTP protocol code. From Daniel
    Borkmann.

    11) Allow packets to cross network namespaces when traversing tunnel
    devices. From Nicolas Dichtel.

    12) Allow monitoring netlink traffic via AF_PACKET sockets, in a
    manner akin to how we monitor real network traffic via ptype_all.
    From Daniel Borkmann.

    13) Several bug fixes and improvements for the new alx device driver,
    from Johannes Berg.

    14) Fix scalability issues in the netem packet scheduler's time queue,
    by using an rbtree. From Eric Dumazet.

    15) Several bug fixes in TCP loss recovery handling, from Yuchung
    Cheng.

    16) Add support for GSO segmentation of MPLS packets, from Simon
    Horman.

    17) Make network notifiers have a real data type for the opaque
    pointer that's passed into them. Use this to properly handle
    network device flag changes in arp_netdev_event(). From Jiri
    Pirko and Timo Teräs.

    18) Convert several drivers over to module_pci_driver(), from Peter
    Huewe.

    19) tcp_fixup_rcvbuf() can loop 500 times over loopback, just use a
    O(1) calculation instead. From Eric Dumazet.

    20) Support setting of explicit tunnel peer addresses in ipv6, just
    like ipv4. From Nicolas Dichtel.

    21) Protect x86 BPF JIT against spraying attacks, from Eric Dumazet.

    22) Prevent a single high rate flow from overruning an individual cpu
    during RX packet processing via selective flow shedding. From
    Willem de Bruijn.

    23) Don't use spinlocks in TCP md5 signing fast paths, from Eric
    Dumazet.

    24) Don't just drop GSO packets which are above the TBF scheduler's
    burst limit, chop them up so they are in-bounds instead. Also
    from Eric Dumazet.

    25) VLAN offloads are missed when configured on top of a bridge, fix
    from Vlad Yasevich.

    26) Support IPV6 in ping sockets. From Lorenzo Colitti.

    27) Receive flow steering targets should be updated at poll() time
    too, from David Majnemer.

    28) Fix several corner case regressions in PMTU/redirect handling due
    to the routing cache removal, from Timo Teräs.

    29) We have to be mindful of ipv4 mapped ipv6 sockets in
    upd_v6_push_pending_frames(). From Hannes Frederic Sowa.

    30) Fix L2TP sequence number handling bugs, from James Chapman."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1214 commits)
    drivers/net: caif: fix wrong rtnl_is_locked() usage
    drivers/net: enic: release rtnl_lock on error-path
    vhost-net: fix use-after-free in vhost_net_flush
    net: mv643xx_eth: do not use port number as platform device id
    net: sctp: confirm route during forward progress
    virtio_net: fix race in RX VQ processing
    virtio: support unlocked queue poll
    net/cadence/macb: fix bug/typo in extracting gem_irq_read_clear bit
    Documentation: Fix references to defunct linux-net@vger.kernel.org
    net/fs: change busy poll time accounting
    net: rename low latency sockets functions to busy poll
    bridge: fix some kernel warning in multicast timer
    sfc: Fix memory leak when discarding scattered packets
    sit: fix tunnel update via netlink
    dt:net:stmmac: Add dt specific phy reset callback support.
    dt:net:stmmac: Add support to dwmac version 3.610 and 3.710
    dt:net:stmmac: Allocate platform data only if its NULL.
    net:stmmac: fix memleak in the open method
    ipv6: rt6_check_neigh should successfully verify neigh if no NUD information are available
    net: ipv6: fix wrong ping_v6_sendmsg return value
    ...

    Linus Torvalds
     

06 Jul, 2013

1 commit

  • If we build a kernel with CONFIG_ARCH_OMAP2PLUS enabled but all of the
    individual SoCs disabled, we run into a large number of link errors
    because if incorrect dependencies:

    arch/arm/mach-omap2/built-in.o: In function `_add_initiator_dep':
    arch/arm/mach-omap2/omap_hwmod.c:691: undefined reference to `clkdm_add_sleepdep' arch/arm/mach-omap2/built-in.o: In function `_del_initiator_dep':
    arch/arm/mach-omap2/omap_hwmod.c:720: undefined reference to `clkdm_del_sleepdep' arch/arm/mach-omap2/built-in.o: In function `_enable':
    arch/arm/mach-omap2/omap_hwmod.c:2145: undefined reference to `clkdm_in_hwsup'
    arch/arm/mach-omap2/omap_hwmod.c:2147: undefined reference to `clkdm_hwmod_enable'
    arch/arm/mach-omap2/omap_hwmod.c:2191: undefined reference to `clkdm_hwmod_disable'
    arch/arm/mach-omap2/omap_hwmod.c:2146: undefined reference to `clkdm_missing_idle_reporting' arch/arm/mach-omap2/built-in.o: In function `_idle':
    arch/arm/mach-omap2/omap_hwmod.c:2235: undefined reference to `clkdm_hwmod_disable' arch/arm/mach-omap2/built-in.o: In function `_shutdown':
    arch/arm/mach-omap2/omap_hwmod.c:2338: undefined reference to `clkdm_hwmod_disable' arch/arm/mach-omap2/built-in.o: In function `omap_hwmod_get_context_loss_count':
    arch/arm/mach-omap2/omap_hwmod.c:4071: undefined reference to `pwrdm_get_context_loss_count' arch/arm/mach-omap2/built-in.o: In function `omap_pm_clkdms_setup':
    arch/arm/mach-omap2/pm.c:114: undefined reference to `clkdm_allow_idle'
    arch/arm/mach-omap2/pm.c:117: undefined reference to `clkdm_sleep' arch/arm/mach-omap2/built-in.o: In function `omap2_common_pm_late_init':
    arch/arm/mach-omap2/pm.c:294: undefined reference to `omap_voltage_late_init' arch/arm/mach-omap2/built-in.o: In function `omap2_gpio_dev_init':
    arch/arm/mach-omap2/gpio.c:133: undefined reference to `pwrdm_can_ever_lose_context'

    We can avoid this if we make CONFIG_ARCH_OMAP2PLUS a silent option that
    gets enabled any time that one of the SoC versions is enabled.

    Cc: Tony Lindgren
    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

04 Jul, 2013

3 commits