((val) << (shift) | (mask) << ((shift) + 16))
 
 /* Register definition */
-#define GRF_EMMCPHY_CON0       0x0
-#define GRF_EMMCPHY_CON1       0x4
-#define GRF_EMMCPHY_CON2       0x8
-#define GRF_EMMCPHY_CON3       0xc
-#define GRF_EMMCPHY_CON4       0x10
-#define GRF_EMMCPHY_CON5       0x14
-#define GRF_EMMCPHY_CON6       0x18
-#define GRF_EMMCPHY_STATUS     0x20
-
-#define PHYCTRL_PDB_MASK       0x1
-#define PHYCTRL_PDB_SHIFT      0x0
-#define PHYCTRL_PDB_PWR_ON     0x1
-#define PHYCTRL_PDB_PWR_OFF    0x0
-#define PHYCTRL_ENDLL_MASK     0x1
-#define PHYCTRL_ENDLL_SHIFT     0x1
-#define PHYCTRL_ENDLL_ENABLE   0x1
-#define PHYCTRL_ENDLL_DISABLE  0x0
-#define PHYCTRL_CALDONE_MASK   0x1
-#define PHYCTRL_CALDONE_SHIFT   0x6
-#define PHYCTRL_CALDONE_DONE   0x1
-#define PHYCTRL_CALDONE_GOING  0x0
-#define PHYCTRL_DLLRDY_MASK    0x1
-#define PHYCTRL_DLLRDY_SHIFT   0x5
-#define PHYCTRL_DLLRDY_DONE    0x1
-#define PHYCTRL_DLLRDY_GOING   0x0
-#define PHYCTRL_FREQSEL_200M   0x0
-#define PHYCTRL_FREQSEL_50M    0x1
-#define PHYCTRL_FREQSEL_100M   0x2
-#define PHYCTRL_FREQSEL_150M   0x3
-#define PHYCTRL_FREQSEL_MASK   0x3
-#define PHYCTRL_FREQSEL_SHIFT  0xc
-#define PHYCTRL_DR_MASK                0x7
-#define PHYCTRL_DR_SHIFT       0x4
-#define PHYCTRL_DR_50OHM       0x0
-#define PHYCTRL_DR_33OHM       0x1
-#define PHYCTRL_DR_66OHM       0x2
-#define PHYCTRL_DR_100OHM      0x3
-#define PHYCTRL_DR_40OHM       0x4
+#define GRF_EMMCPHY_CON0               0x0
+#define GRF_EMMCPHY_CON1               0x4
+#define GRF_EMMCPHY_CON2               0x8
+#define GRF_EMMCPHY_CON3               0xc
+#define GRF_EMMCPHY_CON4               0x10
+#define GRF_EMMCPHY_CON5               0x14
+#define GRF_EMMCPHY_CON6               0x18
+#define GRF_EMMCPHY_STATUS             0x20
+
+#define PHYCTRL_PDB_MASK               0x1
+#define PHYCTRL_PDB_SHIFT              0x0
+#define PHYCTRL_PDB_PWR_ON             0x1
+#define PHYCTRL_PDB_PWR_OFF            0x0
+#define PHYCTRL_ENDLL_MASK             0x1
+#define PHYCTRL_ENDLL_SHIFT            0x1
+#define PHYCTRL_ENDLL_ENABLE           0x1
+#define PHYCTRL_ENDLL_DISABLE          0x0
+#define PHYCTRL_CALDONE_MASK           0x1
+#define PHYCTRL_CALDONE_SHIFT          0x6
+#define PHYCTRL_CALDONE_DONE           0x1
+#define PHYCTRL_CALDONE_GOING          0x0
+#define PHYCTRL_DLLRDY_MASK            0x1
+#define PHYCTRL_DLLRDY_SHIFT           0x5
+#define PHYCTRL_DLLRDY_DONE            0x1
+#define PHYCTRL_DLLRDY_GOING           0x0
+#define PHYCTRL_FREQSEL_200M           0x0
+#define PHYCTRL_FREQSEL_50M            0x1
+#define PHYCTRL_FREQSEL_100M           0x2
+#define PHYCTRL_FREQSEL_150M           0x3
+#define PHYCTRL_FREQSEL_MASK           0x3
+#define PHYCTRL_FREQSEL_SHIFT          0xc
+#define PHYCTRL_DR_MASK                        0x7
+#define PHYCTRL_DR_SHIFT               0x4
+#define PHYCTRL_DR_50OHM               0x0
+#define PHYCTRL_DR_33OHM               0x1
+#define PHYCTRL_DR_66OHM               0x2
+#define PHYCTRL_DR_100OHM              0x3
+#define PHYCTRL_DR_40OHM               0x4
 #define PHYCTRL_OTAPDLYENA             0x1
 #define PHYCTRL_OTAPDLYENA_MASK                0x1
 #define PHYCTRL_OTAPDLYENA_SHIFT       0xb