diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-07-23 15:59:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-23 16:13:06 +0100 |
| commit | 5af84df962dd6699e3972fda7a0c8b579fb3ab04 (patch) | |
| tree | 0a66f54c99c0c0d22588304d030ecb752487dfa1 /arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | |
| parent | Merge branch 'net-remove-compat-alloc-user-space' (diff) | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (diff) | |
| download | wireguard-linux-5af84df962dd6699e3972fda7a0c8b579fb3ab04.tar.xz wireguard-linux-5af84df962dd6699e3972fda7a0c8b579fb3ab04.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts are simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index e863ec088970..e33153dcaea8 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -136,10 +136,7 @@ /*W0-W7*/ "","","","","","","","", /*X0-X7*/ "","","","","","","","", /*Y0-Y7*/ "","","","","","","","", - /*Z0-Z7*/ "","","","","","","","", - /*AA0-AA7*/ "","","","","","","","", - /*AB0-AB7*/ "","","","","","","","", - /*AC0-AC7*/ "","","","","","","",""; + /*Z0-Z7*/ "","","","","","","",""; }; &fmc { @@ -189,6 +186,7 @@ &emmc { status = "okay"; + clk-phase-mmc-hs200 = <36>, <270>; }; &fsim0 { |