openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu dt64 for 4.16 (part 3) 

Fix for the CP110 dt de-duplication series
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWl9mGCMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71Q7UAJ9iY3hKYTta
 /R5teeUa1r5hcWasCgCfT29fsSfkbQJ+vryrU5C2KUz3BeA=
 =JBh4
 -----END PGP SIGNATURE-----

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

Pull "mvebu dt64 for 4.16 (part 3)" from Gregory CLEMENT:

Fix for the CP110 dt de-duplication series

* tag 'mvebu-dt64-4.16-3' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string
This commit is contained in:
Arnd Bergmann 2018-01-19 16:09:05 +01:00
parent 9e6c62b05c f9a0c27b5c
commit 1ebf790bef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/marvell/armada-80x0.dtsi
View File

@ -108,13 +108,13 @@ &cp0_gpio2 {
&cp0_syscon0 {
cp0_pinctrl: pinctrl {
compatible = "marvell,armada-8k-cp0-pinctrl";
compatible = "marvell,armada-8k-cpm-pinctrl";
};
};
&cp1_syscon0 {
cp1_pinctrl: pinctrl {
compatible = "marvell,armada-8k-cp1-pinctrl";
compatible = "marvell,armada-8k-cps-pinctrl";
nand_pins: nand-pins {
marvell,pins =