diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-12 22:47:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-12 22:47:39 +0100 |
| commit | 062fa6b8ef153b9509d2a870049e907ad0a39639 (patch) | |
| tree | 6a860190377c05fae51ae808ea808cf277571285 | |
| parent | arm64: dts: bitmain: Use generic "ngpios" rather than "snps,nr-gpios" (diff) | |
| parent | ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on... (diff) | |
| download | linux-062fa6b8ef153b9509d2a870049e907ad0a39639.tar.xz linux-062fa6b8ef153b9509d2a870049e907ad0a39639.zip | |
Merge tag 'omap-for-v5.10/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Few regression fixes for omaps for v5.10
Few fixes for regression issues recently noticed by folks testing
the current kernel:
- We need to disable AES for n950 as it's not accessible because of the
secure mode configuration and kernel fails to boot
- On gta04 wlan probe exposed a bug for BUS_NOTIFY_BIND_DRIVER that has
been around for a long time
- Droid bionic exposed an issue where we configure an invalid range on
the PMIC that adds boot time warnings
Obviously these fixes can be merged whenever suitable.
* tag 'omap-for-v5.10/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on xt875
ARM: OMAP2+: omap_device: fix idling of devices during probe
ARM: dts: OMAP3: disable AES on N950/N9
Link: https://lore.kernel.org/r/pull-1607674932-973902@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/omap3-n950-n9.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_device.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pmic-cpcap.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi index 11d41e86f814..7dde9fbb06d3 100644 --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi @@ -494,3 +494,11 @@ clock-names = "sysclk"; }; }; + +&aes1_target { + status = "disabled"; +}; + +&aes2_target { + status = "disabled"; +}; diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index fc7bb2ca1672..64b23b0cd23c 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -230,10 +230,12 @@ static int _omap_device_notifier_call(struct notifier_block *nb, break; case BUS_NOTIFY_BIND_DRIVER: od = to_omap_device(pdev); - if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED) && - pm_runtime_status_suspended(dev)) { + if (od) { od->_driver_status = BUS_NOTIFY_BIND_DRIVER; - pm_runtime_set_active(dev); + if (od->_state == OMAP_DEVICE_STATE_ENABLED && + pm_runtime_status_suspended(dev)) { + pm_runtime_set_active(dev); + } } break; case BUS_NOTIFY_ADD_DEVICE: diff --git a/arch/arm/mach-omap2/pmic-cpcap.c b/arch/arm/mach-omap2/pmic-cpcap.c index eab281a5fc9f..09076ad0576d 100644 --- a/arch/arm/mach-omap2/pmic-cpcap.c +++ b/arch/arm/mach-omap2/pmic-cpcap.c @@ -71,7 +71,7 @@ static struct omap_voltdm_pmic omap_cpcap_iva = { .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, .vddmin = 900000, - .vddmax = 1350000, + .vddmax = 1375000, .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, .i2c_slave_addr = 0x44, .volt_reg_addr = 0x0, |