From b5e796d3912e84219d783f2c9c15bfd178821e12 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 25 Jun 2010 20:17:19 +0200 Subject: glamo-core: get rid of unused glamo_reg_{read, write}_batch --- include/linux/mfd/glamo-core.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/linux/mfd/glamo-core.h b/include/linux/mfd/glamo-core.h index 34ec7c4cdf4..ba7c69dce2f 100644 --- a/include/linux/mfd/glamo-core.h +++ b/include/linux/mfd/glamo-core.h @@ -52,9 +52,4 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine); void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine); int glamo_engine_reclock(struct glamo_core *glamo, enum glamo_engine engine, int ps); - -void glamo_reg_read_batch(struct glamo_core *glamo, uint16_t reg, - uint16_t count, uint16_t *values); -void glamo_reg_write_batch(struct glamo_core *glamo, uint16_t reg, - uint16_t count, uint16_t *values); #endif /* __GLAMO_CORE_H */ -- cgit v1.2.3 From 3ab0d545a0b24811883eec3e9b43fa22645f9c17 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 25 Jun 2010 19:39:30 +0200 Subject: glamo-core: use debugfs instead of sysfs for the 'regs' node Use debugfs, which is better-suited than sysfs for the 'regs' node. Also change the expected format from decimal to hexadecimal numbers. --- include/linux/mfd/glamo-core.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/linux/mfd/glamo-core.h b/include/linux/mfd/glamo-core.h index ba7c69dce2f..8275a2fae50 100644 --- a/include/linux/mfd/glamo-core.h +++ b/include/linux/mfd/glamo-core.h @@ -37,6 +37,9 @@ struct glamo_core { enum glamo_engine_state engine_state[__NUM_GLAMO_ENGINES]; spinlock_t lock; uint16_t saved_irq_mask; +#ifdef CONFIG_DEBUG_FS + struct dentry *debugfs_dir; +#endif }; struct glamo_script { -- cgit v1.2.3 From faf54999d2394156868b8b21280f1ff4b62a7d66 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 30 Jun 2010 19:02:05 +0200 Subject: glamo-mci: add a "nonremovable" field to glamo_mmc_platform_data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On the FR, the µSD can't be removed without removing the battery first. So, we can safely assume that the µSD is not removable. This patch make the MMC subsystem know that the card isn't removable if the new "nonremovable" field in the platform data is true. This affects, amongst other things, the suspend/resume process, the default behaviour being to remove the card (after syncind any mounted FS) on suspend, and re-detect it on resume, to prevent errors when removing the card while the device is suspended. --- include/linux/mfd/glamo.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/linux/mfd/glamo.h b/include/linux/mfd/glamo.h index 529d4f07f03..ae52f3d4960 100644 --- a/include/linux/mfd/glamo.h +++ b/include/linux/mfd/glamo.h @@ -8,6 +8,8 @@ struct glamo_fb_platform_data; struct glamo_mmc_platform_data { int (*glamo_mmc_use_slow)(void); + unsigned nonremovable:1; + struct glamo_core *core; }; -- cgit v1.2.3