Allwinner core additions for 3.15
Just a minor commit to adjust the restart code to take into account the new compatibles -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTIduqAAoJEBx+YmzsjxAggcoP/0YRFVxd81Qg0oTD0LobNH25 CkFKD5MjXkAN6Uu+rb4GGLeGUmH6jBQErF8US8gYWL1tAduWXlVCs9vBNuAgLe2D 6aWTVyUrMTe6B9hYKeeM6lHNFGN+s+lPDBYWee2G3d7pNIvVEaViHql1GMNUxK4F IhnQmGuQzv8LldhoUgrljJXtKFgEY1wDBSvrbyxZ+bOlrOo9Mu1f1iYbImeL7db1 cunlQ3h4s8Gs/puzf7G8YaKN724obJbXLpBRgD8lma0Kcfx6VFJXwTc5PxzOUyrR 9ygQ8hdsw3pnpgEVfrN21dqwk4EuFtaiuJ9YezuifSkOsLFb1plZG9XWLMxGJCon OR86GpAUQbix6rFhbvS0DyG5mFDFNCv/TAoUlqD6ML5L5X2Y6iLlez8Isj9G4GZ6 Xacf0VWDdaROe0N07iLVANYV3AESiqLWrQ/3Snu+33ntwTYK9MUZKE6qWs9rRiT+ ojhzOsAk1fWBIptvRIZrJVOMiwuSNjsTWyxIFMEfX4Avi5RU2jimPVAs3l0UNVs2 0sEIlONnZVTAglfxRmcomVyneViORSZNWwtFl0UTbPJi5N6r3QLmvPOzEAcWhCHB QjhUoh69t1ZEYH1aKRQD9JYvEAfRBpLkovbv8Iz6OJbsbOzJS8lzd/BPEs1O9hcw wzzqK9IJnuh/QipvG5Ip =foO/ -----END PGP SIGNATURE----- Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc Merge "Allwinner core additions for 3.15" from Maxime Ripard: Just a minor commit to adjust the restart code to take into account the new compatibles * tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Add the new watchog compatibles to the reboot code Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Коммит
780d2bf3d0
|
@ -94,8 +94,8 @@ static void sun6i_restart(enum reboot_mode mode, const char *cmd)
|
|||
}
|
||||
|
||||
static struct of_device_id sunxi_restart_ids[] = {
|
||||
{ .compatible = "allwinner,sun4i-wdt" },
|
||||
{ .compatible = "allwinner,sun6i-wdt" },
|
||||
{ .compatible = "allwinner,sun4i-a10-wdt" },
|
||||
{ .compatible = "allwinner,sun6i-a31-wdt" },
|
||||
{ /*sentinel*/ }
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче