summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-12-12 22:47:37 +0100
committerArnd Bergmann <arnd@arndb.de>2020-12-12 22:47:39 +0100
commit062fa6b8ef153b9509d2a870049e907ad0a39639 (patch)
tree6a860190377c05fae51ae808ea808cf277571285 /arch/arm/boot/dts
parent43ffe817bfe3871ffbaa1e98952a2a01b140e71e (diff)
parentc0bc969c176b10598b31d5d1a5edf9a5261f0a9f (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/omap3-n950-n9.dtsi8
1 files changed, 8 insertions, 0 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";
+};