Skip to content

Commit b68c991

Browse files
author
Alison Wang
committed
armv8: fsl-layerscape: Fix some coding style problems in soc.c
This file has some coding style problems. Fix these to make the future updates easier. Signed-off-by: Alison Wang <alison.wang@nxp.com>
1 parent 25cd705 commit b68c991

File tree

1 file changed

+33
-25
lines changed
  • arch/arm/cpu/armv8/fsl-layerscape

1 file changed

+33
-25
lines changed

arch/arm/cpu/armv8/fsl-layerscape/soc.c

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2014-2017 Freescale Semiconductor
2+
* Copyright 2014-2015 Freescale Semiconductor, Inc.
3+
* Copyright 2017 NXP
34
*
45
* SPDX-License-Identifier: GPL-2.0+
56
*/
@@ -33,26 +34,31 @@ static void erratum_a009008(void)
3334
#ifdef CONFIG_SYS_FSL_ERRATUM_A009008
3435
#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) || \
3536
defined(CONFIG_ARCH_LS1012A)
36-
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
37-
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB1 / 4);
38-
val &= ~(0xF << 6);
39-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB1 / 4, val|(USB_TXVREFTUNE << 6));
37+
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
38+
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB1 / 4);
39+
40+
val &= ~(0xF << 6);
41+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB1 / 4,
42+
val | (USB_TXVREFTUNE << 6));
4043
#endif
4144

4245
#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
43-
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB2 / 4);
44-
val &= ~(0xF << 6);
45-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB2 / 4, val|(USB_TXVREFTUNE << 6));
46-
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB3 / 4);
47-
val &= ~(0xF << 6);
48-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB3 / 4, val|(USB_TXVREFTUNE << 6));
46+
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB2 / 4);
47+
val &= ~(0xF << 6);
48+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB2 / 4,
49+
val | (USB_TXVREFTUNE << 6));
50+
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB3 / 4);
51+
val &= ~(0xF << 6);
52+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB3 / 4,
53+
val | (USB_TXVREFTUNE << 6));
4954
#endif
5055

5156
#if defined(CONFIG_ARCH_LS2080A)
52-
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
53-
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR / 4);
54-
val &= ~(0xF << 6);
55-
scfg_out32(scfg + SCFG_USB3PRM1CR / 4, val|(USB_TXVREFTUNE << 6));
57+
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
58+
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR / 4);
59+
60+
val &= ~(0xF << 6);
61+
scfg_out32(scfg + SCFG_USB3PRM1CR / 4, val | (USB_TXVREFTUNE << 6));
5662
#endif
5763
#endif /* CONFIG_SYS_FSL_ERRATUM_A009008 */
5864
}
@@ -63,22 +69,24 @@ static void erratum_a009798(void)
6369
#ifdef CONFIG_SYS_FSL_ERRATUM_A009798
6470
#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) || \
6571
defined(CONFIG_ARCH_LS1012A)
66-
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
67-
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB1 / 4);
68-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB1 / 4 , val & USB_SQRXTUNE);
72+
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
73+
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB1 / 4);
74+
75+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB1 / 4, val & USB_SQRXTUNE);
6976
#endif
7077

7178
#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
72-
val = gur_in32(scfg + SCFG_USB3PRM1CR_USB2 / 4);
73-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB2 / 4 , val & USB_SQRXTUNE);
74-
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB3 / 4);
75-
scfg_out32(scfg + SCFG_USB3PRM1CR_USB3 / 4 , val & USB_SQRXTUNE);
79+
val = gur_in32(scfg + SCFG_USB3PRM1CR_USB2 / 4);
80+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB2 / 4, val & USB_SQRXTUNE);
81+
val = scfg_in32(scfg + SCFG_USB3PRM1CR_USB3 / 4);
82+
scfg_out32(scfg + SCFG_USB3PRM1CR_USB3 / 4, val & USB_SQRXTUNE);
7683
#endif
7784

7885
#if defined(CONFIG_ARCH_LS2080A)
79-
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
80-
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR / 4);
81-
scfg_out32(scfg + SCFG_USB3PRM1CR / 4, val & USB_SQRXTUNE);
86+
u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE;
87+
u32 val = scfg_in32(scfg + SCFG_USB3PRM1CR / 4);
88+
89+
scfg_out32(scfg + SCFG_USB3PRM1CR / 4, val & USB_SQRXTUNE);
8290
#endif
8391
#endif /* CONFIG_SYS_FSL_ERRATUM_A009798 */
8492
}

0 commit comments

Comments
 (0)