summaryrefslogtreecommitdiff
path: root/src/soc/rockchip
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2015-02-19 14:08:04 -0800
committerPatrick Georgi <pgeorgi@google.com>2015-04-21 08:21:15 +0200
commitd21a329866a1299b180f8b14b6c73bee3d754e57 (patch)
tree499483d184466d1aa71af356d46b6ab8c73b3082 /src/soc/rockchip
parent24f94765311429d937befb4bebe1632eb683fd2c (diff)
arm(64): Replace write32() and friends with writel()
This patch is a raw application of the following spatch to the directories src/arch/arm(64)?, src/mainboard/<arm(64)-board>, src/soc/<arm(64)-soc> and src/drivers/gic: @@ expression A, V; @@ - write32(V, A) + writel(V, A) @@ expression A, V; @@ - write16(V, A) + writew(V, A) @@ expression A, V; @@ - write8(V, A) + writeb(V, A) This replaces all uses of write{32,16,8}() with write{l,w,b}() which is currently equivalent and much more common. This is a preparatory step that will allow us to easier flip them all at once to the new write32(a,v) model. BRANCH=none BUG=chromium:451388 TEST=Compiled Cosmos, Daisy, Blaze, Pit, Ryu, Storm and Pinky. Change-Id: I16016cd77780e7cadbabe7d8aa7ab465b95b8f09 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 93f0ada19b429b4e30d67335b4e61d0f43597b24 Original-Change-Id: I1ac01c67efef4656607663253ed298ff4d0ef89d Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/254862 Reviewed-on: http://review.coreboot.org/9834 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/soc/rockchip')
-rw-r--r--src/soc/rockchip/rk3288/crypto.c20
-rw-r--r--src/soc/rockchip/rk3288/timer.c6
2 files changed, 13 insertions, 13 deletions
diff --git a/src/soc/rockchip/rk3288/crypto.c b/src/soc/rockchip/rk3288/crypto.c
index 60bfa42451..20fd60a474 100644
--- a/src/soc/rockchip/rk3288/crypto.c
+++ b/src/soc/rockchip/rk3288/crypto.c
@@ -80,17 +80,17 @@ int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg,
return VB2_ERROR_EX_HWCRYPTO_UNSUPPORTED;
}
- write32(RK_SETBITS(1 << 6), &crypto->ctrl); /* Assert HASH_FLUSH */
+ writel(RK_SETBITS(1 << 6), &crypto->ctrl); /* Assert HASH_FLUSH */
udelay(1); /* for 10+ cycles to */
- write32(RK_CLRBITS(1 << 6), &crypto->ctrl); /* clear out old hash */
+ writel(RK_CLRBITS(1 << 6), &crypto->ctrl); /* clear out old hash */
/* Enable DMA byte swapping for little-endian bus (Byteswap_??FIFO) */
- write32(1 << 5 | 1 << 4 | 1 << 3, &crypto->conf);
+ writel(1 << 5 | 1 << 4 | 1 << 3, &crypto->conf);
- write32(HRDMA_ERR | HRDMA_DONE, &crypto->intena); /* enable interrupt */
+ writel(HRDMA_ERR | HRDMA_DONE, &crypto->intena); /* enable interrupt */
- write32(data_size, &crypto->hash_msg_len); /* program total size */
- write32(1 << 3 | 0x2, &crypto->hash_ctrl); /* swap DOUT, SHA256 */
+ writel(data_size, &crypto->hash_msg_len); /* program total size */
+ writel(1 << 3 | 0x2, &crypto->hash_ctrl); /* swap DOUT, SHA256 */
printk(BIOS_DEBUG, "Initialized RK3288 HW crypto for %u byte SHA256\n",
data_size);
@@ -101,12 +101,12 @@ int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size)
{
uint32_t intsts;
- write32(HRDMA_ERR | HRDMA_DONE, &crypto->intsts); /* clear interrupts */
+ writel(HRDMA_ERR | HRDMA_DONE, &crypto->intsts); /* clear interrupts */
/* NOTE: This assumes that the DMA is reading from uncached SRAM. */
- write32((uint32_t)buf, &crypto->hrdmas);
- write32(size / sizeof(uint32_t), &crypto->hrdmal);
- write32(RK_SETBITS(1 << 3), &crypto->ctrl); /* Set HASH_START */
+ writel((uint32_t)buf, &crypto->hrdmas);
+ writel(size / sizeof(uint32_t), &crypto->hrdmal);
+ writel(RK_SETBITS(1 << 3), &crypto->ctrl); /* Set HASH_START */
do {
intsts = read32(&crypto->intsts);
if (intsts & HRDMA_ERR) {
diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c
index 253d145b44..d373f7a39c 100644
--- a/src/soc/rockchip/rk3288/timer.c
+++ b/src/soc/rockchip/rk3288/timer.c
@@ -41,7 +41,7 @@ void timer_monotonic_get(struct mono_time *mt)
void init_timer(void)
{
- write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count0);
- write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count1);
- write32(1, &timer7_ptr->timer_ctrl_reg);
+ writel(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count0);
+ writel(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count1);
+ writel(1, &timer7_ptr->timer_ctrl_reg);
}