From 71b3c043fe2d45dd430c8d37c17fa5ab45a764eb Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 6 Mar 2018 17:40:02 -0800 Subject: [PATCH] ANDROID: pdev_bus: replace writel with gf_write_ptr We introduced a function that calls writel inside to simplify 64bit support. Bug: 72886167 Change-Id: I987891e0b331a0e205da4bbf4ee98c19edf087b7 Signed-off-by: Roman Kiryanov --- drivers/platform/goldfish/pdev_bus.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index dd9ea463c2a4..56ff307b02a6 100644 --- a/drivers/platform/goldfish/pdev_bus.c +++ b/drivers/platform/goldfish/pdev_bus.c @@ -130,10 +130,9 @@ static int goldfish_new_pdev(void) dev->pdev.dev.dma_mask = (void *)(dev->pdev.name + name_len + 1); *dev->pdev.dev.dma_mask = ~0; -#ifdef CONFIG_64BIT - writel((u32)((u64)name>>32), pdev_bus_base + PDEV_BUS_GET_NAME_HIGH); -#endif - writel((u32)(unsigned long)name, pdev_bus_base + PDEV_BUS_GET_NAME); + gf_write_ptr(name, pdev_bus_base + PDEV_BUS_GET_NAME, + pdev_bus_base + PDEV_BUS_GET_NAME_HIGH); + name[name_len] = '\0'; dev->pdev.id = readl(pdev_bus_base + PDEV_BUS_ID); dev->pdev.resource[0].start = base;