The error check is checking for a "base" mapped memory base
instead of "base_common". Fixing the same.
Signed-off-by: NNaveen Krishna Chatradhi <ch.naveen@samsung.com>
Signed-off-by: NZhang Rui <rui.zhang@intel.com>

Merge branch 'for_3.12/exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into exynos

This patch updates the documentation to explain the driver model
and file layout.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

Proper description for Exynos4 bindings added to Documentation/devicetree/
bindings. It adds description to use multiple TMU instances, optional voltage
supply node and optional shared register across multiple TMU's.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

TMU probe function now checks for a device tree defined regulator.
For compatibility reasons it is allowed to probe driver even without
this regulator defined.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds support for h/w mode calibration in the TMU controller.
Soc's like 5440 support this features. The h/w bits needed for calibration
setting are same as that of enum calibration_type.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch sets the second point trimming value according to the platform
data if the register value is 0.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds configuration data for exynos5440 soc. Also register
definations for the controller are added.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch modifies TMU controller to add changes needed to work with
exynos5440 platform. This sensor registers 3 instance of the tmu controller
with the thermal zone and hence reports 3 temperature output. This controller
supports upto five trip points. For critical threshold the driver uses the
core driver thermal framework for shutdown.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NJungseok Lee <jays.lee@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds support to parse one more common set of TMU register. First
set of register belongs to each instance of TMU and second set belongs to
common TMU registers.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch uses the device pointer stored in the configuration structure
and converts to dev_* prints and devm API's.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds several features supported by TMU as bitfields.
This features varies across different SOC type and comparing
the features present in the TMU is more logical than comparing
the soc itself.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds support to handle multiple instances of the TMU controllers.
This is done by removing the static structure to register with the core thermal
and creating it dynamically for each instance of the TMU controller. The
interrupt is made shared type to handle shared interrupts. Now since the ISR needs
the core thermal framework to be registered so request_irq is moved after the core
registration is done.
Also the identifier of the TMU controller is extracted from device tree alias. This
will be used for TMU specific initialisation.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

Recently non DT support from Exynos platform is removed and hence
removing non DT support from the driver also. This will help in easy
maintainence.
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This code simplifies the zone handling to use the trip information passed
by the TMU driver and not the hardcoded macros. This also helps in adding
more zone support.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch removes the error return in the bind/unbind routine
as the platform may not register any cpufreq cooling data.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch renames member private_data to driver_data of the thermal
zone registration structure as this item stores the driver related
data and uses it to call the driver related callbacks.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This code modifies the thermal driver to have multiple thermal zone
support by replacing the global thermal zone variable with device data
member of thermal_zone_device.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch uses the TMU status register to know the generated interrupts
and only clear them in the interrupt handler.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

TMU urgently sends active-high signal (thermal trip) to PMU, and thermal
tripping by hardware logic. Thermal tripping means that PMU cuts off the
whole power of SoC by controlling external voltage regulator.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NJonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch migrates the TMU register definition/bitfields to data file. This
is needed to support SoC's which use the same TMU controller but register
validity, offsets or bitfield may slightly vary across SOC's.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds entries min_efuse_value, max_efuse_value, default_temp_offset,
trigger_type, cal_type, trim_first_point, trim_second_point, max_trigger_level
trigger_enable in the TMU platform data structure. Also the driver is modified
to use the data passed by these new platform memebers instead of the constant
macros. All these changes helps in separating the SOC specific data part from
the TMU driver.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch adds some extra register bitfield definations and cleans
up the code to prepare for moving register macros and definations inside
the TMU data section. In this code cleanup the TMU enable bit is correctly used
as bit0 and bit1 is taken care which is reserve bit.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This code splits the exynos tmu driver code into SOC specific data parts.
This will simplify adding new SOC specific data to the same TMU controller.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch renames and moves include/linux/platform_data/exynos_thermal.h to
drivers/thermal/samsung/exynos_tmu.h. This file movement is needed as exynos
SOC's are not supporting non-DT based platforms and this file now just contains
exynos tmu driver related definations.
Also struct freq_clip_table is now moved to exynos_thermal_common.c as it fixes
the compilation issue occuring because now this new tmu header file is included
in tmu driver c file and not in the common thermal header file.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch renames exynos_thermal.c to exynos_tmu.c. This change is needed as
this file now just contains exynos tmu driver related codes and thermal zone
or cpufreq cooling registration related changes are not there anymore.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This code bifurcates exynos thermal implementation into common and sensor
specific parts. The common thermal code interacts with core thermal layer and
core cpufreq cooling parts and is independent of SOC specific driver. This
change is needed to cleanly add support for new TMU sensors.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch removes the dependency on CPU_THERMAL for compiling TMU driver.
This is useful for cases when only TMU controller needs to be initialised
without cpu cooling action.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This patch uses the recently added config sybmol ARCH_HAS_BANDGAP to enable
the TMU driver. This will allow adding support for new soc easily as now it
is the platform responsibility to enable this config symbol for a particular
soc.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

This movement of files is done for easy maintenance and adding more
new sensor's support for exynos platform easily . This will also help in
bifurcating exynos common, sensor driver and sensor data related parts.
Acked-by: NKukjin Kim <kgene.kim@samsung.com>
Acked-by: NJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: NEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: NAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: NEduardo Valentin <eduardo.valentin@ti.com>

Pull CIFS fixes from Steve French:
 "A set of small cifs fixes, including 3 relating to symlink handling"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: don't instantiate new dentries in readdir for inodes that need to be revalidated immediately
  cifs: set sb->s_d_op before calling d_make_root()
  cifs: fix bad error handling in crypto code
  cifs: file: initialize oparms.reconnect before using it
  Do not attempt to do cifs operations reading symlinks with SMB2
  cifs: extend the buffer length enought for sprintf() using

Pull more ext4 bugfixes from Ted Ts'o:
 "A number of miscellaneous ext4 bugs fixes for v3.11, including a fix
  so that if ext4 is built as a module, to allow it to be unloaded"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: flush the extent status cache during EXT4_IOC_SWAP_BOOT
  ext4: fix mount/remount error messages for incompatible mount options
  ext4: allow the mount options nodelalloc and data=journal

Pull w/w mutex deadlock injection fix from Ingo Molnar.

This bug made the CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y option largely
useless, but wouldn't affect normal users.

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  mutex: Fix w/w mutex deadlock injection

Previously we weren't swapping only some of the extent_status LRU
fields during the processing of the EXT4_IOC_SWAP_BOOT ioctl.  The
much safer thing to do is to just completely flush the extent status
tree when doing the swap.
Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>
Cc: Zheng Liu <gnehzuil.liu@gmail.com>
Cc: stable@vger.kernel.org

Pull SCSI fixes from James Bottomley:
 "This is three bug fixes: An fnic warning caused by sleeping under a
  lock, a major regression with our updated WRITE SAME/UNMAP logic which
  caused tons of USB devices (and one RAID card) to cease to function
  and a megaraid_sas firmware initialisation problem which causes kdump
  failures"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
  [SCSI] fnic: BUG: sleeping function called from invalid context during probe
  [SCSI] megaraid_sas: megaraid_sas driver init fails in kdump kernel

Pull powerpc fixes from Ben Herrenschmidt:
 "This includes small series from Michael Neuling to fix a couple of
  nasty remaining problems with the new Power8 support, also targeted at
  stable 3.10, without which some new userspace accessible registers
  aren't properly context switched, and in some case, can be clobbered
  by the user of transactional memory.

  Along with that, a few slightly more minor things, such as a missing
  Kconfig option to enable handling of denorm exceptions when not
  running under a hypervisor (or userspace will randomly crash when
  hitting denorms with the vector unit), some nasty bugs in the new
  pstore oops code, and other simple bug fixes worth having in now.

  Note: I picked up the two powerpc KVM fixes as Alex Graf asked me to
  handle KVM bits while he is on vacation.  However I'll let him decide
  whether they should go to -stable or not when he is back"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs
  powerpc: Save the TAR register earlier
  powerpc: Fix context switch DSCR on POWER8
  powerpc: Rework setting up H/FSCR bit definitions
  powerpc: Fix hypervisor facility unavaliable vector number
  powerpc/kvm/book3s_pr: Return appropriate error when allocation fails
  powerpc/kvm: Add signed type cast for comparation
  powerpc/eeh: Add missing procfs entry for PowerNV
  powerpc/pseries: Add backward compatibilty to read old kernel oops-log
  powerpc/pseries: Fix buffer overflow when reading from pstore
  powerpc: On POWERNV enable PPC_DENORMALISATION by default

Pull s390 kvm fixes from Paolo Bonzini:
 "Two fixes for s390"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: s390: fix pfmf non-quiescing control handling
  KVM: s390: move kvm_guest_enter,exit closer to sie

Pull i2c fixes from Wolfram Sang:
 "Some driver bugfixes for the I2C subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mv64xxx: Document the newly introduced allwinner compatible
  i2c: Fix Kontron PLD prescaler calculation
  i2c: i2c-mxs: Use DMA mode even for small transfers

Pull btrfs fixes from Chris Mason:
 "These are assorted fixes, mostly from Josef nailing down xfstests
  runs.  Zach also has a long standing fix for problems with readdir
  wrapping f_pos (or ctx->pos)

  These patches were spread out over different bases, so I rebased
  things on top of rc4 and retested overnight"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: don't loop on large offsets in readdir
  Btrfs: check to see if root_list is empty before adding it to dead roots
  Btrfs: release both paths before logging dir/changed extents
  Btrfs: allow splitting of hole em's when dropping extent cache
  Btrfs: make sure the backref walker catches all refs to our extent
  Btrfs: fix backref walking when we hit a compressed extent
  Btrfs: do not offset physical if we're compressed
  Btrfs: fix extent buffer leak after backref walking
  Btrfs: fix a bug of snapshot-aware defrag to make it work on partial extents
  btrfs: fix file truncation if FALLOC_FL_KEEP_SIZE is specified