diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:01:23 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:02:48 +0200 |
commit | 662394fb30fdbcc89ec387918714aebee6868a9f (patch) | |
tree | c308c5f1a650abf9d9ccbb2a1747469a0d8570c0 /target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch | |
parent | 99a5e285887c4a10aaf06d8e01fae0707995da00 (diff) | |
download | upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.gz upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.bz2 upstream-662394fb30fdbcc89ec387918714aebee6868a9f.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch b/target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch new file mode 100644 index 0000000000..69d2d0b1fc --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch @@ -0,0 +1,45 @@ +From e21f41093b53b3cc3eb6b43a239d75bf4e05d794 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Fri, 11 Jan 2019 17:29:10 -0800 +Subject: [PATCH 555/782] soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain + support. + +We don't have ASB master/slave regs for this domain, so just skip that +step. + +Signed-off-by: Eric Anholt <eric@anholt.net> +Fixes: 670c672608a1 ("soc: bcm: bcm2835-pm: Add support for power domains under a new binding.") +--- + drivers/soc/bcm/bcm2835-power.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/drivers/soc/bcm/bcm2835-power.c ++++ b/drivers/soc/bcm/bcm2835-power.c +@@ -150,7 +150,12 @@ struct bcm2835_power { + + static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) + { +- u64 start = ktime_get_ns(); ++ u64 start; ++ ++ if (!reg) ++ return 0; ++ ++ start = ktime_get_ns(); + + /* Enable the module's async AXI bridges. */ + ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); +@@ -165,7 +170,12 @@ static int bcm2835_asb_enable(struct bcm + + static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) + { +- u64 start = ktime_get_ns(); ++ u64 start; ++ ++ if (!reg) ++ return 0; ++ ++ start = ktime_get_ns(); + + /* Enable the module's async AXI bridges. */ + ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); |