1. 18 Feb, 2016 1 commit
    • Stephen Boyd's avatar
      clk: gpio: Really allow an optional clock= DT property · 4462b4bb
      Stephen Boyd authored
      We mis-merged the original patch from Russell here and so the
      patch went almost all the way, except that we still failed to
      probe when there wasn't a clocks property in the DT node. Allow
      that case by making a negative value from
      of_clk_get_parent_count() into "no parents", like the original
      patch did.
      
      Fixes: 7ed88aa2 ("clk: fix clk-gpio.c with optional clock= DT property")
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Cc: Michael Turquette <mturquette@baylibre.com>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      4462b4bb
  2. 12 Feb, 2016 1 commit
    • Stephen Boyd's avatar
      Revert "clk: qcom: Specify LE device endianness" · c430daf9
      Stephen Boyd authored
      This reverts commit 329cabce.
      
      The commit that caused us to specify LE device endianness here,
      29bb45f2 (regmap-mmio: Use native endianness for read/write,
      2015-10-29), has been reverted in mainline so now when we specify
      LE it actively breaks big endian kernels because the byte
      swapping in regmap-mmio is incorrect. Let's revert this change
      because it will 1) fix the big endian kernels and 2) be redundant
      to specify LE because that will become the default soon.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
      Cc: Mark Brown <broonie@kernel.org>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      c430daf9
  3. 10 Feb, 2016 1 commit
    • Linus Walleij's avatar
      clk: versatile: mask VCO bits before writing · df9cd564
      Linus Walleij authored
      The Versatile syscon ICST driver OR:s the bits into place but
      forgets to mask the previous value, making the code only work
      if the register is zero or giving haphazard results. Mask the
      19 bits used by the Versatile syscon interface register.
      
      Regression caused and now fixed by yours truly.
      
      Cc: Michael Turquette <mturquette@baylibre.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      Cc: linux-clk@vger.kernel.org
      Fixes: 179c8fb3 ("clk: versatile-icst: convert to use regmap")
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      df9cd564
  4. 08 Feb, 2016 1 commit
    • Stephen Boyd's avatar
      Merge tag 'tegra-for-4.5-clk-fixes' of... · 0e954fea
      Stephen Boyd authored
      Merge tag 'tegra-for-4.5-clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-fixes
      
      Pull tegra fixes from Thierry Reding:
      
      clk: tegra: Fixes for v4.5-rc3
      
      This set contains a bunch of miscellaneous fixes that have accumulated
      over the past couple of weeks, primarily for the Tegra210 support added
      in v4.5-rc1.
      
      * tag 'tegra-for-4.5-clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
        clk: tegra: super: Fix sparse warnings for functions not declared as static
        clk: tegra: Fix sparse warnings for functions not declared as static
        clk: tegra: Fix sparse warning for pll_m
        clk: tegra: Use definition for pll_u override bit
        clk: tegra: Fix warning caused by pll_u failing to lock
        clk: tegra: Fix clock sources for Tegra210 EMC
        clk: tegra: Add the APB2APE audio clock on Tegra210
        clk: tegra: Add missing of_node_put()
        clk: tegra: Fix PLLE SS coefficients
        clk: tegra: Fix typos around clearing PLLE bits during enable
        clk: tegra: Do not disable PLLE when under hardware control
        clk: tegra: Fix pllx dyn step calculation
        clk: tegra: pll: Fix potential sleeping-while-atomic
        clk: tegra: Fix the misnaming of nvenc from msenc
        clk: tegra: Fix naming of MISC registers
        clk: tegra: Remove improper flags for lock_enable
        clk: tegra: Fix divider on VI_I2C
      0e954fea
  5. 02 Feb, 2016 15 commits
    • Jon Hunter's avatar
      clk: tegra: super: Fix sparse warnings for functions not declared as static · 5a1d5eff
      Jon Hunter authored
      Sparse reports the following warnings for structures and functions that
      should be declared static:
      
      drivers/clk/tegra/clk-tegra-super-gen4.c:70:35: warning: symbol
       'tegra_super_gen_info_gen4' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra-super-gen4.c:96:35: warning: symbol
       'tegra_super_gen_info_gen5' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra-super-gen4.c:174:13: warning: symbol
       'tegra_super_clk_init' was not declared. Should it be static?
      
      Fix this by making the above static.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      5a1d5eff
    • Jon Hunter's avatar
      clk: tegra: Fix sparse warnings for functions not declared as static · fd360e20
      Jon Hunter authored
      Sparse reports the following warnings for functions in clk-tegra210.c
      that should be declared as static:
      
      drivers/clk/tegra/clk-tegra210.c:460:6: warning: symbol
       'tegra210_pllcx_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:485:6: warning: symbol
       '_pllc_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:490:6: warning: symbol
       '_pllc2_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:495:6: warning: symbol
       '_pllc3_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:500:6: warning: symbol
       '_plla1_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:510:6: warning: symbol
       'tegra210_plla_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:562:6: warning: symbol
       'tegra210_plld_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:701:6: warning: symbol
       'tegra210_plld2_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:709:6: warning: symbol
       'tegra210_plldp_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:722:6: warning: symbol
       'tegra210_pllc4_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:731:6: warning: symbol
       'tegra210_pllre_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:844:6: warning: symbol
       'tegra210_pllx_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:904:6: warning: symbol
       'tegra210_pllmb_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:963:6: warning: symbol
       'tegra210_pllp_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:1025:6: warning: symbol
       'tegra210_pllu_set_defaults' was not declared. Should it be static?
      drivers/clk/tegra/clk-tegra210.c:1215:15: warning: symbol
       'tegra210_clk_adjust_vco_min' was not declared. Should it be static?
      
      Fix this by declaring the above as static.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      fd360e20
    • Jon Hunter's avatar
      clk: tegra: Fix sparse warning for pll_m · d9e65791
      Jon Hunter authored
      Sparse generates the following warning for the pll_m params structure:
      
      drivers/clk/tegra/clk-tegra210.c:1569:10: warning: Initializer entry
       defined twice
      drivers/clk/tegra/clk-tegra210.c:1570:10:   also defined here
      
      Fix this by correcting the index for the MISC1 register.
      
      Fixes: b31eba5ff3f7 ("clk: tegra: Add support for Tegra210 clocks")
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      d9e65791
    • Jon Hunter's avatar
      clk: tegra: Use definition for pll_u override bit · 2d5b6cf8
      Jon Hunter authored
      The definition, PLLU_BASE_OVERRIDE, for the pll_u OVERRIDE bit is defined
      but not used and when the OVERRIDE bit is cleared in tegra210_pll_init()
      the code directly uses the bit number. Therefore, use the definition,
      PLLU_BASE_OVERRIDE when clearing the OVERRIDE bit.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      2d5b6cf8
    • Jon Hunter's avatar
      clk: tegra: Fix warning caused by pll_u failing to lock · 0649c323
      Jon Hunter authored
      If the pll_u is not configured by the bootloader, then on kernel boot the
      following warning is seen:
      
       clk_pll_wait_for_lock: Timed out waiting for pll pll_u_vco lock
       tegra_init_from_table: Failed to enable pll_u_out1
       ------------[ cut here ]------------
       WARNING: at drivers/clk/tegra/clk.c:269
       Modules linked in:
      
       CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.0-rc4-next-20151214+ #1
       Hardware name: NVIDIA Tegra210 P2371 reference board (E.1) (DT)
       task: ffffffc0bc0a0000 ti: ffffffc0bc0a8000 task.ti: ffffffc0bc0a8000
       PC is at tegra_init_from_table+0x140/0x164
       LR is at tegra_init_from_table+0x140/0x164
       pc : [<ffffffc0008fee78>] lr : [<ffffffc0008fee78>] pstate: 80000045
       sp : ffffffc0bc0abd50
       x29: ffffffc0bc0abd50 x28: ffffffc00090b8a8
       x27: ffffffc000a06000 x26: ffffffc0bc019780
       x25: ffffffc00086a708 x24: ffffffc00086a790
       x23: ffffffc0006d7188 x22: ffffffc0bc010000
       x21: 000000000000016e x20: ffffffc0bc00d100
       x19: ffffffc000944178 x18: 0000000000000007
       x17: 000000000000000e x16: 0000000000000001
       x15: 0000000000000007 x14: 000000000000000e
       x13: 0000000000000013 x12: 000000000000001a
       x11: 000000000000004d x10: 0000000000000750
       x9 : ffffffc0bc0a8000 x8 : ffffffc0bc0a07b0
       x7 : 0000000000000001 x6 : 0000000002d5f0f8
       x5 : 0000000000000000 x4 : 0000000000000000
       x3 : 0000000000000002 x2 : ffffffc000996724
       x1 : 0000000000000000 x0 : 0000000000000032
      
       ---[ end trace cbd20ae519e92ced ]---
       Call trace:
       [<ffffffc0008fee78>] tegra_init_from_table+0x140/0x164
       [<ffffffc000900ac8>] tegra210_clock_apply_init_table+0x20/0x28
       [<ffffffc0008fec40>] tegra_clocks_apply_init_table+0x18/0x24
       [<ffffffc00008291c>] do_one_initcall+0x90/0x194
       [<ffffffc0008cfab0>] kernel_init_freeable+0x148/0x1e8
       [<ffffffc000636bb0>] kernel_init+0x10/0xdc
       [<ffffffc000085cd0>] ret_from_fork+0x10/0x40
       clk_pll_wait_for_lock: Timed out waiting for pll pll_u_vco lock
       tegra_init_from_table: Failed to enable pll_u_out2
       ------------[ cut here ]------------
      
      pll_u can be either controlled by software or hardware and this is
      selected via the OVERRIDE bit in the pll_u base register. In the function
      tegra210_pll_init(), the OVERRIDE bit for pll_u is cleared, which selects
      hardware control of the pll. However, at the same time the pll_u clocks
      are populated in the init_table for tegra210 and so software will try to
      configure the pll_u if it is not already configured and hence, the above
      warning is seen when the pll fails to lock. Remove the pll_u clocks from
      the init_table so that software does not try to configure this pll on
      boot.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      0649c323
    • Jon Hunter's avatar
      clk: tegra: Fix clock sources for Tegra210 EMC · 4f8d4440
      Jon Hunter authored
      The EMC clock sources for Tegra210 currently incorrectly include pll_c2
      and pll_c3. However, both of these should have been pll_mb as shown in
      the TRM. If Tegra210 happens to be configured such that the pll_mb is the
      default clock for the EMC, as configured by the bootloader, then this will
      cause a system hang on boot. This is because the kernel will disable the
      pll_mb when disabling unused clock as it appears to be unused when it is
      not.
      
      Also add the additional pll_p clock source for the EMC.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      4f8d4440
    • Jon Hunter's avatar
      clk: tegra: Add the APB2APE audio clock on Tegra210 · 29569941
      Jon Hunter authored
      The APB2APE clock for the audio subsystem is required for powering up the
      audio power domain and accessing the various modules in this subsystem on
      Tegra210 devices. Add this clock for Tegra210.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      29569941
    • Amitoj Kaur Chawla's avatar
      clk: tegra: Add missing of_node_put() · 047d6d84
      Amitoj Kaur Chawla authored
      for_each_child_of_node() performs an of_node_get() on each iteration, so
      before breaking out of the loop an of_node_put() is required.
      
      Found using Coccinelle. The semantic patch used for this is as follows:
      
      // <smpl>
      @@
      expression e;
      local idexpression child;
      @@
      
       for_each_child_of_node(root, child) {
         ... when != of_node_put(child)
             when != e = child
      (
         return child;
      |
      +  of_node_put(child);
      ?  return ...;
      )
         ...
       }
      // </smpl>
      Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      047d6d84
    • Mark Kuo's avatar
      clk: tegra: Fix PLLE SS coefficients · 442f53fb
      Mark Kuo authored
      The PLLE SS coefficients are different between Tegra210 and Tegra114.
      Add SoC generation specific versions for Tegra114 and Tegra210 and use
      them in their respective ->enable() callbacks.
      Signed-off-by: default avatarMark Kuo <mkuo@nvidia.com>
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      442f53fb
    • Rhyland Klein's avatar
      clk: tegra: Fix typos around clearing PLLE bits during enable · fd2963b0
      Rhyland Klein authored
      While enabling PLLE on both Tegra114 and Tegra210, we should be clearing
      PLLE_MISC_VREG_BG_CTRL_MASK and PLLE_MISC_VREG_CTRL_MASK not setting
      them. This patch fixes both places where we incorrectly set instead of
      cleared those bits.
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      fd2963b0
    • Mark Kuo's avatar
      clk: tegra: Do not disable PLLE when under hardware control · f59b0168
      Mark Kuo authored
      Software should not disable PLLE if PLLE is already put under hardware
      control.
      Signed-off-by: default avatarMark Kuo <mkuo@nvidia.com>
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      f59b0168
    • Rhyland Klein's avatar
      clk: tegra: Fix pllx dyn step calculation · 3dad5c5f
      Rhyland Klein authored
      The logic for calculating the input rate used when figuring out the
      proper dynamic steps for pllx was incorrect. It is supposed to be
      calculated using parent_rate / m but it was just using the parent rate
      directly, therefore using the wrong step values.
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      3dad5c5f
    • Andrew Bresticker's avatar
      clk: tegra: pll: Fix potential sleeping-while-atomic · 3eb61566
      Andrew Bresticker authored
      Since the ->enable() callback is called with a spinlock held, we cannot
      call potentially blocking functions such as clk_get_rate() or
      clk_get_parent(), so use the unlocked versions instead.
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      [rklein: Adapted from ChromeOS patch, removing pllu_enable cleanup as
      it isn't present upstream]
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      3eb61566
    • Rhyland Klein's avatar
      clk: tegra: Fix the misnaming of nvenc from msenc · 736971be
      Rhyland Klein authored
      When adding the nvenc clock, it was partially named msenc in the code.
      Since the msenc clock isn't present in Tegra210 and has been replaced by
      the nvenc clock, its misleading to see it present. Therefore, properly
      rename it.
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      736971be
    • Rhyland Klein's avatar
      clk: tegra: Fix naming of MISC registers · 474f2ba2
      Rhyland Klein authored
      Some register for PLLM and PLLMB were named MISC0 but according to the
      TRM, they have different names. Sync up the names to make it easier to
      understand which register they are really referring to.
      Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      474f2ba2
  6. 29 Jan, 2016 4 commits
  7. 25 Jan, 2016 2 commits
  8. 24 Jan, 2016 11 commits
    • Linus Torvalds's avatar
      Linux 4.5-rc1 · 92e963f5
      Linus Torvalds authored
      92e963f5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · e2464688
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for MIPS for 4.5 plus some 4.4 fixes.
      
        The executive summary:
      
         - ATH79 platform improvments, use DT bindings for the ATH79 USB PHY.
         - Avoid useless rebuilds for zboot.
         - jz4780: Add NEMC, BCH and NAND device tree nodes
         - Initial support for the MicroChip's DT platform.  As all the device
           drivers are missing this is still of limited use.
         - Some Loongson3 cleanups.
         - The unavoidable whitespace polishing.
         - Reduce clock skew when synchronizing the CPU cycle counters on CPU
           startup.
         - Add MIPS R6 fixes.
         - Lots of cleanups across arch/mips as fallout from KVM.
         - Lots of minor fixes and changes for IEEE 754-2008 support to the
           FPU emulator / fp-assist software.
         - Minor Ralink, BCM47xx and bcm963xx platform support improvments.
         - Support SMP on BCM63168"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (84 commits)
        MIPS: zboot: Add support for serial debug using the PROM
        MIPS: zboot: Avoid useless rebuilds
        MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB
        MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function
        MIPS: bcm963xx: Update bcm_tag field image_sequence
        MIPS: bcm963xx: Move extended flash address to bcm_tag header file
        MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure
        MIPS: bcm63xx: nvram: Use nvram structure definition from header file
        MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
        MAINTAINERS: Add KVM for MIPS entry
        MIPS: KVM: Add missing newline to kvm_err()
        MIPS: Move KVM specific opcodes into asm/inst.h
        MIPS: KVM: Use cacheops.h definitions
        MIPS: Break down cacheops.h definitions
        MIPS: Use EXCCODE_ constants with set_except_vector()
        MIPS: Update trap codes
        MIPS: Move Cause.ExcCode trap codes to mipsregs.h
        MIPS: KVM: Make kvm_mips_{init,exit}() static
        MIPS: KVM: Refactor added offsetof()s
        MIPS: KVM: Convert EXPORT_SYMBOL to _GPL
        ...
      e2464688
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.5-2' of... · e1c10879
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darren Hart:
       "Emergency travel prevented me from completing my final testing on this
        until today.  Nothing here that couldn't wait until RC1 fixes, but I
        thought it best to get it out sooner rather than later as it does
        contain a build warning fix.
      
        Summary:
      
        A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:
      
        ideapad-laptop:
         - Add Lenovo Yoga 700 to no_hw_rfkill dmi list
      
        MAINTAINERS:
         - Combine multiple telemetry entries
      
        intel_telemetry_debugfs:
         - Fix unused warnings in telemetry debugfs"
      
      * tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
        MAINTAINERS: Combine multiple telemetry entries
        intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs
      e1c10879
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 81f05fee
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "The top merge commit was re-generated yesterday because two topic
        branches were dropped from this pull request in the last minute due to
        some unaddressed comments.  All the other material has been in
        linux-next for quite a while.
      
        Specifics:
      
         - Enhance thermal core to handle unexpected device cooling states
           after fresh boot and system resume.  From Zhang Rui and Chen Yu.
      
         - Several fixes and cleanups on Rockchip and RCAR thermal drivers.
           From Caesar Wang and Kuninori Morimoto.
      
         - Add Broxton support for Intel processor thermal reporting device
           driver.  From Amy Wiles"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: trip_point_temp_store() calls thermal_zone_device_update()
        thermal: rcar: rcar_thermal_get_temp() return error if strange temp
        thermal: rcar: check irq possibility in rcar_thermal_irq_xxx()
        thermal: rcar: check every rcar_thermal_update_temp() return value
        thermal: rcar: move rcar_thermal_dt_ids to upside
        thermal: rockchip: Support the RK3399 SoCs in thermal driver
        thermal: rockchip: Support the RK3228 SoCs in thermal driver
        dt-bindings: rockchip-thermal: Support the RK3228/RK3399 SoCs compatible
        thermal: rockchip: fix a trivial typo
        Thermal: Enable Broxton SoC thermal reporting device
        thermal: constify pch_dev_ops structure
        Thermal: do thermal zone update after a cooling device registered
        Thermal: handle thermal zone device properly during system sleep
        Thermal: initialize thermal zone device correctly
      81f05fee
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · c52cb431
      Linus Torvalds authored
      Pull 9p updates from Eric Van Hensbergen:
       "Sorry for the last minute pull request, there's was a change that
        didn't get pulled into for-next until two weeks ago and I wanted to
        give it some bake time.
      
        Summary:
      
        Rework and error handling fixes, primarily in the fscatch and fd
        transports"
      
      * tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: use fscache mutex rather than spinlock
        9p: trans_fd, bail out if recv fcall if missing
        9p: trans_fd, read rework to use p9_parse_header
        net/9p: Add device name details on error
      c52cb431
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 00e3f5cc
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "The two main changes are aio support in CephFS, and a series that
        fixes several issues in the authentication key timeout/renewal code.
      
        On top of that are a variety of cleanups and minor bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: remove outdated comment
        libceph: kill off ceph_x_ticket_handler::validity
        libceph: invalidate AUTH in addition to a service ticket
        libceph: fix authorizer invalidation, take 2
        libceph: clear messenger auth_retry flag if we fault
        libceph: fix ceph_msg_revoke()
        libceph: use list_for_each_entry_safe
        ceph: use i_size_{read,write} to get/set i_size
        ceph: re-send AIO write request when getting -EOLDSNAP error
        ceph: Asynchronous IO support
        ceph: Avoid to propagate the invalid page point
        ceph: fix double page_unlock() in page_mkwrite()
        rbd: delete an unnecessary check before rbd_dev_destroy()
        libceph: use list_next_entry instead of list_entry_next
        ceph: ceph_frag_contains_value can be boolean
        ceph: remove unused functions in ceph_frag.h
      00e3f5cc
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 772950ed
      Linus Torvalds authored
      Pull SMB3 fixes from Steve French:
       "A collection of CIFS/SMB3 fixes.
      
        It includes a couple bug fixes, a few for improved debugging of
        cifs.ko and some improvements to the way cifs does key generation.
      
        I do have some additional bug fixes I expect in the next week or two
        (to address a problem found by xfstest, and some fixes for SMB3.11
        dialect, and a couple patches that just came in yesterday that I am
        reviewing)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs_dbg() outputs an uninitialized buffer in cifs_readdir()
        cifs: fix race between call_async() and reconnect()
        Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.
        cifs: Allow using O_DIRECT with cache=loose
        cifs: Make echo interval tunable
        cifs: Check uniqueid for SMB2+ and return -ESTALE if necessary
        Print IP address of unresponsive server
        cifs: Ratelimit kernel log messages
      772950ed
    • Josh Boyer's avatar
      ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list · 6b31de3e
      Josh Boyer authored
      Like the Yoga 900 models the Lenovo Yoga 700 does not have a
      hw rfkill switch, and trying to read the hw rfkill switch through the
      ideapad module causes it to always reported blocking breaking wifi.
      
      This commit adds the Lenovo Yoga 700 to the no_hw_rfkill dmi list, fixing
      the wifi breakage.
      
      BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1295272
      Tested-by: <dinyar.rabady+spam@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      6b31de3e
    • Souvik Kumar Chakravarty's avatar
      MAINTAINERS: Combine multiple telemetry entries · f1fc3cd8
      Souvik Kumar Chakravarty authored
      This patch combines all the telemetry file entries in MAINTAINERS via
      wildcard.
      Signed-off-by: default avatarSouvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      f1fc3cd8
    • Souvik Kumar Chakravarty's avatar
      intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs · 7885f2f9
      Souvik Kumar Chakravarty authored
      This patch fixes compile time warnings when CONFIG_PM_SLEEP
      is undefined. In this case sleep related counters are unused.
      Signed-off-by: default avatarSouvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      7885f2f9
    • Christoph Lameter's avatar
      vmstat: Remove BUG_ON from vmstat_update · 587198ba
      Christoph Lameter authored
      If we detect that there is nothing to do just set the flag and do not
      check if it was already set before.  Races really do not matter.  If the
      flag is set by any code then the shepherd will start dealing with the
      situation and reenable the vmstat workers when necessary again.
      
      Since commit 0eb77e98 ("vmstat: make vmstat_updater deferrable again
      and shut down on idle") quiet_vmstat might update cpu_stat_off and mark
      a particular cpu to be handled by vmstat_shepherd.  This might trigger a
      VM_BUG_ON in vmstat_update because the work item might have been
      sleeping during the idle period and see the cpu_stat_off updated after
      the wake up.  The VM_BUG_ON is therefore misleading and no more
      appropriate.  Moreover it doesn't really suite any protection from real
      bugs because vmstat_shepherd will simply reschedule the vmstat_work
      anytime it sees a particular cpu set or vmstat_update would do the same
      from the worker context directly.  Even when the two would race the
      result wouldn't be incorrect as the counters update is fully idempotent.
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      587198ba
  9. 23 Jan, 2016 4 commits