Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd476fa2 authored by Hans de Goede's avatar Hans de Goede Committed by Daniel Vetter
Browse files

i2c: designware-baytrail: Add support for cherrytrail 



The cherrytrail punit has the pmic i2c bus access semaphore at a
different register address.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Tested-by: default avatarTakashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170210102802.20898-9-hdegoede@redhat.com
parent 519e23a7

drivers/i2c/busses/i2c-designware-baytrail.c

+15 −4
Original line number Diff line number Diff line
@@ -24,17 +24,27 @@ 


#define SEMAPHORE_TIMEOUT	100

#define PUNIT_SEMAPHORE		0x7

#define PUNIT_SEMAPHORE_CHT	0x10e

#define PUNIT_SEMAPHORE_BIT	BIT(0)

#define PUNIT_SEMAPHORE_ACQUIRE	BIT(1)



static unsigned long acquired;



static u32 get_sem_addr(struct dw_i2c_dev *dev)

{

	if (dev->flags & MODEL_CHERRYTRAIL)

		return PUNIT_SEMAPHORE_CHT;

	else

		return PUNIT_SEMAPHORE;

}



static int get_sem(struct dw_i2c_dev *dev, u32 *sem)

{

	u32 addr = get_sem_addr(dev);

	u32 data;

	int ret;



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &data);

	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, addr, &data);

	if (ret) {

		dev_err(dev->dev, "iosf failed to read punit semaphore\n");

		return ret;
@@ -47,7 +57,7 @@ static int get_sem(struct dw_i2c_dev *dev, u32 *sem) 


static void reset_semaphore(struct dw_i2c_dev *dev)

{

	if (iosf_mbi_modify(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE,

	if (iosf_mbi_modify(BT_MBI_UNIT_PMC, MBI_REG_READ, get_sem_addr(dev),

			    0, PUNIT_SEMAPHORE_BIT))

		dev_err(dev->dev, "iosf failed to reset punit semaphore during write\n");
@@ -56,6 +66,7 @@ static void reset_semaphore(struct dw_i2c_dev *dev) 


static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)

{

	u32 addr = get_sem_addr(dev);

	u32 sem = PUNIT_SEMAPHORE_ACQUIRE;

	int ret;

	unsigned long start, end;
@@ -76,7 +87,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
	pm_qos_update_request(&dev->pm_qos, 0);



	/* host driver writes to side band semaphore register */

	ret = iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, PUNIT_SEMAPHORE, sem);

	ret = iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, addr, sem);

	if (ret) {

		dev_err(dev->dev, "iosf punit semaphore request failed\n");

		goto out;
@@ -101,7 +112,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
out:

	reset_semaphore(dev);



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &sem);

	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, addr, &sem);

	if (ret)

		dev_err(dev->dev, "iosf failed to read punit semaphore\n");

	else

drivers/i2c/busses/i2c-designware-core.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ struct dw_i2c_dev { 
#define ACCESS_16BIT		0x00000002

#define ACCESS_INTR_MASK	0x00000004



#define MODEL_CHERRYTRAIL	0x00000100



extern int i2c_dw_init(struct dw_i2c_dev *dev);

extern void i2c_dw_disable(struct dw_i2c_dev *dev);

extern void i2c_dw_disable_int(struct dw_i2c_dev *dev);

drivers/i2c/busses/i2c-designware-pcidrv.c

+19 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ enum dw_pci_ctl_id_t { 
	medfield,

	merrifield,

	baytrail,

	cherrytrail,

	haswell,

};
@@ -63,6 +64,7 @@ struct dw_pci_controller { 
	u32 rx_fifo_depth;

	u32 clk_khz;

	u32 functionality;

	u32 flags;

	struct dw_scl_sda_cfg *scl_sda_cfg;

	int (*setup)(struct pci_dev *pdev, struct dw_pci_controller *c);

};
@@ -170,6 +172,15 @@ static struct dw_pci_controller dw_pci_controllers[] = { 
		.functionality = I2C_FUNC_10BIT_ADDR,

		.scl_sda_cfg = &hsw_config,

	},

	[cherrytrail] = {

		.bus_num = -1,

		.bus_cfg = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,

		.tx_fifo_depth = 32,

		.rx_fifo_depth = 32,

		.functionality = I2C_FUNC_10BIT_ADDR,

		.flags = MODEL_CHERRYTRAIL,

		.scl_sda_cfg = &byt_config,

	},

};



#ifdef CONFIG_PM
@@ -237,6 +248,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, 
	dev->base = pcim_iomap_table(pdev)[0];

	dev->dev = &pdev->dev;

	dev->irq = pdev->irq;

	dev->flags |= controller->flags;



	if (controller->setup) {

		r = controller->setup(pdev, controller);
@@ -317,13 +329,13 @@ static const struct pci_device_id i2_designware_pci_ids[] = { 
	{ PCI_VDEVICE(INTEL, 0x9c61), haswell },

	{ PCI_VDEVICE(INTEL, 0x9c62), haswell },

	/* Braswell / Cherrytrail */

	{ PCI_VDEVICE(INTEL, 0x22C1), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C2), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C3), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C4), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C5), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C6), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C7), baytrail },

	{ PCI_VDEVICE(INTEL, 0x22C1), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C2), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C3), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C4), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C5), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C6), cherrytrail },

	{ PCI_VDEVICE(INTEL, 0x22C7), cherrytrail },

	{ 0,}

};

MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids);

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { 
	{ "INT3432", 0 },

	{ "INT3433", 0 },

	{ "80860F41", 0 },

	{ "808622C1", 0 },

	{ "808622C1", MODEL_CHERRYTRAIL },

	{ "AMD0010", ACCESS_INTR_MASK },

	{ "AMDI0010", ACCESS_INTR_MASK },

	{ "AMDI0510", 0 },