mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 01:49:36 +00:00
Code Issues Releases Wiki Activity

media: staging: atomisp: Remove dead code for MID (#1)

Browse source 
Remove dead code. If someone needs it the P-Unit semaphore is handled by
I2C DesignWare driver (drivers/i2c/busses/i2c-designware-baytrail.c).

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Andy Shevchenko 2017-09-01 09:36:34 -04:00 committed by Mauro Carvalho Chehab
parent d13f47c2a2
commit 5fc90b632e
2 changed files with 0 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
View file

@ -33,5 +33,3 @@ void intel_mid_msgbus_write32(u8 port, u32 addr, u32 data);
u32 intel_mid_msgbus_read32_raw_ext(u32 cmd, u32 cmd_ext);
void intel_mid_msgbus_write32_raw_ext(u32 cmd, u32 cmd_ext, u32 data);
u32 intel_mid_soc_stepping(void);
int intel_mid_dw_i2c_acquire_ownership(void);
int intel_mid_dw_i2c_release_ownership(void);

101
drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
View file

@ -14,13 +14,6 @@
#define INTEL_ATOM_BYT 0x37
#define INTEL_ATOM_MOORFLD 0x5a
#define INTEL_ATOM_CHT 0x4c
/* synchronization for sharing the I2C controller */
#define PUNIT_PORT 0x04
#define PUNIT_DOORBELL_OPCODE (0xE0)
#define PUNIT_DOORBELL_REG (0x0)
#ifndef CSTATE_EXIT_LATENCY
#define CSTATE_EXIT_LATENCY_C1 1
#endif
static inline int platform_is(u8 model)
{
return (boot_cpu_data.x86_model == model);
@ -201,97 +194,3 @@ static void pci_d3_delay_fixup(struct pci_dev *dev)
}
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3_delay_fixup);
#define PUNIT_SEMAPHORE (platform_is(INTEL_ATOM_BYT) ? 0x7 : 0x10E)
#define GET_SEM() (intel_mid_msgbus_read32(PUNIT_PORT, PUNIT_SEMAPHORE) & 0x1)
static void reset_semaphore(void)
{
u32 data;
data = intel_mid_msgbus_read32(PUNIT_PORT, PUNIT_SEMAPHORE);
smp_mb();
data = data & 0xfffffffc;
intel_mid_msgbus_write32(PUNIT_PORT, PUNIT_SEMAPHORE, data);
smp_mb();
}
int intel_mid_dw_i2c_acquire_ownership(void)
{
u32 ret = 0;
u32 data = 0; /* data sent to PUNIT */
u32 cmd;
u32 cmdext;
int timeout = 1000;
if (DW_I2C_NEED_QOS)
pm_qos_update_request(&pm_qos, CSTATE_EXIT_LATENCY_C1 - 1);
/*
* We need disable irq. Otherwise, the main thread
* might be preempted and the other thread jumps to
* disable irq for a long time. Another case is
* some irq handlers might trigger power voltage change
*/
BUG_ON(irqs_disabled());
local_irq_disable();
/* host driver writes 0x2 to side band register 0x7 */
intel_mid_msgbus_write32(PUNIT_PORT, PUNIT_SEMAPHORE, 0x2);
smp_mb();
/* host driver sends 0xE0 opcode to PUNIT and writes 0 register */
cmd = (PUNIT_DOORBELL_OPCODE << 24) | (PUNIT_PORT << 16) |
((PUNIT_DOORBELL_REG & 0xFF) << 8) | PCI_ROOT_MSGBUS_DWORD_ENABLE;
cmdext = PUNIT_DOORBELL_REG & 0xffffff00;
if (cmdext)
intel_mid_msgbus_write32_raw_ext(cmd, cmdext, data);
else
intel_mid_msgbus_write32_raw(cmd, data);
/* host driver waits for bit 0 to be set in side band 0x7 */
while (GET_SEM() != 0x1) {
udelay(100);
timeout--;
if (timeout <= 0) {
pr_err("Timeout: semaphore timed out, reset sem\n");
ret = -ETIMEDOUT;
reset_semaphore();
/*Delay 1ms in case race with punit*/
udelay(1000);
if (GET_SEM() != 0) {
/*Reset again as kernel might race with punit*/
reset_semaphore();
}
pr_err("PUNIT SEM: %d\n",
intel_mid_msgbus_read32(PUNIT_PORT,
PUNIT_SEMAPHORE));
local_irq_enable();
if (DW_I2C_NEED_QOS) {
pm_qos_update_request(&pm_qos,
PM_QOS_DEFAULT_VALUE);
}
return ret;
}
}
smp_mb();
return ret;
}
EXPORT_SYMBOL(intel_mid_dw_i2c_acquire_ownership);
int intel_mid_dw_i2c_release_ownership(void)
{
reset_semaphore();
local_irq_enable();
if (DW_I2C_NEED_QOS)
pm_qos_update_request(&pm_qos, PM_QOS_DEFAULT_VALUE);
return 0;
}
EXPORT_SYMBOL(intel_mid_dw_i2c_release_ownership);