1. 12 3月, 2015 1 次提交
    • A
      Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt · e3d00145
      Arnd Bergmann 提交于
      Pull "First batch of DT changes for 4.1" into next/dt:
      
      - at91sam9x5 & EK board: ISI and camera sensors
      - at91sam9n12 & EK board: USB gadget nodes
      - sama5d3: typos, gpio-keys on Xplained board
      - sama5d4: i2c, leds, audio, ISI, crypto, pwm missing nodes
      - new sama5d4 xplained board
      
      * tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (31 commits)
        ARM: at91/dt: sama5d4: add ISI dt support
        ARM: at91/dt: sama5d4: add pwm0 device node
        ARM: at91/dt: sama5d4: add aes, sha and tdes nodes
        ARM: at91: dt: sama5d4ek: enable audio
        ARM: at91: dt: sama5d4ek: add and enable wm8904
        ARM: at91: dt: sama5d4ek: enable ssc0
        ARM: at91: dt: sama5d4: add ssc nodes
        ARM: at91/dt: sama5d4 xplained: add i2c0
        ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board
        ARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0
        ARM: at91/dt: sama5d4ek: add leds in DT node
        ARM: at91/dt: add i2c1 declaration to sama5d4
        ARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed
        ARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property
        ARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals
        ARM: at91/dt: at91sam9n12ek: enable udp
        ARM: at91/dt: at91sam9n12: add udp device node
        ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
        ARM: at91: at91sam9x5ek/dts: add ov2640 support
        ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls
        ...
      e3d00145
  2. 05 3月, 2015 23 次提交
  3. 04 3月, 2015 14 次提交
  4. 03 3月, 2015 2 次提交
    • L
      Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 023a6007
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       "Two GPIO fixes:
      
         - Fix a translation problem in of_get_named_gpiod_flags()
      
         - Fix a long standing container_of() mistake in the TPS65912 driver"
      
      * tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: tps65912: fix wrong container_of arguments
        gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
      023a6007
    • L
      Merge branch 'fixes-for-4.0-rc2' of... · 10d6dfc1
      Linus Torvalds 提交于
      Merge branch 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
      
      Pull thermal management fixes from Eduardo Valentin:
       "Specifics:
      
         - Several fixes in tmon tool.
      
         - Fixes in intel int340x for _ART and _TRT tables.
      
         - Add id for Avoton SoC into powerclamp driver.
      
         - Fixes in RCAR thermal driver to remove race conditions and fix fail
           path
      
         - Fixes in TI thermal driver: removal of unnecessary code and build
           fix if !CONFIG_PM_SLEEP
      
         - Cleanups in exynos thermal driver
      
         - Add stubs for include/linux/thermal.h.  Now drivers using thermal
           calls but that also work without CONFIG_THERMAL will be able to
           compile for systems that don't care about thermal.
      
        Note: I am sending this pull on Rui's behalf while he fixes issues in
        his Linux box"
      
      * 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: int340x_thermal: Ignore missing _ART, _TRT tables
        thermal/intel_powerclamp: add id for Avoton SoC
        tools/thermal: tmon: silence 'set but not used' warnings
        tools/thermal: tmon: use pkg-config to determine library dependencies
        tools/thermal: tmon: support cross-compiling
        tools/thermal: tmon: add .gitignore
        tools/thermal: tmon: fixup tui windowing calculations
        tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
        tools/thermal: tmon: add min/max macros
        tools/thermal: tmon: add --target-temp parameter
        thermal: exynos: Clean-up code to use oneline entry for exynos compatible table
        thermal: rcar: Make error and remove paths symmetrical with init
        thermal: rcar: Fix race condition between init and interrupt
        thermal: Introduce dummy functions when thermal is not defined
        ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister"
        thermal: ti-soc-thermal: bandgap: Fix build warning if !CONFIG_PM_SLEEP
      10d6dfc1