Skip to content

Commit 7474367

Browse files
ryan-wannernoglitch
authored andcommitted
ARM: at91: pm: Remove 2.5V regulator
Remove 2.5V regulator since enabling and disabling this regulator is no longer supported. Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> Link: https://lore.kernel.org/r/a6785a40648b315a07152bca261a42bbf0f356af.1757519351.git.Ryan.Wanner@microchip.com Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
1 parent 3cae7d1 commit 7474367

2 files changed

Lines changed: 0 additions & 36 deletions

File tree

arch/arm/mach-at91/pm_suspend.S

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,6 @@ tmp3 .req r6
8787

8888
.endm
8989

90-
/**
91-
* Set state for 2.5V low power regulator
92-
* @ena: 0 - disable regulator
93-
* 1 - enable regulator
94-
*
95-
* Side effects: overwrites r7, r8, r9, r10
96-
*/
97-
.macro at91_2_5V_reg_set_low_power ena
98-
#ifdef CONFIG_SOC_SAMA7
99-
ldr r7, .sfrbu
100-
mov r8, #\ena
101-
ldr r9, [r7, #AT91_SFRBU_25LDOCR]
102-
orr r9, r9, #AT91_SFRBU_25LDOCR_LP
103-
cmp r8, #1
104-
beq lp_done_\ena
105-
bic r9, r9, #AT91_SFRBU_25LDOCR_LP
106-
lp_done_\ena:
107-
ldr r10, =AT91_SFRBU_25LDOCR_LDOANAKEY
108-
orr r9, r9, r10
109-
str r9, [r7, #AT91_SFRBU_25LDOCR]
110-
#endif
111-
.endm
112-
11390
.macro at91_backup_set_lpm reg
11491
#ifdef CONFIG_SOC_SAMA7
11592
orr \reg, \reg, #0x200000
@@ -1023,9 +1000,6 @@ save_mck:
10231000

10241001
at91_plla_disable
10251002

1026-
/* Enable low power mode for 2.5V regulator. */
1027-
at91_2_5V_reg_set_low_power 1
1028-
10291003
ldr tmp3, .pm_mode
10301004
cmp tmp3, #AT91_PM_ULP1
10311005
beq ulp1_mode
@@ -1038,9 +1012,6 @@ ulp1_mode:
10381012
b ulp_exit
10391013

10401014
ulp_exit:
1041-
/* Disable low power mode for 2.5V regulator. */
1042-
at91_2_5V_reg_set_low_power 0
1043-
10441015
ldr pmc, .pmc_base
10451016

10461017
at91_plla_enable

include/soc/at91/sama7-sfrbu.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
#define AT91_SFRBU_PSWBU_SOFTSWITCH (1 << 1) /* Power switch BU source selection */
1919
#define AT91_SFRBU_PSWBU_CTRL (1 << 0) /* Power switch BU control */
2020

21-
#define AT91_SFRBU_25LDOCR (0x0C) /* SFRBU 2.5V LDO Control Register */
22-
#define AT91_SFRBU_25LDOCR_LDOANAKEY (0x3B6E18 << 8) /* Specific value mandatory to allow writing of other register bits. */
23-
#define AT91_SFRBU_25LDOCR_STATE (1 << 3) /* LDOANA Switch On/Off Control */
24-
#define AT91_SFRBU_25LDOCR_LP (1 << 2) /* LDOANA Low-Power Mode Control */
25-
#define AT91_SFRBU_PD_VALUE_MSK (0x3)
26-
#define AT91_SFRBU_25LDOCR_PD_VALUE(v) ((v) & AT91_SFRBU_PD_VALUE_MSK) /* LDOANA Pull-down value */
27-
2821
#define AT91_FRBU_DDRPWR (0x10) /* SFRBU DDR Power Control Register */
2922
#define AT91_FRBU_DDRPWR_STATE (1 << 0) /* DDR Power Mode State */
3023

0 commit comments

Comments
 (0)