diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2021-11-18 09:36:39 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-11-18 09:36:39 +0100 |
| commit | a713ca234ea9d946235ac7248995c5fddfd9e523 (patch) | |
| tree | 708f72ee1c76360aa80c926f1defc8301aef1a23 /arch/arm64/boot/dts/ti/k3-am64.dtsi | |
| parent | drm/i915: Clarify probing order in intel_dp_aux_init_backlight_funcs() (diff) | |
| parent | Linux 5.16-rc1 (diff) | |
| download | linux-dev-a713ca234ea9d946235ac7248995c5fddfd9e523.tar.xz linux-dev-a713ca234ea9d946235ac7248995c5fddfd9e523.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging from drm/drm-next for v5.16-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'arch/arm64/boot/dts/ti/k3-am64.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi index de6805b0c72c..120974726be8 100644 --- a/arch/arm64/boot/dts/ti/k3-am64.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi @@ -30,6 +30,8 @@ serial8 = &main_uart6; ethernet0 = &cpsw_port1; ethernet1 = &cpsw_port2; + mmc0 = &sdhci0; + mmc1 = &sdhci1; }; chosen { }; |