https://github.com/torvalds/linux
Revision 1a59c53920eed3b2718c07286f1afe8674a7d9e6 authored by Linus Torvalds on 09 April 2016, 17:23:45 UTC, committed by Linus Torvalds on 09 April 2016, 17:23:45 UTC
Pull IOMMU fixes from Joerg Roedel:

 - compile-time fixes (warnings and failures)

 - a bug in iommu core code which could cause the group->domain pointer
   to be falsly cleared

 - fix in scatterlist handling of the ARM common DMA-API code

 - stall detection fix for the Rockchip IOMMU driver

* tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Silence an uninitialized variable warning
  iommu/rockchip: Fix "is stall active" check
  iommu: Don't overwrite domain pointer when there is no default_domain
  iommu/dma: Restore scatterlist offsets correctly
  iommu: provide of_xlate pointer unconditionally
2 parent s 3c96888 + 0b74ecd
Raw File
Tip revision: 1a59c53920eed3b2718c07286f1afe8674a7d9e6 authored by Linus Torvalds on 09 April 2016, 17:23:45 UTC
Merge tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Tip revision: 1a59c53
adt7x10.h
#ifndef __HWMON_ADT7X10_H__
#define __HWMON_ADT7X10_H__

#include <linux/types.h>
#include <linux/pm.h>

/* ADT7410 registers definition */
#define ADT7X10_TEMPERATURE		0
#define ADT7X10_STATUS			2
#define ADT7X10_CONFIG			3
#define ADT7X10_T_ALARM_HIGH		4
#define ADT7X10_T_ALARM_LOW		6
#define ADT7X10_T_CRIT			8
#define ADT7X10_T_HYST			0xA
#define ADT7X10_ID			0xB

struct device;

struct adt7x10_ops {
	int (*read_byte)(struct device *, u8 reg);
	int (*write_byte)(struct device *, u8 reg, u8 data);
	int (*read_word)(struct device *, u8 reg);
	int (*write_word)(struct device *, u8 reg, u16 data);
};

int adt7x10_probe(struct device *dev, const char *name, int irq,
	const struct adt7x10_ops *ops);
int adt7x10_remove(struct device *dev, int irq);

#ifdef CONFIG_PM_SLEEP
extern const struct dev_pm_ops adt7x10_dev_pm_ops;
#define ADT7X10_DEV_PM_OPS (&adt7x10_dev_pm_ops)
#else
#define ADT7X10_DEV_PM_OPS NULL
#endif

#endif
back to top