Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806932/?format=api
{ "id": 806932, "url": "http://patchwork.ozlabs.org/api/patches/806932/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1503976853-3029-3-git-send-email-yamada.masahiro@socionext.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503976853-3029-3-git-send-email-yamada.masahiro@socionext.com>", "list_archive_url": null, "date": "2017-08-29T03:20:52", "name": "[U-Boot,3/4] ARM: dts: uniphier: sync with Linux", "commit_ref": "6c9e46efaed5855e4ee60a770eb27b92683b0a67", "pull_url": null, "state": "accepted", "archived": false, "hash": "a31eeb926e54d15d5ee90194384773d234ac2c6c", "submitter": { "id": 65882, "url": "http://patchwork.ozlabs.org/api/people/65882/?format=api", "name": "Masahiro Yamada", "email": "yamada.masahiro@socionext.com" }, "delegate": { "id": 38701, "url": "http://patchwork.ozlabs.org/api/users/38701/?format=api", "username": "masahir0y", "first_name": "Masahiro", "last_name": "Yamada", "email": "yamada.m@jp.panasonic.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1503976853-3029-3-git-send-email-yamada.masahiro@socionext.com/mbox/", "series": [ { "id": 294, "url": "http://patchwork.ozlabs.org/api/series/294/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=294", "date": "2017-08-29T03:20:51", "name": "[U-Boot,1/4] reset: uniphier: fix compatible for SD reset node for LD11/LD20", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/294/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806932/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806932/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com\n\theader.b=\"pY1UvK0l\"; dkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhFkr6b9hz9t2v\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 14:19:00 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid F1BCAC2268A; Tue, 29 Aug 2017 03:57:20 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id A316FC22684;\n\tTue, 29 Aug 2017 03:57:11 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 809F8C22685; Tue, 29 Aug 2017 03:21:17 +0000 (UTC)", "from conuserg-07.nifty.com (conuserg-07.nifty.com [210.131.2.74])\n\tby lists.denx.de (Postfix) with ESMTPS id 5D518C22699\n\tfor <u-boot@lists.denx.de>; Tue, 29 Aug 2017 03:21:15 +0000 (UTC)", "from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp\n\t[153.142.97.92]) (authenticated)\n\tby conuserg-07.nifty.com with ESMTP id v7T3KuI3005509;\n\tTue, 29 Aug 2017 12:20:57 +0900" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.0 required=5.0 tests=T_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0", "DKIM-Filter": "OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v7T3KuI3005509", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;\n\ts=dec2015msa; t=1503976857;\n\tbh=5YI640cWNo3u2gF/gxZzdlFD1uMqUu0Qdx+HR4GKWAk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=pY1UvK0laOKs4iQbSfqzRLddOv4+TI6w4J2nDC09IW3z3IjykU25fxsvuS2mSV0go\n\t2GDl2Wh2gemGg/EG6R8Isy7go9MYE2/Da9ypuEp70VyaiTzfiP2Ew+LijjZJrt8ESL\n\tLKXxEVgxO8vbVWc3asdWqW5lR4N08+dpDGQQUpP5IjGKKYvCzMiUlA6h69pjpd0Vir\n\tOIt1qo9zZKxjpgRD1uZXBogF5GsQcQNA4mHn6bJp4jPgn+76l46nGDySvTiSAFjqNu\n\tfWj0ADWtffbyFqQoUnC9WizN0leZsIkMC0D1eDm/5xxNIOcPsrMVB9mmf6pzNRDE4U\n\tkJU2wYxNV0ZZA==", "X-Nifty-SrcIP": "[153.142.97.92]", "From": "Masahiro Yamada <yamada.masahiro@socionext.com>", "To": "u-boot@lists.denx.de", "Date": "Tue, 29 Aug 2017 12:20:52 +0900", "Message-Id": "<1503976853-3029-3-git-send-email-yamada.masahiro@socionext.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1503976853-3029-1-git-send-email-yamada.masahiro@socionext.com>", "References": "<1503976853-3029-1-git-send-email-yamada.masahiro@socionext.com>", "Cc": "Albert Aribaud <albert.u.boot@aribaud.net>", "Subject": "[U-Boot] [PATCH 3/4] ARM: dts: uniphier: sync with Linux", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "Import updates queued up for Linux 4.14-rc1.\n\nSigned-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>\n---\n\n arch/arm/dts/uniphier-ld11-global.dts | 6 +++++-\n arch/arm/dts/uniphier-ld11-ref.dts | 6 +++---\n arch/arm/dts/uniphier-ld11.dtsi | 13 +++++++++----\n arch/arm/dts/uniphier-ld20-global.dts | 6 +++++-\n arch/arm/dts/uniphier-ld20-ref.dts | 6 +++---\n arch/arm/dts/uniphier-ld20.dtsi | 15 ++++++++++-----\n arch/arm/dts/uniphier-ld4-ref.dts | 6 +++---\n arch/arm/dts/uniphier-ld4.dtsi | 11 ++++++-----\n arch/arm/dts/uniphier-ld6b-ref.dts | 6 +++---\n arch/arm/dts/uniphier-ld6b.dtsi | 2 +-\n arch/arm/dts/uniphier-pinctrl.dtsi | 5 +++++\n arch/arm/dts/uniphier-pro4-ace.dts | 2 +-\n arch/arm/dts/uniphier-pro4-ref.dts | 6 +++---\n arch/arm/dts/uniphier-pro4-sanji.dts | 2 +-\n arch/arm/dts/uniphier-pro4.dtsi | 9 +++++----\n arch/arm/dts/uniphier-pro5-4kbox.dts | 4 ++--\n arch/arm/dts/uniphier-pro5.dtsi | 13 +++++++------\n arch/arm/dts/uniphier-pxs2-gentil.dts | 2 +-\n arch/arm/dts/uniphier-pxs2-vodka.dts | 2 +-\n arch/arm/dts/uniphier-pxs2.dtsi | 13 +++++++------\n arch/arm/dts/uniphier-sld8-ref.dts | 6 +++---\n arch/arm/dts/uniphier-sld8.dtsi | 11 ++++++-----\n 22 files changed, 90 insertions(+), 62 deletions(-)", "diff": "diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts\nindex 7a650a02486a..5ffe7dedf723 100644\n--- a/arch/arm/dts/uniphier-ld11-global.dts\n+++ b/arch/arm/dts/uniphier-ld11-global.dts\n@@ -9,7 +9,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld11.dtsi\"\n+#include \"uniphier-ld11.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD11 Global Board (REF_LD11_GP)\";\n@@ -68,3 +68,7 @@\n &usb2 {\n \tstatus = \"okay\";\n };\n+\n+&nand {\n+\tstatus = \"okay\";\n+};\ndiff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts\nindex cc8ebe34c27c..ffb473ad2e0f 100644\n--- a/arch/arm/dts/uniphier-ld11-ref.dts\n+++ b/arch/arm/dts/uniphier-ld11-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld11.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-ld11.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD11 Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi\nindex 74f8f721a888..0f172c31db69 100644\n--- a/arch/arm/dts/uniphier-ld11.dtsi\n+++ b/arch/arm/dts/uniphier-ld11.dtsi\n@@ -348,9 +348,11 @@\n \t\t\t};\n \t\t};\n \n-\t\taidet@5fc20000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@5fc20000 {\n+\t\t\tcompatible = \"socionext,uniphier-ld11-aidet\";\n \t\t\treg = <0x5fc20000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\tgic: interrupt-controller@5fe00000 {\n@@ -376,6 +378,10 @@\n \t\t\t\tcompatible = \"socionext,uniphier-ld11-reset\";\n \t\t\t\t#reset-cells = <1>;\n \t\t\t};\n+\n+\t\t\twatchdog {\n+\t\t\t\tcompatible = \"socionext,uniphier-wdt\";\n+\t\t\t};\n \t\t};\n \n \t\tnand: nand@68000000 {\n@@ -387,9 +393,8 @@\n \t\t\tpinctrl-names = \"default\";\n \t\t\tpinctrl-0 = <&pinctrl_nand>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-ld20-global.dts b/arch/arm/dts/uniphier-ld20-global.dts\nindex 9f620d4101b5..fc2bc9d75d35 100644\n--- a/arch/arm/dts/uniphier-ld20-global.dts\n+++ b/arch/arm/dts/uniphier-ld20-global.dts\n@@ -9,7 +9,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld20.dtsi\"\n+#include \"uniphier-ld20.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD20 Global Board (REF_LD20_GP)\";\n@@ -50,3 +50,7 @@\n &i2c0 {\n \tstatus = \"okay\";\n };\n+\n+&nand {\n+\tstatus = \"okay\";\n+};\ndiff --git a/arch/arm/dts/uniphier-ld20-ref.dts b/arch/arm/dts/uniphier-ld20-ref.dts\nindex 494166aee24c..1ca0c8620dc5 100644\n--- a/arch/arm/dts/uniphier-ld20-ref.dts\n+++ b/arch/arm/dts/uniphier-ld20-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld20.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-ld20.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD20 Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi\nindex 44257aff35b9..a7fdaa74d155 100644\n--- a/arch/arm/dts/uniphier-ld20.dtsi\n+++ b/arch/arm/dts/uniphier-ld20.dtsi\n@@ -313,7 +313,7 @@\n \t\tsdctrl@59810000 {\n \t\t\tcompatible = \"socionext,uniphier-ld20-sdctrl\",\n \t\t\t\t \"simple-mfd\", \"syscon\";\n-\t\t\treg = <0x59810000 0x800>;\n+\t\t\treg = <0x59810000 0x400>;\n \n \t\t\tsd_clk: clock {\n \t\t\t\tcompatible = \"socionext,uniphier-ld20-sd-clock\";\n@@ -383,9 +383,11 @@\n \t\t\t};\n \t\t};\n \n-\t\taidet@5fc20000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@5fc20000 {\n+\t\t\tcompatible = \"socionext,uniphier-ld20-aidet\";\n \t\t\treg = <0x5fc20000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\tgic: interrupt-controller@5fe00000 {\n@@ -411,6 +413,10 @@\n \t\t\t\tcompatible = \"socionext,uniphier-ld20-reset\";\n \t\t\t\t#reset-cells = <1>;\n \t\t\t};\n+\n+\t\t\twatchdog {\n+\t\t\t\tcompatible = \"socionext,uniphier-wdt\";\n+\t\t\t};\n \t\t};\n \n \t\tusb: usb@65b00000 {\n@@ -440,9 +446,8 @@\n \t\t\tpinctrl-names = \"default\";\n \t\t\tpinctrl-0 = <&pinctrl_nand>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts\nindex 0520e3cff1a5..0f50acb24c2c 100644\n--- a/arch/arm/dts/uniphier-ld4-ref.dts\n+++ b/arch/arm/dts/uniphier-ld4-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld4.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-ld4.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD4 Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi\nindex 18a105a58f9c..a3bcf227f438 100644\n--- a/arch/arm/dts/uniphier-ld4.dtsi\n+++ b/arch/arm/dts/uniphier-ld4.dtsi\n@@ -424,9 +424,11 @@\n \t\t\tinterrupt-controller;\n \t\t};\n \n-\t\taidet@61830000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@61830000 {\n+\t\t\tcompatible = \"socionext,uniphier-ld4-aidet\";\n \t\t\treg = <0x61830000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\tsysctrl@61840000 {\n@@ -452,11 +454,10 @@\n \t\t\treg = <0x68000000 0x20>, <0x68100000 0x1000>;\n \t\t\tinterrupts = <0 65 4>;\n \t\t\tpinctrl-names = \"default\";\n-\t\t\tpinctrl-0 = <&pinctrl_nand>;\n+\t\t\tpinctrl-0 = <&pinctrl_nand2cs>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts\nindex b4bb5b546a03..bdb7f50ab3a0 100644\n--- a/arch/arm/dts/uniphier-ld6b-ref.dts\n+++ b/arch/arm/dts/uniphier-ld6b-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-ld6b.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-ld6b.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier LD6b Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-ld6b.dtsi b/arch/arm/dts/uniphier-ld6b.dtsi\nindex 8b9a79731bd3..9a7b25cc8233 100644\n--- a/arch/arm/dts/uniphier-ld6b.dtsi\n+++ b/arch/arm/dts/uniphier-ld6b.dtsi\n@@ -12,7 +12,7 @@\n * The D-chip (digital chip) is the same as the PXs2 die.\n * Reuse the PXs2 device tree with some properties overridden.\n */\n-/include/ \"uniphier-pxs2.dtsi\"\n+#include \"uniphier-pxs2.dtsi\"\n \n / {\n \tcompatible = \"socionext,uniphier-ld6b\";\ndiff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi\nindex f5c155261259..d5e8aafccbd6 100644\n--- a/arch/arm/dts/uniphier-pinctrl.dtsi\n+++ b/arch/arm/dts/uniphier-pinctrl.dtsi\n@@ -8,6 +8,11 @@\n */\n \n &pinctrl {\n+\tpinctrl_aout: aout_grp {\n+\t\tgroups = \"aout\";\n+\t\tfunction = \"aout\";\n+\t};\n+\n \tpinctrl_emmc: emmc_grp {\n \t\tgroups = \"emmc\", \"emmc_dat8\";\n \t\tfunction = \"emmc\";\ndiff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts\nindex 9276f8d913b6..8161ba83a047 100644\n--- a/arch/arm/dts/uniphier-pro4-ace.dts\n+++ b/arch/arm/dts/uniphier-pro4-ace.dts\n@@ -8,7 +8,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pro4.dtsi\"\n+#include \"uniphier-pro4.dtsi\"\n \n / {\n \tmodel = \"UniPhier Pro4 Ace Board\";\ndiff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts\nindex 13e1b3ec8828..360b31d6927a 100644\n--- a/arch/arm/dts/uniphier-pro4-ref.dts\n+++ b/arch/arm/dts/uniphier-pro4-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pro4.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-pro4.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier Pro4 Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts\nindex 568dbd5a4ae3..778e2bb4b78d 100644\n--- a/arch/arm/dts/uniphier-pro4-sanji.dts\n+++ b/arch/arm/dts/uniphier-pro4-sanji.dts\n@@ -8,7 +8,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pro4.dtsi\"\n+#include \"uniphier-pro4.dtsi\"\n \n / {\n \tmodel = \"UniPhier Pro4 Sanji Board\";\ndiff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi\nindex cbb848207cc1..b45f23ce7c83 100644\n--- a/arch/arm/dts/uniphier-pro4.dtsi\n+++ b/arch/arm/dts/uniphier-pro4.dtsi\n@@ -531,9 +531,11 @@\n \t\t\t};\n \t\t};\n \n-\t\taidet@5fc20000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@5fc20000 {\n+\t\t\tcompatible = \"socionext,uniphier-pro4-aidet\";\n \t\t\treg = <0x5fc20000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\ttimer@60000200 {\n@@ -619,9 +621,8 @@\n \t\t\tpinctrl-names = \"default\";\n \t\t\tpinctrl-0 = <&pinctrl_nand>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts\nindex d59309000b5a..05597d385edc 100644\n--- a/arch/arm/dts/uniphier-pro5-4kbox.dts\n+++ b/arch/arm/dts/uniphier-pro5-4kbox.dts\n@@ -8,7 +8,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pro5.dtsi\"\n+#include \"uniphier-pro5.dtsi\"\n \n / {\n \tmodel = \"UniPhier Pro5 4KBOX Board\";\n@@ -26,7 +26,7 @@\n \t\ti2c6 = &i2c6;\n \t};\n \n-\tmemory {\n+\tmemory@80000000 {\n \t\tdevice_type = \"memory\";\n \t\treg = <0x80000000 0x40000000>;\n \t};\ndiff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi\nindex 498354c45f90..94eb65651296 100644\n--- a/arch/arm/dts/uniphier-pro5.dtsi\n+++ b/arch/arm/dts/uniphier-pro5.dtsi\n@@ -500,7 +500,7 @@\n \t\tsdctrl@59810000 {\n \t\t\tcompatible = \"socionext,uniphier-pro5-sdctrl\",\n \t\t\t\t \"simple-mfd\", \"syscon\";\n-\t\t\treg = <0x59810000 0x800>;\n+\t\t\treg = <0x59810000 0x400>;\n \t\t\tu-boot,dm-pre-reloc;\n \n \t\t\tsd_clk: clock {\n@@ -542,9 +542,11 @@\n \t\t\t};\n \t\t};\n \n-\t\taidet@5fc20000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@5fc20000 {\n+\t\t\tcompatible = \"socionext,uniphier-pro5-aidet\";\n \t\t\treg = <0x5fc20000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\ttimer@60000200 {\n@@ -628,9 +630,8 @@\n \t\t\treg = <0x68000000 0x20>, <0x68100000 0x1000>;\n \t\t\tinterrupts = <0 65 4>;\n \t\t\tpinctrl-names = \"default\";\n-\t\t\tpinctrl-0 = <&pinctrl_nand>;\n+\t\t\tpinctrl-0 = <&pinctrl_nand2cs>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \n \t\temmc: sdhc@68400000 {\n@@ -670,4 +671,4 @@\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts\nindex 6f691a8b42c8..7f0f972bde4f 100644\n--- a/arch/arm/dts/uniphier-pxs2-gentil.dts\n+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts\n@@ -8,7 +8,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pxs2.dtsi\"\n+#include \"uniphier-pxs2.dtsi\"\n \n / {\n \tmodel = \"UniPhier PXs2 Gentil Board\";\ndiff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts\nindex d13e5f2b6c10..ec9ffb7df8b1 100644\n--- a/arch/arm/dts/uniphier-pxs2-vodka.dts\n+++ b/arch/arm/dts/uniphier-pxs2-vodka.dts\n@@ -8,7 +8,7 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-pxs2.dtsi\"\n+#include \"uniphier-pxs2.dtsi\"\n \n / {\n \tmodel = \"UniPhier PXs2 Vodka Board\";\ndiff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi\nindex 32844f781f5a..c304d90874f1 100644\n--- a/arch/arm/dts/uniphier-pxs2.dtsi\n+++ b/arch/arm/dts/uniphier-pxs2.dtsi\n@@ -477,7 +477,7 @@\n \t\tsdctrl@59810000 {\n \t\t\tcompatible = \"socionext,uniphier-pxs2-sdctrl\",\n \t\t\t\t \"simple-mfd\", \"syscon\";\n-\t\t\treg = <0x59810000 0x800>;\n+\t\t\treg = <0x59810000 0x400>;\n \t\t\tu-boot,dm-pre-reloc;\n \n \t\t\tsd_clk: clock {\n@@ -554,9 +554,11 @@\n \t\t\t};\n \t\t};\n \n-\t\taidet@5fc20000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@5fc20000 {\n+\t\t\tcompatible = \"socionext,uniphier-pxs2-aidet\";\n \t\t\treg = <0x5fc20000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\ttimer@60000200 {\n@@ -640,11 +642,10 @@\n \t\t\treg = <0x68000000 0x20>, <0x68100000 0x1000>;\n \t\t\tinterrupts = <0 65 4>;\n \t\t\tpinctrl-names = \"default\";\n-\t\t\tpinctrl-0 = <&pinctrl_nand>;\n+\t\t\tpinctrl-0 = <&pinctrl_nand2cs>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\ndiff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts\nindex 6ddf2a1b1df7..3557bb7fed57 100644\n--- a/arch/arm/dts/uniphier-sld8-ref.dts\n+++ b/arch/arm/dts/uniphier-sld8-ref.dts\n@@ -8,9 +8,9 @@\n */\n \n /dts-v1/;\n-/include/ \"uniphier-sld8.dtsi\"\n-/include/ \"uniphier-ref-daughter.dtsi\"\n-/include/ \"uniphier-support-card.dtsi\"\n+#include \"uniphier-sld8.dtsi\"\n+#include \"uniphier-ref-daughter.dtsi\"\n+#include \"uniphier-support-card.dtsi\"\n \n / {\n \tmodel = \"UniPhier sLD8 Reference Board\";\ndiff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi\nindex 7d6370f6afe2..a3de26b40cc9 100644\n--- a/arch/arm/dts/uniphier-sld8.dtsi\n+++ b/arch/arm/dts/uniphier-sld8.dtsi\n@@ -424,9 +424,11 @@\n \t\t\tinterrupt-controller;\n \t\t};\n \n-\t\taidet@61830000 {\n-\t\t\tcompatible = \"simple-mfd\", \"syscon\";\n+\t\taidet: aidet@61830000 {\n+\t\t\tcompatible = \"socionext,uniphier-sld8-aidet\";\n \t\t\treg = <0x61830000 0x200>;\n+\t\t\tinterrupt-controller;\n+\t\t\t#interrupt-cells = <2>;\n \t\t};\n \n \t\tsysctrl@61840000 {\n@@ -452,11 +454,10 @@\n \t\t\treg = <0x68000000 0x20>, <0x68100000 0x1000>;\n \t\t\tinterrupts = <0 65 4>;\n \t\t\tpinctrl-names = \"default\";\n-\t\t\tpinctrl-0 = <&pinctrl_nand>;\n+\t\t\tpinctrl-0 = <&pinctrl_nand2cs>;\n \t\t\tclocks = <&sys_clk 2>;\n-\t\t\tnand-ecc-strength = <8>;\n \t\t};\n \t};\n };\n \n-/include/ \"uniphier-pinctrl.dtsi\"\n+#include \"uniphier-pinctrl.dtsi\"\n", "prefixes": [ "U-Boot", "3/4" ] }