microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

mvebu dt for 4.12 (part 2) 

Use disk-activity trigger for armada-385-linksys
 Keep dts alphabetically ordered for clearfog (Armada 388)
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWOgNoSMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71V3cAJ9gBnFQKIkt
 jDbi9jpxM7vxznt0VgCgnnYcZsFjE7jFAxs+w4KDVd3jYo8=
 =XQtw
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt for 4.12 (part 2)

Use disk-activity trigger for armada-385-linksys
Keep dts alphabetically ordered for clearfog (Armada 388)

* tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-385-linksys: disk-activity trigger for all
  ARM: dts: clearfog: keep dts alphabetically ordered

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-04-19 06:43:54 -07:00
Родитель a51ed6cfb2 34240c26d1
Коммит 107193765b
4 изменённых файлов: 20 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
arch/arm/boot/dts/armada-385-linksys-caiman.dts
Просмотреть файл

@ -109,7 +109,6 @@
sata {
label = "caiman:white:sata";
linux,default-trigger = "disk-activity";
};
};
};

1
arch/arm/boot/dts/armada-385-linksys-cobra.dts
Просмотреть файл

@ -109,7 +109,6 @@
sata {
label = "cobra:white:sata";
linux,default-trigger = "disk-activity";
};
};
};

1
arch/arm/boot/dts/armada-385-linksys.dtsi
Просмотреть файл

@ -320,6 +320,7 @@
sata {
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "disk-activity";
};
};

38
arch/arm/boot/dts/armada-388-clearfog.dts
Просмотреть файл

@ -186,25 +186,6 @@
};
};
&pinctrl {
clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
marvell,pins = "mpp46";
marvell,function = "ref";
};
clearfog_dsa0_pins: clearfog-dsa0-pins {
marvell,pins = "mpp23", "mpp41";
marvell,function = "gpio";
};
clearfog_spi1_cs_pins: spi1-cs-pins {
marvell,pins = "mpp55";
marvell,function = "spi1";
};
rear_button_pins: rear-button-pins {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
};
&mdio {
status = "okay";
@ -268,6 +249,25 @@
};
};
&pinctrl {
clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
marvell,pins = "mpp46";
marvell,function = "ref";
};
clearfog_dsa0_pins: clearfog-dsa0-pins {
marvell,pins = "mpp23", "mpp41";
marvell,function = "gpio";
};
clearfog_spi1_cs_pins: spi1-cs-pins {
marvell,pins = "mpp55";
marvell,function = "spi1";
};
rear_button_pins: rear-button-pins {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
};
&spi1 {
/*
* Add SPI CS pins for clearfog: