Commit 3047d706 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/gmbus: whitespace cleanup in reg definitions

parent 51b072de
Loading
Loading
Loading
Loading
+63 −54
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@

#define GPIO(gpio)		_MMIO(dev_priv->display.gmbus.mmio_base + 0x5010 + \
				      4 * (gpio))

#define   GPIO_CLOCK_DIR_MASK		(1 << 0)
#define   GPIO_CLOCK_DIR_IN		(0 << 1)
#define   GPIO_CLOCK_DIR_OUT		(1 << 1)
@@ -26,7 +25,8 @@
#define   GPIO_DATA_VAL_IN		(1 << 12)
#define   GPIO_DATA_PULLUP_DISABLE	(1 << 13)

#define GMBUS0			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5100) /* clock/port select */
/* clock/port select */
#define GMBUS0			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5100)
#define   GMBUS_AKSV_SELECT		(1 << 11)
#define   GMBUS_RATE_100KHZ		(0 << 8)
#define   GMBUS_RATE_50KHZ		(1 << 8)
@@ -35,7 +35,8 @@
#define   GMBUS_HOLD_EXT		(1 << 7) /* 300ns hold time, rsvd on Pineview */
#define   GMBUS_BYTE_CNT_OVERRIDE	(1 << 6)

#define GMBUS1			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5104) /* command/status */
/* command/status */
#define GMBUS1			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5104)
#define   GMBUS_SW_CLR_INT		(1 << 31)
#define   GMBUS_SW_RDY			(1 << 30)
#define   GMBUS_ENT			(1 << 29) /* enable timeout */
@@ -50,7 +51,9 @@
#define   GMBUS_SLAVE_ADDR_SHIFT	1
#define   GMBUS_SLAVE_READ		(1 << 0)
#define   GMBUS_SLAVE_WRITE		(0 << 0)
#define GMBUS2			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5108) /* status */

/* status */
#define GMBUS2			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5108)
#define   GMBUS_INUSE			(1 << 15)
#define   GMBUS_HW_WAIT_PHASE		(1 << 14)
#define   GMBUS_STALL_TIMEOUT		(1 << 13)
@@ -58,14 +61,20 @@
#define   GMBUS_HW_RDY			(1 << 11)
#define   GMBUS_SATOER			(1 << 10)
#define   GMBUS_ACTIVE			(1 << 9)
#define GMBUS3			_MMIO(dev_priv->display.gmbus.mmio_base + 0x510c) /* data buffer bytes 3-0 */
#define GMBUS4			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5110) /* interrupt mask (Pineview+) */

/* data buffer bytes 3-0 */
#define GMBUS3			_MMIO(dev_priv->display.gmbus.mmio_base + 0x510c)

/* interrupt mask (Pineview+) */
#define GMBUS4			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5110)
#define   GMBUS_SLAVE_TIMEOUT_EN	(1 << 4)
#define   GMBUS_NAK_EN			(1 << 3)
#define   GMBUS_IDLE_EN			(1 << 2)
#define   GMBUS_HW_WAIT_EN		(1 << 1)
#define   GMBUS_HW_RDY_EN		(1 << 0)
#define GMBUS5			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5120) /* byte index */

/* byte index */
#define GMBUS5			_MMIO(dev_priv->display.gmbus.mmio_base + 0x5120)
#define   GMBUS_2BYTE_INDEX_EN		(1 << 31)

#endif /* __INTEL_GMBUS_REGS_H__ */