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

Commit 42c2544b authored by Alan Cox's avatar Alan Cox Committed by Samuel Ortiz
Browse files

x86, mrst: Some drivers need to known when an SCU is available 



Add a notifier so that drivers can hook into SCU availability in order to
take actions post initialisation when/if the SCU becomes available.

In the ideal world we wouldn't need this and we could avoid any init
dependancies of this form, but in practice we can't do it for some cases.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1f5a371c

arch/x86/include/asm/intel_scu_ipc.h

+22 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_INTEL_SCU_IPC_H_

#define  _ASM_X86_INTEL_SCU_IPC_H_



#include <linux/notifier.h>



#define IPCMSG_VRTC	0xFA	 /* Set vRTC device */



/* Command id associated with message IPCMSG_VRTC */
@@ -44,4 +46,24 @@ int intel_scu_ipc_i2c_cntrl(u32 addr, u32 *data); 
/* Update FW version */

int intel_scu_ipc_fw_update(u8 *buffer, u32 length);



extern struct blocking_notifier_head intel_scu_notifier;



static inline void intel_scu_notifier_add(struct notifier_block *nb)

{

	blocking_notifier_chain_register(&intel_scu_notifier, nb);

}



static inline void intel_scu_notifier_remove(struct notifier_block *nb)

{

	blocking_notifier_chain_unregister(&intel_scu_notifier, nb);

}



static inline int intel_scu_notifier_post(unsigned long v, void *p)

{

	return blocking_notifier_call_chain(&intel_scu_notifier, v, p);

}



#define		SCU_AVAILABLE		1

#define		SCU_DOWN		2



#endif

arch/x86/platform/mrst/mrst.c

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/platform_device.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/notifier.h>



#include <asm/setup.h>

#include <asm/mpspec_def.h>
@@ -555,6 +556,9 @@ static void __init intel_scu_i2c_device_register(int bus, 
	i2c_devs[i2c_next_dev++] = new_dev;

}



BLOCKING_NOTIFIER_HEAD(intel_scu_notifier);

EXPORT_SYMBOL_GPL(intel_scu_notifier);



/* Called by IPC driver */

void intel_scu_devices_create(void)

{
@@ -579,6 +583,7 @@ void intel_scu_devices_create(void) 
		} else

			i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);

	}

	intel_scu_notifier_post(SCU_AVAILABLE, 0L);

}

EXPORT_SYMBOL_GPL(intel_scu_devices_create);
@@ -587,6 +592,8 @@ void intel_scu_devices_destroy(void) 
{

	int i;



	intel_scu_notifier_post(SCU_DOWN, 0L);



	for (i = 0; i < ipc_next_dev; i++)

		platform_device_del(ipc_devs[i]);

}