mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-06 01:18:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

Browse Source 
arm64: dts: amlogic updates for v5.9 (round3)
- minor fixes

* tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: fix mmc0 tuning error on Khadas VIM3
  arm64: dts: meson: misc fixups for w400 dtsi

Link: https://lore.kernel.org/r/7h5za746al.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-07-29 16:22:06 +02:00
parent 9141b3ca7f f1bb924e8f
commit dae29d661d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
View File

@@ -336,9 +336,11 @@ &sd_emmc_a {
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr50;
max-frequency = <100000000>;
/* WiFi firmware requires power to be kept while in suspend */
keep-power-in-suspend;
non-removable;
disable-wp;
@@ -398,7 +400,7 @@ bluetooth {
shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
max-speed = <2000000>;
clocks = <&wifi32k>;
clock-names = "lpo";
clock-names = "lpo";
};
};

1
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
View File

@@ -293,7 +293,6 @@ &sd_emmc_a {
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr50;
max-frequency = <100000000>;
non-removable;

4
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
View File

@@ -164,6 +164,10 @@ &pcie {
status = "okay";
};
&sd_emmc_a {
sd-uhs-sdr50;
};
&usb {
phys = <&usb2_phy0>, <&usb2_phy1>;
phy-names = "usb2-phy0", "usb2-phy1";