Commit cbab3197 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'mvebu-dt64-4.11-3' of git://git.infradead.org/linux-mvebu into next/dt64

Pull "mvebu dt for 4.11 (part 3)" from Gregory CLEMENT:

adjust name of sd-mmc-gop clock in sysco for Armada 7K/8K

* tag 'mvebu-dt64-4.11-3' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon
parents 01a9c7b7 d0979c07
...@@ -74,7 +74,7 @@ cpm_syscon0: system-controller@440000 { ...@@ -74,7 +74,7 @@ cpm_syscon0: system-controller@440000 {
"cpm-gop-dp", "none", "cpm-pcie_x10", "cpm-gop-dp", "none", "cpm-pcie_x10",
"cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor",
"cpm-sata", "cpm-sata-usb", "cpm-main", "cpm-sata", "cpm-sata-usb", "cpm-main",
"cpm-sd-mmc", "none", "none", "cpm-sd-mmc-gop", "none", "none",
"cpm-slow-io", "cpm-usb3h0", "cpm-usb3h1", "cpm-slow-io", "cpm-usb3h0", "cpm-usb3h1",
"cpm-usb3dev", "cpm-eip150", "cpm-eip197"; "cpm-usb3dev", "cpm-eip150", "cpm-eip197";
}; };
......
...@@ -74,7 +74,7 @@ cps_syscon0: system-controller@440000 { ...@@ -74,7 +74,7 @@ cps_syscon0: system-controller@440000 {
"cps-gop-dp", "none", "cps-pcie_x10", "cps-gop-dp", "none", "cps-pcie_x10",
"cps-pcie_x11", "cps-pcie_x4", "cps-pcie-xor", "cps-pcie_x11", "cps-pcie_x4", "cps-pcie-xor",
"cps-sata", "cps-sata-usb", "cps-main", "cps-sata", "cps-sata-usb", "cps-main",
"cps-sd-mmc", "none", "none", "cps-sd-mmc-gop", "none", "none",
"cps-slow-io", "cps-usb3h0", "cps-usb3h1", "cps-slow-io", "cps-usb3h0", "cps-usb3h1",
"cps-usb3dev", "cps-eip150", "cps-eip197"; "cps-usb3dev", "cps-eip150", "cps-eip197";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment