summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-12-26 15:43:11 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-12-26 15:43:11 +0000
commit4e8320d2ecc473d29da41f669b59c0ab463cb70a (patch)
treecd1e3a9f221a5fbe7090af69eabd11bcb28e17d3
parentd56daa1f7e4e9d6e9fc16e65864b671971708009 (diff)
downloadrockbox-4e8320d2ecc473d29da41f669b59c0ab463cb70a.tar.gz
rockbox-4e8320d2ecc473d29da41f669b59c0ab463cb70a.zip
i.MX31: Rename something
Might as well rename spi_enable_module to spi_enable_node for consistency as well so long as I'm being picky. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31442 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c2
-rw-r--r--firmware/target/arm/imx31/mc13783-imx31.c4
-rw-r--r--firmware/target/arm/imx31/spi-imx31.c4
-rw-r--r--firmware/target/arm/imx31/spi-imx31.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
index 78d8ba16c3..e20307d61e 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
@@ -116,7 +116,7 @@ static void lcd_write_reg(unsigned reg, unsigned val)
116 116
117static void lcd_enable_interface(bool enable) 117static void lcd_enable_interface(bool enable)
118{ 118{
119 spi_enable_module(&lcd_spi_node, enable); 119 spi_enable_node(&lcd_spi_node, enable);
120} 120}
121 121
122static void lcd_set_power(bool powered) 122static void lcd_set_power(bool powered)
diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c
index 94021ac049..01690f0def 100644
--- a/firmware/target/arm/imx31/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/mc13783-imx31.c
@@ -139,7 +139,7 @@ void INIT_ATTR mc13783_init(void)
139 semaphore_init(&mc13783_svc_wake, 1, 0); 139 semaphore_init(&mc13783_svc_wake, 1, 0);
140 140
141 /* Enable the PMIC SPI module */ 141 /* Enable the PMIC SPI module */
142 spi_enable_module(&mc13783_spi, true); 142 spi_enable_node(&mc13783_spi, true);
143 143
144 /* Mask any PMIC interrupts for now - modules will enable them as 144 /* Mask any PMIC interrupts for now - modules will enable them as
145 * required */ 145 * required */
@@ -164,7 +164,7 @@ void mc13783_close(void)
164 mc13783_thread_id = 0; 164 mc13783_thread_id = 0;
165 semaphore_release(&mc13783_svc_wake); 165 semaphore_release(&mc13783_svc_wake);
166 thread_wait(thread_id); 166 thread_wait(thread_id);
167 spi_enable_module(&mc13783_spi, false); 167 spi_enable_node(&mc13783_spi, false);
168} 168}
169 169
170bool mc13783_enable_event(enum mc13783_event_ids id) 170bool mc13783_enable_event(enum mc13783_event_ids id)
diff --git a/firmware/target/arm/imx31/spi-imx31.c b/firmware/target/arm/imx31/spi-imx31.c
index 076ce7cd7b..34dac9b6a7 100644
--- a/firmware/target/arm/imx31/spi-imx31.c
+++ b/firmware/target/arm/imx31/spi-imx31.c
@@ -354,8 +354,8 @@ void INIT_ATTR spi_init(void)
354 } 354 }
355} 355}
356 356
357/* Enable or disable the specified module for the node */ 357/* Enable or disable the node - modules will be switch on/off accordingly. */
358void spi_enable_module(const struct spi_node *node, bool enable) 358void spi_enable_node(const struct spi_node *node, bool enable)
359{ 359{
360 struct spi_module_desc * const desc = &spi_descs[node->num]; 360 struct spi_module_desc * const desc = &spi_descs[node->num];
361 361
diff --git a/firmware/target/arm/imx31/spi-imx31.h b/firmware/target/arm/imx31/spi-imx31.h
index 215093733b..6d07165d3d 100644
--- a/firmware/target/arm/imx31/spi-imx31.h
+++ b/firmware/target/arm/imx31/spi-imx31.h
@@ -74,8 +74,8 @@ struct spi_transfer_desc
74/* One-time init of SPI driver */ 74/* One-time init of SPI driver */
75void spi_init(void); 75void spi_init(void);
76 76
77/* Enable or disable the specified module for the node */ 77/* Enable or disable the node - modules will be switch on/off accordingly. */
78void spi_enable_module(const struct spi_node *node, bool enable); 78void spi_enable_node(const struct spi_node *node, bool enable);
79 79
80/* Send and/or receive data on the specified node (asychronous) */ 80/* Send and/or receive data on the specified node (asychronous) */
81bool spi_transfer(struct spi_transfer_desc *xfer); 81bool spi_transfer(struct spi_transfer_desc *xfer);