aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/am437x-sk-evm.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-06-28 14:44:39 +0200
committerArnd Bergmann <arnd@arndb.de>2020-06-28 14:44:41 +0200
commit8705ed2f725b4d2bcc1c2474a906c9ade0dfa28f (patch)
treeeaff621acb075a9bc415361191037a131ea1c06f /arch/arm/boot/dts/am437x-sk-evm.dts
parentMerge tag 'omap-for-v5.8/fixes-merge-window-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes (diff)
parentARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver (diff)
downloadlinux-dev-8705ed2f725b4d2bcc1c2474a906c9ade0dfa28f.tar.xz
linux-dev-8705ed2f725b4d2bcc1c2474a906c9ade0dfa28f.zip
Merge tag 'omap-for-v5.8/dt-missed-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/omap-fixes
Missed sdhci patch for am3 and am4 I forgot to send a pull request earlier for converting am3 and am4 to use sdhci-omap driver instead of the old omap_hsmmc driver. There was a display subsystem related suspend and resume regression found recently and looks like I forgot to send a pull request for this patch while debugging the regression. This patch has been tested without the display subsystem, and has been in Linux next for several weeks now, so would be good to have merged for v5.8. * tag 'omap-for-v5.8/dt-missed-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver Link: https://lore.kernel.org/r/pull-1591637467-607254@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/am437x-sk-evm.dts')
-rw-r--r--arch/arm/boot/dts/am437x-sk-evm.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 6c83812407bf..08eabf0f3cbd 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -703,7 +703,7 @@
pinctrl-1 = <&mmc3_pins_sleep>;
cap-power-off-card;
keep-power-in-suspend;
- ti,non-removable;
+ non-removable;
#address-cells = <1>;
#size-cells = <0>;