UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

soc: bcm: bcm2835-power: Refactor ASB control 

The functions to control the async AXI bridges are almost identical.
So define a general function to handle it and keep the original ones as
wrapper. This should make this driver easier to extend.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220625113619.15944-9-stefan.wahren@i2se.com
This commit is contained in:
Stefan Wahren 2022-06-25 13:36:16 +02:00 committed by Lee Jones
parent df76234276
commit c494a447c1
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/soc/bcm/bcm2835-power.c
View File

@ -148,7 +148,7 @@ struct bcm2835_power {
struct reset_controller_dev reset; struct reset_controller_dev reset;
}; };
static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable)
{ {
u64 start; u64 start;
@ -158,7 +158,12 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)
start = ktime_get_ns(); start = ktime_get_ns();
/* Enable the module's async AXI bridges. */ /* Enable the module's async AXI bridges. */
if (enable) {
ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP);
} else {
ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP);
}
while (ASB_READ(reg) & ASB_ACK) { while (ASB_READ(reg) & ASB_ACK) {
cpu_relax(); cpu_relax();
if (ktime_get_ns() - start >= 1000) if (ktime_get_ns() - start >= 1000)
@ -168,24 +173,14 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)
return 0; return 0;
} }
static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)
{ {
u64 start; return bcm2835_asb_control(power, reg, true);
if (!reg)
return 0;
start = ktime_get_ns();
/* Enable the module's async AXI bridges. */
ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP);
while (!(ASB_READ(reg) & ASB_ACK)) {
cpu_relax();
if (ktime_get_ns() - start >= 1000)
return -ETIMEDOUT;
} }
return 0; static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg)
{
return bcm2835_asb_control(power, reg, false);
} }
static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg) static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg)