1. 04 Jul, 2013 9 commits
    • Santosh Shilimkar's avatar
      ARM: OMAP5: Enable Cortex A15 errata 798181 · 62618c17
      Santosh Shilimkar authored
      ARM errata 798181 is applicable for OMAP5 based devices. So enable
      the same in the build. Errata extract and workaround information
      is as below.
      
      On Cortex-A15 (r0p0..r3p2) the TLBI*IS/DSB operations are not
      adequately shooting down all use of the old entries. The
      ARM_ERRATA_798181 option enables the Linux kernel workaround
      for this erratum which sends an IPI to the CPUs that are running
      the same ASID as the one being invalidated.
      
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      62618c17
    • Nishanth Menon's avatar
      ARM: scu: provide inline dummy functions when SCU is not present · 2abc75a8
      Nishanth Menon authored
      On platforms such as Cortex-A15 based OMAP5, SCU is not used, however
      since much code is shared between Cortex-A9 based OMAP4 (which uses
      SCU) and OMAP5, It does help to have inline functions returning error
      values when SCU is not present on the platform.
      
      arch/arm/mach-omap2/omap-smp.c which is common between OMAP4 and 5
      handles the SCU usage only for OMAP4.
      
      This fixes the following build failure with OMAP5 only build:
      arch/arm/mach-omap2/built-in.o: In function `omap4_smp_init_cpus':
      arch/arm/mach-omap2/omap-smp.c:185: undefined reference to `scu_get_core_count'
      arch/arm/mach-omap2/built-in.o: In function `omap4_smp_prepare_cpus':
      arch/arm/mach-omap2/omap-smp.c:211: undefined reference to `scu_enable'
      Reported-by: default avatarPekon Gupta <pekon@ti.com>
      Reported-by: default avatarVincent Stehlé <v-stehle@ti.com>
      Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      2abc75a8
    • Nishanth Menon's avatar
      ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4 · b46355a9
      Nishanth Menon authored
      CPU sleep and resume functions for Cortex-A9 based OMAP4 and
      Cortex-A15 based OMAP5 are different. Hence, even though we reuse
      most of the remaining file as part of OMAP4/5 consolidation, build
      OMAP4 specific sleep/resume operations only for OMAP4. SCU is not used
      OMAP5.
      
      This fixes the following build failure with OMAP5 only build:
      arch/arm/mach-omap2/built-in.o: In function `scu_gp_set':
      arch/arm/mach-omap2/sleep44xx.S:132: undefined reference to `scu_power_mode'
      arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear':
      arch/arm/mach-omap2/sleep44xx.S:229: undefined reference to `scu_power_mode'
      Reported-by: default avatarPekon Gupta <pekon@ti.com>
      Reported-by: default avatarVincent Stehlé <v-stehle@ti.com>
      Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      b46355a9
    • Afzal Mohammed's avatar
      ARM: OMAP2+: timer: initialize before using oh_name · 37bd6ca8
      Afzal Mohammed authored
      of_property_read_string_index(...,&oh_name) in omap_dm_timer_init_one
      does not alter the value of 'oh_name' even if the relevant function
      fails and as 'oh_name' in stack may have a non-zero value, it would
      be misunderstood by timer code that DT has specified "ti,hwmod"
      property for timer. 'oh_name' in this scenario would be a junk value,
      this would result in module not being enabled by hwmod API's for
      timer, and in turn crash.
      Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
      Acked-by: default avatarJon Hunter <jgchunter@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      37bd6ca8
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · ddcf6600
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       - new driver to support GMT G762/G763 pwm fan controllers
       - add support for DS1631, DS1721, and DS1731 to ds1621 driver
       - remove detect function from ds1621 driver as unreliable
       - bug fixes in nct6775, iio_hwmon, and adm1021 drivers
       - remove redundant platform_set_drvdata in various drivers
       - add device tree support to ina2xx driver
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (ds1621) Fix temperature rounding operations
        hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
        hwmon: (nct6775) Fix temperature alarm attributes
        Add support for GMT G762/G763 PWM fan controllers
        hwmon: (ina2xx) Add device tree support to pass the shunt resistor
        hwmon: (ds1621) Update documentation
        hwmon: (ds1621) Add DS1731 chip support to ds1621 driver
        hwmon: (iio_hwmon) add alias table
        hwmon: (adm1021) Do not create min sysfs attributes for LM84
        hwmon: (ds1621) Remove detect function
        hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation
        hwmon: (ds1621) Add ds1721 update interval sysfs attribute
        hwmon: (ds1621) Add ds1721 chip support
        hwmon: (w83627ehf) Remove redundant platform_set_drvdata()
        hwmon: (ntc_thermistor) Remove redundant platform_set_drvdata()
        hwmon: (i5k_amb) Remove redundant platform_set_drvdata()
        hwmon: (coretemp) Remove redundant platform_set_drvdata()
        hwmon: (abituguru3) Remove redundant platform_set_drvdata()
      ddcf6600
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · c16bfeb2
      Linus Torvalds authored
      Pull LED subsystem updates from Bryan Wu:
       - lp55xx device tree updates
       - mc13xxx driver updates
       - some clean up
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: mc13783: Fix "uninitialized variable" warning
        leds: Convert led class driver from legacy pm ops to dev_pm_ops
        leds: leds-mc13783: Add MC13892 LED support
        leds: leds-mc13783: Prepare driver to support MC13892 LEDs
        leds: renesas-tpu: cleanup a small type issue
        leds: use platform_{get,set}_drvdata()
        leds: leds-gpio: Let device core handle pinctrl
        leds: lp5562: Properly setup of_device_id table
        leds: lp5523: Properly setup of_device_id table
        leds: lp5521: Properly setup of_device_id table
        leds: lp5562: support the device tree feature
        leds: lp55xx: support dynamic channel settings in the device tree structure
        leds: leds-ns2: remove unnecessary platform_set_drvdata()
        leds: leds-mc13783: remove unnecessary platform_set_drvdata()
        leds: leds-gpio: remove unnecessary platform_set_drvdata()
        leds: atmel-pwm: remove unnecessary platform_set_drvdata()
        leds: lp55xx: add support for Device Tree bindings
      c16bfeb2
    • Linus Torvalds's avatar
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1286da8b
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "A relative calm release at this time with a flat diffstat.  The only
        significant change in the ALSA core side is the support for more than
        32 card instances, configurable via kconfig.  Other than that, in both
        ASoC and other parts, mostly some improvements and fixes on the driver
        side.
      
         - hda: More quirks for ALC269-variants on Dell & co, VIA codec fixes
         - hda: Haswell HDMI audio fixes, runtime PM improvements
         - hda: Intel BayTrail support, ALC5505 DSP support
         - es1968: MediaForte M56VAP support
         - usb-audio: Improved support for Yamaha/Roland devices
         - usb-audio: M2Tech hiFace, Audio Advantage Micro II support
         - hdspm: wordclock fixes
         - ASoC: Pending fixes for WM8962
         - ASoC: Cleanups and fixes for Blackfin, SGTL5000 and UX500
         - ASoC: Generalisation of the Bluetooth and HDMI stub drivers
         - ASoC: SSM2518 and RT5640 codec drivers.
         - ASoC: Tegra CPUs with RT5640 machine driver
         - ASoC: AC'97 refactoring bug fixes
         - ASoC: ADAU1701 driver fixes
         - Clean up of *_set_drvdata() in a wide range of drivers"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (284 commits)
        ALSA: vmaster: Fix the regression of missing vmaster hook call
        ALSA: hda - Add Dell SSID to support Headset Mic recording
        ASoC: adau1701: remove control_data assignment
        ASoC: adau1701: more direct regmap usage
        ASoC: ac97: fixup multi-platform AC'97 module build failure
        ASoC: pxa2xx: fixup multi-platform AC'97 build failures
        ASoC: tegra20-ac97: Remove unused variable
        ASoC: tegra20-ac97: Remove duplicate error message
        ALSA: usb-audio: Add Audio Advantage Micro II
        ASoC: tas5086: fix Mid-Z implementation
        ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size
        ALSA: Replace the magic number 44 with const
        ALSA: hda - Fix the max length of control name in generic parser
        ALSA: hda - Guess what, it's two more Dell headset mic quirks
        ALSA: hda - Yet another Dell headset mic quirk
        ALSA: hda - Add support for ALC5505 DSP power-save mode
        ASoC: mfld: Remove unused variable
        ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE
        ALSA: usb-audio: claim autodetected PCM interfaces all at once
        ALSA: usb-audio: remove superfluous Roland quirks
        ...
      1286da8b
    • Linus Torvalds's avatar
      Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 9e220385
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Overview of changes:
      
         - The rest of maintainer email address updates.
      
         - Some core updates - more robust default behavior for port
           multipliers, better error reporting for SG_IO commands, and a way
           to better work around now ancient and probably pretty rare PATA ->
           SATA bridges with ATAPI devices.
      
         - sata_rcar stabilization.
      
         - Some hardware PCI ID additions and one-off low level driver
           updates."
      
      * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
        AHCI: use ATA_BUSY
        libata-zpodd: must use ata_tf_init()
        ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
        ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
        libata: cleanup SAT error translation
        ahci: sata: add support for exynos5440 sata
        libata: skip SRST for all SIMG [34]7x port-multipliers
        ahci: remove pmp link online check in FBS EH
        sata highbank: add bit-banged SGPIO driver support
        ahci: make ahci_transmit_led_message into a function pointer
        sata_rcar: fix compilation warning in sata_rcar_thaw()
        sata_highbank: increase retry count but shorten duration for Calxeda controller
        ata: use pci_get_drvdata()
        ipr: qc_fill_rtf() method should not store alternate status register
        sata_rcar: add 'base' local variable to some functions
        sata_rcar: correct 'sata_rcar_sht'
        sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()
        libata: do not limit R-Car SATA driver to shmobile
        ata: use platform_{get,set}_drvdata()
        AHCI: Make distinct names for ports in /proc/interrupts
        ...
      9e220385
    • Linus Torvalds's avatar
      Merge branch 'akpm' (updates from Andrew Morton) · 7f0ef026
      Linus Torvalds authored
      Merge first patch-bomb from Andrew Morton:
       - various misc bits
       - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
         distracted.  There has been quite a bit of activity.
       - About half the MM queue
       - Some backlight bits
       - Various lib/ updates
       - checkpatch updates
       - zillions more little rtc patches
       - ptrace
       - signals
       - exec
       - procfs
       - rapidio
       - nbd
       - aoe
       - pps
       - memstick
       - tools/testing/selftests updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
        tools/testing/selftests: don't assume the x bit is set on scripts
        selftests: add .gitignore for kcmp
        selftests: fix clean target in kcmp Makefile
        selftests: add .gitignore for vm
        selftests: add hugetlbfstest
        self-test: fix make clean
        selftests: exit 1 on failure
        kernel/resource.c: remove the unneeded assignment in function __find_resource
        aio: fix wrong comment in aio_complete()
        drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
        drivers/memstick/host/r592.c: convert to module_pci_driver
        drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
        pps-gpio: add device-tree binding and support
        drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
        drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
        drivers/parport/share.c: use kzalloc
        Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
        aoe: update internal version number to v83
        aoe: update copyright date
        aoe: perform I/O completions in parallel
        ...
      7f0ef026
  2. 03 Jul, 2013 31 commits