phy: marvell: core: Cosmetic fixes

[oweals/u-boot.git] / drivers / phy / marvell / comphy.h

diff --git a/drivers/phy/marvell/comphy.h b/drivers/phy/marvell/comphy.h
index b4027778be0b06bc09f27ca0a6a9cc435ab6c4d3..b588ae41f00391ea6ccfaa80ee6cf32cdacc798d 100644 (file)
--- a/drivers/phy/marvell/comphy.h
+++ b/drivers/phy/marvell/comphy.h
@@ -101,10 +101,43 @@ struct chip_serdes_phy_config {
 };
 
 /* Register helper functions */
-void reg_set(void __iomem *addr, u32 data, u32 mask);
-void reg_set_silent(void __iomem *addr, u32 data, u32 mask);
-void reg_set16(void __iomem *addr, u16 data, u16 mask);
-void reg_set_silent16(void __iomem *addr, u16 data, u16 mask);
+static inline void reg_set_silent(void __iomem *addr, u32 data, u32 mask)
+{
+       u32 reg_data;
+
+       reg_data = readl(addr);
+       reg_data &= ~mask;
+       reg_data |= data;
+       writel(reg_data, addr);
+}
+
+static inline void reg_set(void __iomem *addr, u32 data, u32 mask)
+{
+       debug("Write to address = %#010lx, data = %#010x (mask = %#010x) - ",
+             (unsigned long)addr, data, mask);
+       debug("old value = %#010x ==> ", readl(addr));
+       reg_set_silent(addr, data, mask);
+       debug("new value %#010x\n", readl(addr));
+}
+
+static inline void reg_set_silent16(void __iomem *addr, u16 data, u16 mask)
+{
+       u16 reg_data;
+
+       reg_data = readw(addr);
+       reg_data &= ~mask;
+       reg_data |= data;
+       writew(reg_data, addr);
+}
+
+static inline void reg_set16(void __iomem *addr, u16 data, u16 mask)
+{
+       debug("Write to address = %#010lx, data = %#06x (mask = %#06x) - ",
+             (unsigned long)addr, data, mask);
+       debug("old value = %#06x ==> ", readw(addr));
+       reg_set_silent16(addr, data, mask);
+       debug("new value %#06x\n", readw(addr));
+}
 
 /* SoC specific init functions */
 #ifdef CONFIG_ARMADA_3700