[PATCH 1/2] leds: bcm6328: improve write and read functions
From: Álvaro Fernández Rojas <hidden>
Date: 2021-02-23 08:18:37
Also in:
lkml
Subsystem:
led subsystem, the rest · Maintainers:
Lee Jones, Pavel Machek, Linus Torvalds
This is proven to work in BMIPS BE/LE and ARM BE/LE, as used in bcm2835-rng and bcmgenet drivers. Both should also be inline functions. Signed-off-by: Álvaro Fernández Rojas <redacted> --- drivers/leds/leds-bcm6328.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c
index 226d17d253ed..112c9c858432 100644
--- a/drivers/leds/leds-bcm6328.c
+++ b/drivers/leds/leds-bcm6328.c@@ -75,22 +75,23 @@ struct bcm6328_led { bool active_low; }; -static void bcm6328_led_write(void __iomem *reg, unsigned long data) +static inline void bcm6328_led_write(void __iomem *reg, unsigned long data) { -#ifdef CONFIG_CPU_BIG_ENDIAN - iowrite32be(data, reg); -#else - writel(data, reg); -#endif + /* MIPS chips strapped for BE will automagically configure the + * peripheral registers for CPU-native byte order. + */ + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + __raw_writel(data, reg); + else + writel_relaxed(data, reg); } -static unsigned long bcm6328_led_read(void __iomem *reg) +static inline unsigned long bcm6328_led_read(void __iomem *reg) { -#ifdef CONFIG_CPU_BIG_ENDIAN - return ioread32be(reg); -#else - return readl(reg); -#endif + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + return __raw_readl(reg); + else + return readl_relaxed(reg); } /**
--
2.20.1