Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1767776/?format=api
{ "id": 1767776, "url": "http://patchwork.ozlabs.org/api/patches/1767776/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20230411182510.22158-13-afd@ti.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": "<20230411182510.22158-13-afd@ti.com>", "list_archive_url": null, "date": "2023-04-11T18:25:05", "name": "[12/17] arm: dts: am3x: Non-functional changes sync with v6.3-rc6", "commit_ref": "211b3d726378857d0f2b8bc80923bbd548edf083", "pull_url": null, "state": "accepted", "archived": false, "hash": "9a6864fb774a7b402386e1c6247244a81d45d395", "submitter": { "id": 67226, "url": "http://patchwork.ozlabs.org/api/people/67226/?format=api", "name": "Andrew Davis", "email": "afd@ti.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20230411182510.22158-13-afd@ti.com/mbox/", "series": [ { "id": 350384, "url": "http://patchwork.ozlabs.org/api/series/350384/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=350384", "date": "2023-04-11T18:24:56", "name": "Sync TI Device Trees with Linux v6.3-rc6", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/350384/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1767776/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1767776/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)", "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=ti.com header.i=@ti.com header.a=rsa-sha256\n header.s=ti-com-17Q1 header.b=dApVQpRj;\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=ti.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=ti.com header.i=@ti.com header.b=\"dApVQpRj\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=ti.com", "phobos.denx.de; spf=pass smtp.mailfrom=afd@ti.com" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (P-384))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4PwvWj1pXBz1yZY\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 12 Apr 2023 04:29:37 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 51C5D85FFA;\n\tTue, 11 Apr 2023 20:27:24 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id C0AD385F2A; Tue, 11 Apr 2023 20:26:12 +0200 (CEST)", "from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 69B5F85F50\n for <u-boot@lists.denx.de>; Tue, 11 Apr 2023 20:25:20 +0200 (CEST)", "from fllv0034.itg.ti.com ([10.64.40.246])\n by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33BIPHME113611;\n Tue, 11 Apr 2023 13:25:17 -0500", "from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30])\n by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33BIPHbS024009\n (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL);\n Tue, 11 Apr 2023 13:25:17 -0500", "from DFLE113.ent.ti.com (10.64.6.34) by DFLE109.ent.ti.com\n (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 11\n Apr 2023 13:25:17 -0500", "from fllv0040.itg.ti.com (10.64.41.20) by DFLE113.ent.ti.com\n (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via\n Frontend Transport; Tue, 11 Apr 2023 13:25:17 -0500", "from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com\n [10.180.69.5])\n by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33BIPAC6109488;\n Tue, 11 Apr 2023 13:25:16 -0500" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,\n SPF_PASS autolearn=ham autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com;\n s=ti-com-17Q1; t=1681237517;\n bh=pE34ZWclKFzvKvvGrvdQiXgArGnwVKMPMjZKJe2JBCI=;\n h=From:To:CC:Subject:Date:In-Reply-To:References;\n b=dApVQpRj0nVHH9bNImlYdHl+ultPrAqmzIcplxwf/z6w7FR6TqptCTJXwkKUSFg59\n S2FvfBGyyeuCcmBCQUo+11tj+kpf5Qv6Gu/5a8IUM1sMgqm8JL8JlfTfE53A779imM\n 9tcQ2bDjPBK2+FkOaDPiPVyil4ZlgOEkcvITIuIQ=", "From": "Andrew Davis <afd@ti.com>", "To": "Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>, Nishanth\n Menon <nm@ti.com>, Vignesh Raghavendra <vigneshr@ti.com>,\n <u-boot@lists.denx.de>", "CC": "Andrew Davis <afd@ti.com>", "Subject": "[PATCH 12/17] arm: dts: am3x: Non-functional changes sync with\n v6.3-rc6", "Date": "Tue, 11 Apr 2023 13:25:05 -0500", "Message-ID": "<20230411182510.22158-13-afd@ti.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20230411182510.22158-1-afd@ti.com>", "References": "<20230411182510.22158-1-afd@ti.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-EXCLAIMER-MD-CONFIG": "e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://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 <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "This is a collection of all the whitespace, renames, comment, and other\nchanges that should not change the DT functionality from Linux v6.3-rc6.\n\nSigned-off-by: Andrew Davis <afd@ti.com>\n---\n arch/arm/dts/am335x-bone-common.dtsi | 1 -\n arch/arm/dts/am335x-boneblack-hdmi.dtsi | 7 +-\n arch/arm/dts/am335x-boneblack-wireless.dts | 2 +-\n arch/arm/dts/am335x-boneblack.dts | 4 +\n arch/arm/dts/am335x-boneblue.dts | 2 +-\n arch/arm/dts/am335x-bonegreen-wireless.dts | 2 +-\n arch/arm/dts/am335x-evm.dts | 46 ++---\n arch/arm/dts/am335x-evmsk.dts | 36 ++--\n arch/arm/dts/am335x-guardian.dts | 10 +-\n arch/arm/dts/am335x-icev2.dts | 143 +++++++--------\n arch/arm/dts/am335x-igep0033.dtsi | 4 +-\n arch/arm/dts/am335x-pdu001.dts | 2 +-\n arch/arm/dts/am335x-phycore-som.dtsi | 20 +--\n arch/arm/dts/am335x-pocketbeagle.dts | 8 +-\n arch/arm/dts/am335x-pxm2.dtsi | 2 +-\n arch/arm/dts/am335x-rut.dts | 2 +-\n .../dts/am335x-sancloud-bbe-extended-wifi.dts | 2 +-\n arch/arm/dts/am335x-shc.dts | 14 +-\n arch/arm/dts/am335x-sl50.dts | 14 +-\n arch/arm/dts/am335x-wega.dtsi | 16 +-\n arch/arm/dts/am33xx-clocks.dtsi | 164 +++++++++---------\n arch/arm/dts/am33xx-l4.dtsi | 10 +-\n arch/arm/dts/am33xx.dtsi | 12 +-\n arch/arm/dts/am3517-evm-ui.dtsi | 28 +--\n arch/arm/dts/am3517-evm.dts | 36 ++--\n arch/arm/dts/am3517.dtsi | 2 +-\n 26 files changed, 298 insertions(+), 291 deletions(-)", "diff": "diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi\nindex 43fe03d096a..67dfcd8480c 100644\n--- a/arch/arm/dts/am335x-bone-common.dtsi\n+++ b/arch/arm/dts/am335x-bone-common.dtsi\n@@ -371,7 +371,6 @@\n \tpinctrl-names = \"default\", \"sleep\";\n \tpinctrl-0 = <&davinci_mdio_default>;\n \tpinctrl-1 = <&davinci_mdio_sleep>;\n-\tstatus = \"okay\";\n \n \tethphy0: ethernet-phy@0 {\n \t\treg = <0>;\ndiff --git a/arch/arm/dts/am335x-boneblack-hdmi.dtsi b/arch/arm/dts/am335x-boneblack-hdmi.dtsi\nindex 7cfddada934..486f24deb87 100644\n--- a/arch/arm/dts/am335x-boneblack-hdmi.dtsi\n+++ b/arch/arm/dts/am335x-boneblack-hdmi.dtsi\n@@ -85,8 +85,13 @@\n \t\taudio-ports = <\tTDA998x_I2S\t0x03>;\n \n \t\tports {\n+\t\t\t#address-cells = <1>;\n+\t\t\t#size-cells = <0>;\n+\n \t\t\tport@0 {\n-\t\t\t\thdmi_0: endpoint@0 {\n+\t\t\t\treg = <0>;\n+\n+\t\t\t\thdmi_0: endpoint {\n \t\t\t\t\tremote-endpoint = <&lcdc_0>;\n \t\t\t\t};\n \t\t\t};\ndiff --git a/arch/arm/dts/am335x-boneblack-wireless.dts b/arch/arm/dts/am335x-boneblack-wireless.dts\nindex 8b2b24c8067..afa4fdc5dd2 100644\n--- a/arch/arm/dts/am335x-boneblack-wireless.dts\n+++ b/arch/arm/dts/am335x-boneblack-wireless.dts\n@@ -19,7 +19,7 @@\n \t\tregulator-name = \"wlan-en-regulator\";\n \t\tregulator-min-microvolt = <1800000>;\n \t\tregulator-max-microvolt = <1800000>;\n-\t\tstartup-delay-us= <70000>;\n+\t\tstartup-delay-us = <70000>;\n \n \t\t/* WL_EN */\n \t\tgpio = <&gpio3 9 0>;\ndiff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts\nindex 9312197316f..b956e2f60fe 100644\n--- a/arch/arm/dts/am335x-boneblack.dts\n+++ b/arch/arm/dts/am335x-boneblack.dts\n@@ -168,3 +168,7 @@\n \t\t\"NC\",\n \t\t\"NC\";\n };\n+\n+&baseboard_eeprom {\n+\tvcc-supply = <&ldo4_reg>;\n+};\ndiff --git a/arch/arm/dts/am335x-boneblue.dts b/arch/arm/dts/am335x-boneblue.dts\nindex 856fdf58b0f..f04f46d6e5e 100644\n--- a/arch/arm/dts/am335x-boneblue.dts\n+++ b/arch/arm/dts/am335x-boneblue.dts\n@@ -107,7 +107,7 @@\n \t\tregulator-name = \"wlan-en-regulator\";\n \t\tregulator-min-microvolt = <1800000>;\n \t\tregulator-max-microvolt = <1800000>;\n-\t\tstartup-delay-us= <70000>;\n+\t\tstartup-delay-us = <70000>;\n \n \t\t/* WL_EN */\n \t\tgpio = <&gpio3 9 0>;\ndiff --git a/arch/arm/dts/am335x-bonegreen-wireless.dts b/arch/arm/dts/am335x-bonegreen-wireless.dts\nindex 74db0fc3939..b363d032441 100644\n--- a/arch/arm/dts/am335x-bonegreen-wireless.dts\n+++ b/arch/arm/dts/am335x-bonegreen-wireless.dts\n@@ -18,7 +18,7 @@\n \t\tregulator-name = \"wlan-en-regulator\";\n \t\tregulator-min-microvolt = <1800000>;\n \t\tregulator-max-microvolt = <1800000>;\n-\t\tstartup-delay-us= <70000>;\n+\t\tstartup-delay-us = <70000>;\n \n \t\t/* WL_EN */\n \t\tgpio = <&gpio0 26 0>;\ndiff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts\nindex 737460eb867..6e799621678 100644\n--- a/arch/arm/dts/am335x-evm.dts\n+++ b/arch/arm/dts/am335x-evm.dts\n@@ -22,12 +22,16 @@\n \t\t};\n \t};\n \n-\tmemory {\n+\tmemory@80000000 {\n \t\tdevice_type = \"memory\";\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n-\tvbat: fixedregulator@0 {\n+\tchosen {\n+\t\tstdout-path = &uart0;\n+\t};\n+\n+\tvbat: fixedregulator0 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"vbat\";\n \t\tregulator-min-microvolt = <5000000>;\n@@ -35,13 +39,13 @@\n \t\tregulator-boot-on;\n \t};\n \n-\tlis3_reg: fixedregulator@1 {\n+\tlis3_reg: fixedregulator1 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"lis3_reg\";\n \t\tregulator-boot-on;\n \t};\n \n-\twlan_en_reg: fixedregulator@2 {\n+\twlan_en_reg: fixedregulator2 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"wlan-en-regulator\";\n \t\tregulator-min-microvolt = <1800000>;\n@@ -75,18 +79,18 @@\n \t\t\t\t0x0201006c>;\t/* DOWN */\n \t};\n \n-\tgpio_keys: volume_keys@0 {\n+\tgpio_keys: volume-keys {\n \t\tcompatible = \"gpio-keys\";\n \t\tautorepeat;\n \n-\t\tswitch@9 {\n+\t\tswitch-9 {\n \t\t\tlabel = \"volume-up\";\n \t\t\tlinux,code = <115>;\n \t\t\tgpios = <&gpio0 2 GPIO_ACTIVE_LOW>;\n \t\t\tgpio-key,wakeup;\n \t\t};\n \n-\t\tswitch@10 {\n+\t\tswitch-10 {\n \t\t\tlabel = \"volume-down\";\n \t\t\tlinux,code = <114>;\n \t\t\tgpios = <&gpio0 3 GPIO_ACTIVE_LOW>;\n@@ -342,7 +346,7 @@\n \t\t>;\n \t};\n \n-\tam335x_evm_audio_pins: am335x_evm_audio_pins {\n+\tmcasp1_pins: mcasp1_pins {\n \t\tpinctrl-single,pins = <\n \t\t\tAM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_crs.mcasp1_aclkx */\n \t\t\tAM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */\n@@ -483,7 +487,7 @@\n &epwmss0 {\n \tstatus = \"okay\";\n \n-\tecap0: ecap@100 {\n+\tecap0: pwm@100 {\n \t\tstatus = \"okay\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&ecap0_pins>;\n@@ -531,7 +535,7 @@\n \t\t#size-cells = <1>;\n \t\tpartition@0 {\n \t\t\tlabel = \"NAND.SPL\";\n-\t\t\treg = <0x00000000 0x000020000>;\n+\t\t\treg = <0x00000000 0x00020000>;\n \t\t};\n \t\tpartition@1 {\n \t\t\tlabel = \"NAND.SPL.backup1\";\n@@ -575,19 +579,19 @@\n #include \"tps65910.dtsi\"\n \n &mcasp1 {\n-\t\tpinctrl-names = \"default\";\n-\t\tpinctrl-0 = <&am335x_evm_audio_pins>;\n+\tpinctrl-names = \"default\";\n+\tpinctrl-0 = <&mcasp1_pins>;\n \n-\t\tstatus = \"okay\";\n+\tstatus = \"okay\";\n \n-\t\top-mode = <0>; /* MCASP_IIS_MODE */\n-\t\ttdm-slots = <2>;\n-\t\t/* 4 serializers */\n-\t\tserial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */\n-\t\t\t0 0 1 2\n-\t\t>;\n-\t\ttx-num-evt = <32>;\n-\t\trx-num-evt = <32>;\n+\top-mode = <0>; /* MCASP_IIS_MODE */\n+\ttdm-slots = <2>;\n+\t/* 4 serializers */\n+\tserial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */\n+\t\t0 0 1 2\n+\t>;\n+\ttx-num-evt = <32>;\n+\trx-num-evt = <32>;\n };\n \n &tps {\ndiff --git a/arch/arm/dts/am335x-evmsk.dts b/arch/arm/dts/am335x-evmsk.dts\nindex 4890e18c4a9..5d962252b7d 100644\n--- a/arch/arm/dts/am335x-evmsk.dts\n+++ b/arch/arm/dts/am335x-evmsk.dts\n@@ -29,12 +29,12 @@\n \t\t};\n \t};\n \n-\tmemory {\n+\tmemory@80000000 {\n \t\tdevice_type = \"memory\";\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n-\tvbat: fixedregulator@0 {\n+\tvbat: fixedregulator0 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"vbat\";\n \t\tregulator-min-microvolt = <5000000>;\n@@ -42,13 +42,13 @@\n \t\tregulator-boot-on;\n \t};\n \n-\tlis3_reg: fixedregulator@1 {\n+\tlis3_reg: fixedregulator1 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"lis3_reg\";\n \t\tregulator-boot-on;\n \t};\n \n-\twl12xx_vmmc: fixedregulator@2 {\n+\twl12xx_vmmc: fixedregulator2 {\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&wl12xx_gpio>;\n \t\tcompatible = \"regulator-fixed\";\n@@ -60,7 +60,7 @@\n \t\tenable-active-high;\n \t};\n \n-\tvtt_fixed: fixedregulator@3 {\n+\tvtt_fixed: fixedregulator3 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"vtt\";\n \t\tregulator-min-microvolt = <1500000>;\n@@ -77,26 +77,26 @@\n \n \t\tcompatible = \"gpio-leds\";\n \n-\t\tled@1 {\n+\t\tled1 {\n \t\t\tlabel = \"evmsk:green:usr0\";\n \t\t\tgpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@2 {\n+\t\tled2 {\n \t\t\tlabel = \"evmsk:green:usr1\";\n \t\t\tgpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@3 {\n+\t\tled3 {\n \t\t\tlabel = \"evmsk:green:mmc0\";\n \t\t\tgpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,default-trigger = \"mmc0\";\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@4 {\n+\t\tled4 {\n \t\t\tlabel = \"evmsk:green:heartbeat\";\n \t\t\tgpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,default-trigger = \"heartbeat\";\n@@ -104,36 +104,38 @@\n \t\t};\n \t};\n \n-\tgpio_buttons: gpio_buttons@0 {\n+\tgpio_buttons: gpio_buttons0 {\n \t\tcompatible = \"gpio-keys\";\n+\t\t#address-cells = <1>;\n+\t\t#size-cells = <0>;\n \n-\t\tswitch@1 {\n+\t\tswitch1 {\n \t\t\tlabel = \"button0\";\n \t\t\tlinux,code = <0x100>;\n \t\t\tgpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;\n \t\t};\n \n-\t\tswitch@2 {\n+\t\tswitch2 {\n \t\t\tlabel = \"button1\";\n \t\t\tlinux,code = <0x101>;\n \t\t\tgpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;\n \t\t};\n \n-\t\tswitch@3 {\n+\t\tswitch3 {\n \t\t\tlabel = \"button2\";\n \t\t\tlinux,code = <0x102>;\n \t\t\tgpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;\n \t\t\twakeup-source;\n \t\t};\n \n-\t\tswitch@4 {\n+\t\tswitch4 {\n \t\t\tlabel = \"button3\";\n \t\t\tlinux,code = <0x103>;\n \t\t\tgpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;\n \t\t};\n \t};\n \n-\tbacklight {\n+\tlcd_bl: backlight {\n \t\tcompatible = \"pwm-backlight\";\n \t\tpwms = <&ecap2 0 50000 PWM_POLARITY_INVERTED>;\n \t\tbrightness-levels = <0 58 61 66 75 90 125 170 255>;\n@@ -528,7 +530,7 @@\n &epwmss2 {\n \tstatus = \"okay\";\n \n-\tecap2: ecap@100 {\n+\tecap2: pwm@100 {\n \t\tstatus = \"okay\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&ecap2_pins>;\n@@ -719,7 +721,7 @@\n };\n \n &lcdc {\n- status = \"okay\";\n+\tstatus = \"okay\";\n };\n \n &rtc {\ndiff --git a/arch/arm/dts/am335x-guardian.dts b/arch/arm/dts/am335x-guardian.dts\nindex 6c37e52a0de..c2fd6101e32 100644\n--- a/arch/arm/dts/am335x-guardian.dts\n+++ b/arch/arm/dts/am335x-guardian.dts\n@@ -29,10 +29,10 @@\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n-\tgpio_keys {\n-\t\tcompatible = \"gpio-keys\";\n+\tguardian_buttons: gpio-keys {\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&guardian_button_pins>;\n+\t\tcompatible = \"gpio-keys\";\n \n \t\tselect-button {\n \t\t\tlabel = \"guardian-select-button\";\n@@ -49,10 +49,10 @@\n \t\t};\n \t};\n \n-\tleds {\n-\t\tcompatible = \"gpio-leds\";\n+\tguardian_leds: gpio-leds {\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&guardian_led_pins>;\n+\t\tcompatible = \"gpio-leds\";\n \n \t\tlife-led {\n \t\t\tlabel = \"guardian:life-led\";\n@@ -98,7 +98,7 @@\n \n \t};\n \n-\tpwm7: dmtimer-pwm {\n+\tpwm7: pwm-7 {\n \t\tcompatible = \"ti,omap-dmtimer-pwm\";\n \t\tti,timers = <&timer7>;\n \t\tpinctrl-names = \"default\";\ndiff --git a/arch/arm/dts/am335x-icev2.dts b/arch/arm/dts/am335x-icev2.dts\nindex cd7c4ae0627..a54272421cc 100644\n--- a/arch/arm/dts/am335x-icev2.dts\n+++ b/arch/arm/dts/am335x-icev2.dts\n@@ -21,12 +21,12 @@\n \t\ttick-timer = &timer2;\n \t};\n \n-\tmemory {\n+\tmemory@80000000 {\n \t\tdevice_type = \"memory\";\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n-\tvbat: fixedregulator@0 {\n+\tvbat: fixedregulator0 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"vbat\";\n \t\tregulator-min-microvolt = <5000000>;\n@@ -34,7 +34,7 @@\n \t\tregulator-boot-on;\n \t};\n \n-\tvtt_fixed: fixedregulator@1 {\n+\tvtt_fixed: fixedregulator1 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"vtt\";\n \t\tregulator-min-microvolt = <1500000>;\n@@ -45,52 +45,51 @@\n \t\tenable-active-high;\n \t};\n \n-\tleds@0 {\n+\tleds-iio {\n \t\tcompatible = \"gpio-leds\";\n-\n-\t\tled@0 {\n+\t\tled-out0 {\n \t\t\tlabel = \"out0\";\n \t\t\tgpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@1 {\n+\t\tled-out1 {\n \t\t\tlabel = \"out1\";\n \t\t\tgpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@2 {\n+\t\tled-out2 {\n \t\t\tlabel = \"out2\";\n \t\t\tgpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@3 {\n+\t\tled-out3 {\n \t\t\tlabel = \"out3\";\n \t\t\tgpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@4 {\n+\t\tled-out4 {\n \t\t\tlabel = \"out4\";\n \t\t\tgpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@5 {\n+\t\tled-out5 {\n \t\t\tlabel = \"out5\";\n \t\t\tgpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@6 {\n+\t\tled-out6 {\n \t\t\tlabel = \"out6\";\n \t\t\tgpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@7 {\n+\t\tled-out7 {\n \t\t\tlabel = \"out7\";\n \t\t\tgpios = <&tpic2810 7 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n@@ -98,44 +97,44 @@\n \t};\n \n \t/* Tricolor status LEDs */\n-\tleds@1 {\n+\tleds1 {\n \t\tcompatible = \"gpio-leds\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&user_leds>;\n \n-\t\tled@0 {\n+\t\tled0 {\n \t\t\tlabel = \"status0:red:cpu0\";\n \t\t\tgpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t\tlinux,default-trigger = \"cpu0\";\n \t\t};\n \n-\t\tled@1 {\n+\t\tled1 {\n \t\t\tlabel = \"status0:green:usr\";\n \t\t\tgpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@2 {\n+\t\tled2 {\n \t\t\tlabel = \"status0:yellow:usr\";\n \t\t\tgpios = <&gpio3 9 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@3 {\n+\t\tled3 {\n \t\t\tlabel = \"status1:red:mmc0\";\n \t\t\tgpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t\tlinux,default-trigger = \"mmc0\";\n \t\t};\n \n-\t\tled@4 {\n+\t\tled4 {\n \t\t\tlabel = \"status1:green:usr\";\n \t\t\tgpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tled@5 {\n+\t\tled5 {\n \t\t\tlabel = \"status1:yellow:usr\";\n \t\t\tgpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\n@@ -273,6 +272,56 @@\n \t};\n };\n \n+&spi0 {\n+\tstatus = \"okay\";\n+\tpinctrl-names = \"default\";\n+\tpinctrl-0 = <&spi0_pins_default>;\n+\n+\tsn65hvs882@1 {\n+\t\tcompatible = \"pisosr-gpio\";\n+\t\tgpio-controller;\n+\t\t#gpio-cells = <2>;\n+\n+\t\tload-gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;\n+\n+\t\treg = <1>;\n+\t\tspi-max-frequency = <1000000>;\n+\t\tspi-cpol;\n+\t};\n+\n+\tspi_nor: flash@0 {\n+\t\t#address-cells = <1>;\n+\t\t#size-cells = <1>;\n+\t\tcompatible = \"winbond,w25q64\", \"jedec,spi-nor\";\n+\t\tspi-max-frequency = <80000000>;\n+\t\tm25p,fast-read;\n+\t\treg = <0>;\n+\n+\t\tpartition@0 {\n+\t\t\tlabel = \"u-boot-spl\";\n+\t\t\treg = <0x0 0x80000>;\n+\t\t\tread-only;\n+\t\t};\n+\n+\t\tpartition@1 {\n+\t\t\tlabel = \"u-boot\";\n+\t\t\treg = <0x80000 0x100000>;\n+\t\t\tread-only;\n+\t\t};\n+\n+\t\tpartition@2 {\n+\t\t\tlabel = \"u-boot-env\";\n+\t\t\treg = <0x180000 0x20000>;\n+\t\t\tread-only;\n+\t\t};\n+\n+\t\tpartition@3 {\n+\t\t\tlabel = \"misc\";\n+\t\t\treg = <0x1A0000 0x660000>;\n+\t\t};\n+\t};\n+};\n+\n #include \"tps65910.dtsi\"\n \n &tps {\n@@ -378,16 +427,17 @@\n };\n \n &gpio3 {\n-\tp4 {\n+\tpr1-mii-ctl-hog {\n \t\tgpio-hog;\n \t\tgpios = <4 GPIO_ACTIVE_HIGH>;\n \t\toutput-high;\n \t\tline-name = \"PR1_MII_CTRL\";\n \t};\n \n-\tp10 {\n+\tmux-mii-hog {\n \t\tgpio-hog;\n \t\tgpios = <10 GPIO_ACTIVE_HIGH>;\n+\t\t/* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */\n \t\toutput-high;\n \t\tline-name = \"MUX_MII_CTRL\";\n \t};\n@@ -434,52 +484,3 @@\n \t};\n };\n \n-&spi0 {\n-\tstatus = \"okay\";\n-\tpinctrl-names = \"default\";\n-\tpinctrl-0 = <&spi0_pins_default>;\n-\n-\tsn65hvs882@1 {\n-\t\tcompatible = \"pisosr-gpio\";\n-\t\tgpio-controller;\n-\t\t#gpio-cells = <2>;\n-\n-\t\tload-gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;\n-\n-\t\treg = <1>;\n-\t\tspi-max-frequency = <1000000>;\n-\t\tspi-cpol;\n-\t};\n-\n-\tspi_nor: flash@0 {\n-\t\t#address-cells = <1>;\n-\t\t#size-cells = <1>;\n-\t\tcompatible = \"winbond,w25q64\", \"jedec,spi-nor\";\n-\t\tspi-max-frequency = <80000000>;\n-\t\tm25p,fast-read;\n-\t\treg = <0>;\n-\n-\t\tpartition@0 {\n-\t\t\tlabel = \"u-boot-spl\";\n-\t\t\treg = <0x0 0x80000>;\n-\t\t\tread-only;\n-\t\t};\n-\n-\t\tpartition@1 {\n-\t\t\tlabel = \"u-boot\";\n-\t\t\treg = <0x80000 0x100000>;\n-\t\t\tread-only;\n-\t\t};\n-\n-\t\tpartition@2 {\n-\t\t\tlabel = \"u-boot-env\";\n-\t\t\treg = <0x180000 0x20000>;\n-\t\t\tread-only;\n-\t\t};\n-\n-\t\tpartition@3 {\n-\t\t\tlabel = \"misc\";\n-\t\t\treg = <0x1A0000 0x660000>;\n-\t\t};\n-\t};\n-};\ndiff --git a/arch/arm/dts/am335x-igep0033.dtsi b/arch/arm/dts/am335x-igep0033.dtsi\nindex 911b894a683..ad57c74fafc 100644\n--- a/arch/arm/dts/am335x-igep0033.dtsi\n+++ b/arch/arm/dts/am335x-igep0033.dtsi\n@@ -171,7 +171,7 @@\n \t\t/* MTD partition table */\n \t\tpartition@0 {\n \t\t\tlabel = \"SPL\";\n-\t\t\treg = <0x00000000 0x000080000>;\n+\t\t\treg = <0x00000000 0x00080000>;\n \t\t};\n \n \t\tpartition@1 {\n@@ -191,7 +191,7 @@\n \n \t\tpartition@4 {\n \t\t\tlabel = \"File System\";\n-\t\t\treg = <0x00780000 0x007880000>;\n+\t\t\treg = <0x00780000 0x07880000>;\n \t\t};\n \t};\n };\ndiff --git a/arch/arm/dts/am335x-pdu001.dts b/arch/arm/dts/am335x-pdu001.dts\nindex fb1f799a9ee..582032461e7 100644\n--- a/arch/arm/dts/am335x-pdu001.dts\n+++ b/arch/arm/dts/am335x-pdu001.dts\n@@ -353,7 +353,7 @@\n \t\t};\n \t};\n \n-\tmcp79400: mcp79400@6f {\n+\tmcp79400: rtc@6f {\n \t\tcompatible = \"microchip,mcp7940x\";\n \t\treg = <0x6f>;\n \t};\ndiff --git a/arch/arm/dts/am335x-phycore-som.dtsi b/arch/arm/dts/am335x-phycore-som.dtsi\nindex ee6b1cb27ce..3f9a4eada39 100644\n--- a/arch/arm/dts/am335x-phycore-som.dtsi\n+++ b/arch/arm/dts/am335x-phycore-som.dtsi\n@@ -27,17 +27,13 @@\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n-\tregulators {\n-\t\tcompatible = \"simple-bus\";\n-\n-\t\tvcc5v: fixedregulator0 {\n-\t\t\tcompatible = \"regulator-fixed\";\n-\t\t\tregulator-name = \"vcc5v\";\n-\t\t\tregulator-min-microvolt = <5000000>;\n-\t\t\tregulator-max-microvolt = <5000000>;\n-\t\t\tregulator-boot-on;\n-\t\t\tregulator-always-on;\n-\t\t};\n+\tvcc5v: fixedregulator0 {\n+\t\tcompatible = \"regulator-fixed\";\n+\t\tregulator-name = \"vcc5v\";\n+\t\tregulator-min-microvolt = <5000000>;\n+\t\tregulator-max-microvolt = <5000000>;\n+\t\tregulator-boot-on;\n+\t\tregulator-always-on;\n \t};\n };\n \n@@ -306,7 +302,7 @@\n \tpinctrl-0 = <&spi0_pins>;\n \tstatus = \"okay\";\n \n-\tserial_flash: m25p80@0 {\n+\tserial_flash: flash@0 {\n \t\tcompatible = \"jedec,spi-nor\";\n \t\tspi-max-frequency = <48000000>;\n \t\treg = <0x0>;\ndiff --git a/arch/arm/dts/am335x-pocketbeagle.dts b/arch/arm/dts/am335x-pocketbeagle.dts\nindex 5cfd5731750..b379e3a5570 100644\n--- a/arch/arm/dts/am335x-pocketbeagle.dts\n+++ b/arch/arm/dts/am335x-pocketbeagle.dts\n@@ -23,28 +23,28 @@\n \n \t\tcompatible = \"gpio-leds\";\n \n-\t\tusr0 {\n+\t\tled-usr0 {\n \t\t\tlabel = \"beaglebone:green:usr0\";\n \t\t\tgpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,default-trigger = \"heartbeat\";\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tusr1 {\n+\t\tled-usr1 {\n \t\t\tlabel = \"beaglebone:green:usr1\";\n \t\t\tgpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,default-trigger = \"mmc0\";\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tusr2 {\n+\t\tled-usr2 {\n \t\t\tlabel = \"beaglebone:green:usr2\";\n \t\t\tgpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,default-trigger = \"cpu0\";\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n-\t\tusr3 {\n+\t\tled-usr3 {\n \t\t\tlabel = \"beaglebone:green:usr3\";\n \t\t\tgpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;\n \t\t\tdefault-state = \"off\";\ndiff --git a/arch/arm/dts/am335x-pxm2.dtsi b/arch/arm/dts/am335x-pxm2.dtsi\nindex 645d221507b..a51d6aceb96 100644\n--- a/arch/arm/dts/am335x-pxm2.dtsi\n+++ b/arch/arm/dts/am335x-pxm2.dtsi\n@@ -148,7 +148,7 @@\n &epwmss0 {\n \tstatus = \"okay\";\n \n-\tecap0: ecap@100 {\n+\tecap0: pwm@100 {\n \t\tstatus = \"okay\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&ecap0_pins>;\ndiff --git a/arch/arm/dts/am335x-rut.dts b/arch/arm/dts/am335x-rut.dts\nindex cc06f5d23ad..7760b9709a8 100644\n--- a/arch/arm/dts/am335x-rut.dts\n+++ b/arch/arm/dts/am335x-rut.dts\n@@ -174,7 +174,7 @@\n &epwmss0 {\n \tstatus = \"okay\";\n \n-\tecap0: ecap@100 {\n+\tecap0: pwm@100 {\n \t\tstatus = \"okay\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&ecap0_pins>;\ndiff --git a/arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts\nindex 246a1a9b3e4..a2676d10c24 100644\n--- a/arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts\n+++ b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts\n@@ -23,7 +23,7 @@\n \t\tregulator-name = \"wlan-en-regulator\";\n \t\tregulator-min-microvolt = <3300000>;\n \t\tregulator-max-microvolt = <3300000>;\n-\t\tstartup-delay-us= <100000>;\n+\t\tstartup-delay-us = <100000>;\n \t};\n };\n \ndiff --git a/arch/arm/dts/am335x-shc.dts b/arch/arm/dts/am335x-shc.dts\nindex 7724428e661..b44b15961bd 100644\n--- a/arch/arm/dts/am335x-shc.dts\n+++ b/arch/arm/dts/am335x-shc.dts\n@@ -36,10 +36,10 @@\n \t\t};\n \t};\n \n-\tgpio_keys {\n+\tgpio-keys {\n \t\tcompatible = \"gpio-keys\";\n \n-\t\tback_button {\n+\t\tback-button {\n \t\t\tlabel = \"Back Button\";\n \t\t\tgpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,code = <KEY_BACK>;\n@@ -47,7 +47,7 @@\n \t\t\twakeup-source;\n \t\t};\n \n-\t\tfront_button {\n+\t\tfront-button {\n \t\t\tlabel = \"Front Button\";\n \t\t\tgpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;\n \t\t\tlinux,code = <KEY_FRONT>;\n@@ -144,14 +144,14 @@\n };\n \n &gpio1 {\n-\thmtc_rst {\n+\thmtc-rst-hog {\n \t\tgpio-hog;\n \t\tgpios = <24 GPIO_ACTIVE_LOW>;\n \t\toutput-high;\n \t\tline-name = \"homematic_reset\";\n \t};\n \n-\thmtc_prog {\n+\thmtc-prog-hog {\n \t\tgpio-hog;\n \t\tgpios = <27 GPIO_ACTIVE_LOW>;\n \t\toutput-high;\n@@ -160,14 +160,14 @@\n };\n \n &gpio3 {\n-\tzgb_rst {\n+\tzgb-rst-hog {\n \t\tgpio-hog;\n \t\tgpios = <18 GPIO_ACTIVE_LOW>;\n \t\toutput-low;\n \t\tline-name = \"zigbee_reset\";\n \t};\n \n-\tzgb_boot {\n+\tzgb-boot-hog {\n \t\tgpio-hog;\n \t\tgpios = <19 GPIO_ACTIVE_HIGH>;\n \t\toutput-high;\ndiff --git a/arch/arm/dts/am335x-sl50.dts b/arch/arm/dts/am335x-sl50.dts\nindex 644ba4b2c2c..56c0943848a 100644\n--- a/arch/arm/dts/am335x-sl50.dts\n+++ b/arch/arm/dts/am335x-sl50.dts\n@@ -31,25 +31,25 @@\n \t\tpinctrl-0 = <&led_pins>;\n \n \t\tled0 {\n-\t\t\tlabel = \"sl50:green:usr0\";\n+\t\t\tlabel = \"sl50:red:usr0\";\n \t\t\tgpios = <&gpio1 21 GPIO_ACTIVE_LOW>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n \t\tled1 {\n-\t\t\tlabel = \"sl50:red:usr1\";\n+\t\t\tlabel = \"sl50:green:usr1\";\n \t\t\tgpios = <&gpio1 22 GPIO_ACTIVE_LOW>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n \t\tled2 {\n-\t\t\tlabel = \"sl50:green:usr2\";\n+\t\t\tlabel = \"sl50:red:usr2\";\n \t\t\tgpios = <&gpio1 23 GPIO_ACTIVE_LOW>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n \n \t\tled3 {\n-\t\t\tlabel = \"sl50:red:usr3\";\n+\t\t\tlabel = \"sl50:green:usr3\";\n \t\t\tgpios = <&gpio1 24 GPIO_ACTIVE_LOW>;\n \t\t\tdefault-state = \"off\";\n \t\t};\n@@ -75,7 +75,7 @@\n \t\t#size-cells = <0>;\n \n \t\t/* audio external oscillator */\n-\t\ttlv320aic3x_mclk: oscillator@0 {\n+\t\taudio_mclk_fixed: oscillator@0 {\n \t\t\tcompatible = \"fixed-clock\";\n \t\t\t#clock-cells = <0>;\n \t\t\tclock-frequency = <24576000>;\t/* 24.576MHz */\n@@ -88,7 +88,7 @@\n \t\tti,audio-codec = <&audio_codec>;\n \t\tti,mcasp-controller = <&mcasp0>;\n \n-\t\tclocks = <&tlv320aic3x_mclk>;\n+\t\tclocks = <&audio_mclk_fixed>;\n \t\tclock-names = \"mclk\";\n \n \t\tti,audio-routing =\n@@ -430,7 +430,7 @@\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&spi0_pins>;\n \n-\tflash: n25q032@1 {\n+\tflash: flash@1 {\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tcompatible = \"micron,n25q032\";\ndiff --git a/arch/arm/dts/am335x-wega.dtsi b/arch/arm/dts/am335x-wega.dtsi\nindex 3efcf31b84c..408034df011 100644\n--- a/arch/arm/dts/am335x-wega.dtsi\n+++ b/arch/arm/dts/am335x-wega.dtsi\n@@ -12,16 +12,12 @@\n \t\tcompatible = \"ti,da830-evm-audio\";\n \t};\n \n-\tregulators {\n-\t\tcompatible = \"simple-bus\";\n-\n-\t\tvcc3v3: fixedregulator1 {\n-\t\t\tcompatible = \"regulator-fixed\";\n-\t\t\tregulator-name = \"vcc3v3\";\n-\t\t\tregulator-min-microvolt = <3300000>;\n-\t\t\tregulator-max-microvolt = <3300000>;\n-\t\t\tregulator-boot-on;\n-\t\t};\n+\tvcc3v3: fixedregulator1 {\n+\t\tcompatible = \"regulator-fixed\";\n+\t\tregulator-name = \"vcc3v3\";\n+\t\tregulator-min-microvolt = <3300000>;\n+\t\tregulator-max-microvolt = <3300000>;\n+\t\tregulator-boot-on;\n \t};\n };\n \ndiff --git a/arch/arm/dts/am33xx-clocks.dtsi b/arch/arm/dts/am33xx-clocks.dtsi\nindex b7b7106f2de..2984b2f9f3c 100644\n--- a/arch/arm/dts/am33xx-clocks.dtsi\n+++ b/arch/arm/dts/am33xx-clocks.dtsi\n@@ -5,7 +5,7 @@\n * Copyright (C) 2013 Texas Instruments, Inc.\n */\n &scm_clocks {\n-\tsys_clkin_ck: sys_clkin_ck@40 {\n+\tsys_clkin_ck: clock-sys-clkin-22@40 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>;\n@@ -13,7 +13,7 @@\n \t\treg = <0x0040>;\n \t};\n \n-\tadc_tsc_fck: adc_tsc_fck {\n+\tadc_tsc_fck: clock-adc-tsc-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -21,7 +21,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tdcan0_fck: dcan0_fck {\n+\tdcan0_fck: clock-dcan0-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -29,7 +29,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tdcan1_fck: dcan1_fck {\n+\tdcan1_fck: clock-dcan1-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -37,7 +37,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tmcasp0_fck: mcasp0_fck {\n+\tmcasp0_fck: clock-mcasp0-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -45,7 +45,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tmcasp1_fck: mcasp1_fck {\n+\tmcasp1_fck: clock-mcasp1-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -53,7 +53,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tsmartreflex0_fck: smartreflex0_fck {\n+\tsmartreflex0_fck: clock-smartreflex0-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -61,7 +61,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tsmartreflex1_fck: smartreflex1_fck {\n+\tsmartreflex1_fck: clock-smartreflex1-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -69,7 +69,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tsha0_fck: sha0_fck {\n+\tsha0_fck: clock-sha0-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -77,7 +77,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\taes0_fck: aes0_fck {\n+\taes0_fck: clock-aes0-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -85,7 +85,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\trng_fck: rng_fck {\n+\trng_fck: clock-rng-fck {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&sys_clkin_ck>;\n@@ -118,62 +118,62 @@\n \t};\n };\n &prcm_clocks {\n-\tclk_32768_ck: clk_32768_ck {\n+\tclk_32768_ck: clock-clk-32768 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <32768>;\n \t};\n \n-\tclk_rc32k_ck: clk_rc32k_ck {\n+\tclk_rc32k_ck: clock-clk-rc32k {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <32000>;\n \t};\n \n-\tvirt_19200000_ck: virt_19200000_ck {\n+\tvirt_19200000_ck: clock-virt-19200000 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <19200000>;\n \t};\n \n-\tvirt_24000000_ck: virt_24000000_ck {\n+\tvirt_24000000_ck: clock-virt-24000000 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <24000000>;\n \t};\n \n-\tvirt_25000000_ck: virt_25000000_ck {\n+\tvirt_25000000_ck: clock-virt-25000000 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <25000000>;\n \t};\n \n-\tvirt_26000000_ck: virt_26000000_ck {\n+\tvirt_26000000_ck: clock-virt-26000000 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <26000000>;\n \t};\n \n-\ttclkin_ck: tclkin_ck {\n+\ttclkin_ck: clock-tclkin {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-clock\";\n \t\tclock-frequency = <12000000>;\n \t};\n \n-\tdpll_core_ck: dpll_core_ck@490 {\n+\tdpll_core_ck: clock@490 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-core-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&sys_clkin_ck>;\n \t\treg = <0x0490>, <0x045c>, <0x0468>, <0x0460>, <0x0464>;\n \t};\n \n-\tdpll_core_x2_ck: dpll_core_x2_ck {\n+\tdpll_core_x2_ck: clock-dpll-core-x2 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-x2-clock\";\n \t\tclocks = <&dpll_core_ck>;\n \t};\n \n-\tdpll_core_m4_ck: dpll_core_m4_ck@480 {\n+\tdpll_core_m4_ck: clock-dpll-core-m4@480 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_core_x2_ck>;\n@@ -182,7 +182,7 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_core_m5_ck: dpll_core_m5_ck@484 {\n+\tdpll_core_m5_ck: clock-dpll-core-m5@484 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_core_x2_ck>;\n@@ -191,7 +191,7 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_core_m6_ck: dpll_core_m6_ck@4d8 {\n+\tdpll_core_m6_ck: clock-dpll-core-m6@4d8 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_core_x2_ck>;\n@@ -200,14 +200,14 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_mpu_ck: dpll_mpu_ck@488 {\n+\tdpll_mpu_ck: clock@488 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&sys_clkin_ck>;\n \t\treg = <0x0488>, <0x0420>, <0x042c>, <0x0424>, <0x0428>;\n \t};\n \n-\tdpll_mpu_m2_ck: dpll_mpu_m2_ck@4a8 {\n+\tdpll_mpu_m2_ck: clock-dpll-mpu-m2@4a8 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_mpu_ck>;\n@@ -216,14 +216,14 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_ddr_ck: dpll_ddr_ck@494 {\n+\tdpll_ddr_ck: clock@494 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-no-gate-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&sys_clkin_ck>;\n \t\treg = <0x0494>, <0x0434>, <0x0440>, <0x0438>, <0x043c>;\n \t};\n \n-\tdpll_ddr_m2_ck: dpll_ddr_m2_ck@4a0 {\n+\tdpll_ddr_m2_ck: clock-dpll-ddr-m2@4a0 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_ddr_ck>;\n@@ -232,7 +232,7 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_ddr_m2_div2_ck: dpll_ddr_m2_div2_ck {\n+\tdpll_ddr_m2_div2_ck: clock-dpll-ddr-m2-div2 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_ddr_m2_ck>;\n@@ -240,14 +240,14 @@\n \t\tclock-div = <2>;\n \t};\n \n-\tdpll_disp_ck: dpll_disp_ck@498 {\n+\tdpll_disp_ck: clock@498 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-no-gate-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&sys_clkin_ck>;\n \t\treg = <0x0498>, <0x0448>, <0x0454>, <0x044c>, <0x0450>;\n \t};\n \n-\tdpll_disp_m2_ck: dpll_disp_m2_ck@4a4 {\n+\tdpll_disp_m2_ck: clock-dpll-disp-m2@4a4 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_disp_ck>;\n@@ -257,14 +257,14 @@\n \t\tti,set-rate-parent;\n \t};\n \n-\tdpll_per_ck: dpll_per_ck@48c {\n+\tdpll_per_ck: clock@48c {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,am3-dpll-no-gate-j-type-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&sys_clkin_ck>;\n \t\treg = <0x048c>, <0x0470>, <0x049c>, <0x0474>, <0x0478>;\n \t};\n \n-\tdpll_per_m2_ck: dpll_per_m2_ck@4ac {\n+\tdpll_per_m2_ck: clock-dpll-per-m2@4ac {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,divider-clock\";\n \t\tclocks = <&dpll_per_ck>;\n@@ -273,7 +273,7 @@\n \t\tti,index-starts-at-one;\n \t};\n \n-\tdpll_per_m2_div4_wkupdm_ck: dpll_per_m2_div4_wkupdm_ck {\n+\tdpll_per_m2_div4_wkupdm_ck: clock-dpll-per-m2-div4-wkupdm {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_per_m2_ck>;\n@@ -281,7 +281,7 @@\n \t\tclock-div = <4>;\n \t};\n \n-\tdpll_per_m2_div4_ck: dpll_per_m2_div4_ck {\n+\tdpll_per_m2_div4_ck: clock-dpll-per-m2-div4 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_per_m2_ck>;\n@@ -289,7 +289,7 @@\n \t\tclock-div = <4>;\n \t};\n \n-\tclk_24mhz: clk_24mhz {\n+\tclk_24mhz: clock-clk-24mhz {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_per_m2_ck>;\n@@ -297,7 +297,7 @@\n \t\tclock-div = <8>;\n \t};\n \n-\tclkdiv32k_ck: clkdiv32k_ck {\n+\tclkdiv32k_ck: clock-clkdiv32k {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&clk_24mhz>;\n@@ -305,7 +305,7 @@\n \t\tclock-div = <732>;\n \t};\n \n-\tl3_gclk: l3_gclk {\n+\tl3_gclk: clock-l3-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -313,14 +313,14 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tpruss_ocp_gclk: pruss_ocp_gclk@530 {\n+\tpruss_ocp_gclk: clock-pruss-ocp-gclk@530 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&l3_gclk>, <&dpll_disp_m2_ck>;\n \t\treg = <0x0530>;\n \t};\n \n-\tmmu_fck: mmu_fck@914 {\n+\tmmu_fck: clock-mmu-fck-1@914 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,gate-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -328,56 +328,56 @@\n \t\treg = <0x0914>;\n \t};\n \n-\ttimer1_fck: timer1_fck@528 {\n+\ttimer1_fck: clock-timer1-fck@528 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>;\n \t\treg = <0x0528>;\n \t};\n \n-\ttimer2_fck: timer2_fck@508 {\n+\ttimer2_fck: clock-timer2-fck@508 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x0508>;\n \t};\n \n-\ttimer3_fck: timer3_fck@50c {\n+\ttimer3_fck: clock-timer3-fck@50c {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x050c>;\n \t};\n \n-\ttimer4_fck: timer4_fck@510 {\n+\ttimer4_fck: clock-timer4-fck@510 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x0510>;\n \t};\n \n-\ttimer5_fck: timer5_fck@518 {\n+\ttimer5_fck: clock-timer5-fck@518 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x0518>;\n \t};\n \n-\ttimer6_fck: timer6_fck@51c {\n+\ttimer6_fck: clock-timer6-fck@51c {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x051c>;\n \t};\n \n-\ttimer7_fck: timer7_fck@504 {\n+\ttimer7_fck: clock-timer7-fck@504 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x0504>;\n \t};\n \n-\tusbotg_fck: usbotg_fck@47c {\n+\tusbotg_fck: clock-usbotg-fck-8@47c {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,gate-clock\";\n \t\tclocks = <&dpll_per_ck>;\n@@ -385,7 +385,7 @@\n \t\treg = <0x047c>;\n \t};\n \n-\tdpll_core_m4_div2_ck: dpll_core_m4_div2_ck {\n+\tdpll_core_m4_div2_ck: clock-dpll-core-m4-div2 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -393,7 +393,7 @@\n \t\tclock-div = <2>;\n \t};\n \n-\tieee5000_fck: ieee5000_fck@e4 {\n+\tieee5000_fck: clock-ieee5000-fck-1@e4 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,gate-clock\";\n \t\tclocks = <&dpll_core_m4_div2_ck>;\n@@ -401,14 +401,14 @@\n \t\treg = <0x00e4>;\n \t};\n \n-\twdt1_fck: wdt1_fck@538 {\n+\twdt1_fck: clock-wdt1-fck@538 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&clk_rc32k_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x0538>;\n \t};\n \n-\tl4_rtc_gclk: l4_rtc_gclk {\n+\tl4_rtc_gclk: clock-l4-rtc-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -416,7 +416,7 @@\n \t\tclock-div = <2>;\n \t};\n \n-\tl4hs_gclk: l4hs_gclk {\n+\tl4hs_gclk: clock-l4hs-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -424,7 +424,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tl3s_gclk: l3s_gclk {\n+\tl3s_gclk: clock-l3s-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_div2_ck>;\n@@ -432,7 +432,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tl4fw_gclk: l4fw_gclk {\n+\tl4fw_gclk: clock-l4fw-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_div2_ck>;\n@@ -440,7 +440,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tl4ls_gclk: l4ls_gclk {\n+\tl4ls_gclk: clock-l4ls-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_div2_ck>;\n@@ -448,7 +448,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tsysclk_div_ck: sysclk_div_ck {\n+\tsysclk_div_ck: clock-sysclk-div {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m4_ck>;\n@@ -456,7 +456,7 @@\n \t\tclock-div = <1>;\n \t};\n \n-\tcpsw_125mhz_gclk: cpsw_125mhz_gclk {\n+\tcpsw_125mhz_gclk: clock-cpsw-125mhz-gclk {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_core_m5_ck>;\n@@ -464,21 +464,21 @@\n \t\tclock-div = <2>;\n \t};\n \n-\tcpsw_cpts_rft_clk: cpsw_cpts_rft_clk@520 {\n+\tcpsw_cpts_rft_clk: clock-cpsw-cpts-rft@520 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&dpll_core_m5_ck>, <&dpll_core_m4_ck>;\n \t\treg = <0x0520>;\n \t};\n \n-\tgpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@53c {\n+\tgpio0_dbclk_mux_ck: clock-gpio0-dbclk-mux@53c {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;\n \t\treg = <0x053c>;\n \t};\n \n-\tlcd_gclk: lcd_gclk@534 {\n+\tlcd_gclk: clock-lcd-gclk@534 {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"ti,mux-clock\";\n \t\tclocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>;\n@@ -486,7 +486,7 @@\n \t\tti,set-rate-parent;\n \t};\n \n-\tmmc_clk: mmc_clk {\n+\tmmc_clk: clock-mmc {\n \t\t#clock-cells = <0>;\n \t\tcompatible = \"fixed-factor-clock\";\n \t\tclocks = <&dpll_per_m2_ck>;\n@@ -536,138 +536,138 @@\n };\n \n &prcm {\n-\tper_cm: per-cm@0 {\n+\tper_cm: clock@0 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0x0 0x400>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0x0 0x400>;\n \n-\t\tl4ls_clkctrl: l4ls-clkctrl@38 {\n+\t\tl4ls_clkctrl: clock@38 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x38 0x2c>, <0x6c 0x28>, <0xac 0xc>, <0xc0 0x1c>, <0xec 0xc>, <0x10c 0x8>, <0x130 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tl3s_clkctrl: l3s-clkctrl@1c {\n+\t\tl3s_clkctrl: clock@1c {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x1c 0x4>, <0x30 0x8>, <0x68 0x4>, <0xf8 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tl3_clkctrl: l3-clkctrl@24 {\n+\t\tl3_clkctrl: clock@24 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x24 0xc>, <0x94 0x10>, <0xbc 0x4>, <0xdc 0x8>, <0xfc 0x8>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tl4hs_clkctrl: l4hs-clkctrl@120 {\n+\t\tl4hs_clkctrl: clock@120 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x120 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tpruss_ocp_clkctrl: pruss-ocp-clkctrl@e8 {\n+\t\tpruss_ocp_clkctrl: clock@e8 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0xe8 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tcpsw_125mhz_clkctrl: cpsw-125mhz-clkctrl@0 {\n+\t\tcpsw_125mhz_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x18>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tlcdc_clkctrl: lcdc-clkctrl@18 {\n+\t\tlcdc_clkctrl: clock@18 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x18 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tclk_24mhz_clkctrl: clk-24mhz-clkctrl@14c {\n+\t\tclk_24mhz_clkctrl: clock@14c {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x14c 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \t};\n \n-\twkup_cm: wkup-cm@400 {\n+\twkup_cm: clock@400 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0x400 0x100>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0x400 0x100>;\n \n-\t\tl4_wkup_clkctrl: l4-wkup-clkctrl@0 {\n+\t\tl4_wkup_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x10>, <0xb4 0x24>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tl3_aon_clkctrl: l3-aon-clkctrl@14 {\n+\t\tl3_aon_clkctrl: clock@14 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x14 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \n-\t\tl4_wkup_aon_clkctrl: l4-wkup-aon-clkctrl@b0 {\n+\t\tl4_wkup_aon_clkctrl: clock@b0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0xb0 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \t};\n \n-\tmpu_cm: mpu-cm@600 {\n+\tmpu_cm: clock@600 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0x600 0x100>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0x600 0x100>;\n \n-\t\tmpu_clkctrl: mpu-clkctrl@0 {\n+\t\tmpu_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x8>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \t};\n \n-\tl4_rtc_cm: l4-rtc-cm@800 {\n+\tl4_rtc_cm: clock@800 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0x800 0x100>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0x800 0x100>;\n \n-\t\tl4_rtc_clkctrl: l4-rtc-clkctrl@0 {\n+\t\tl4_rtc_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x4>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \t};\n \n-\tgfx_l3_cm: gfx-l3-cm@900 {\n+\tgfx_l3_cm: clock@900 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0x900 0x100>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0x900 0x100>;\n \n-\t\tgfx_l3_clkctrl: gfx-l3-clkctrl@0 {\n+\t\tgfx_l3_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x8>;\n \t\t\t#clock-cells = <2>;\n \t\t};\n \t};\n \n-\tl4_cefuse_cm: l4-cefuse-cm@a00 {\n+\tl4_cefuse_cm: clock@a00 {\n \t\tcompatible = \"ti,omap4-cm\";\n \t\treg = <0xa00 0x100>;\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n \t\tranges = <0 0xa00 0x100>;\n \n-\t\tl4_cefuse_clkctrl: l4-cefuse-clkctrl@0 {\n+\t\tl4_cefuse_clkctrl: clock@0 {\n \t\t\tcompatible = \"ti,clkctrl\";\n \t\t\treg = <0x0 0x24>;\n \t\t\t#clock-cells = <2>;\ndiff --git a/arch/arm/dts/am33xx-l4.dtsi b/arch/arm/dts/am33xx-l4.dtsi\nindex 5892612efa8..2264a1a80d0 100644\n--- a/arch/arm/dts/am33xx-l4.dtsi\n+++ b/arch/arm/dts/am33xx-l4.dtsi\n@@ -1327,7 +1327,7 @@\n \t\t\t\t#mbox-cells = <1>;\n \t\t\t\tti,mbox-num-users = <4>;\n \t\t\t\tti,mbox-num-fifos = <8>;\n-\t\t\t\tmbox_wkupm3: wkup_m3 {\n+\t\t\t\tmbox_wkupm3: mbox-wkup-m3 {\n \t\t\t\t\tti,mbox-send-noirq;\n \t\t\t\t\tti,mbox-tx = <0 0 0>;\n \t\t\t\t\tti,mbox-rx = <0 0 3>;\n@@ -1621,7 +1621,7 @@\n \t\t\t};\n \t\t};\n \n-\t\ttarget-module@ae000 {\t\t\t/* 0x481ae000, ap 56 3a.0 */\n+\t\ttarget-module@ae000 {\t\t/* 0x481ae000, ap 56 3a.0 */\n \t\t\tcompatible = \"ti,sysc-omap2\", \"ti,sysc\";\n \t\t\treg = <0xae000 0x4>,\n \t\t\t <0xae010 0x4>,\n@@ -1798,7 +1798,7 @@\n \t\t\t\tstatus = \"disabled\";\n \t\t\t\tranges = <0 0 0x1000>;\n \n-\t\t\t\tecap0: ecap@100 {\n+\t\t\t\tecap0: pwm@100 {\n \t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n \t\t\t\t\t\t \"ti,am33xx-ecap\";\n \t\t\t\t\t#pwm-cells = <3>;\n@@ -1859,7 +1859,7 @@\n \t\t\t\tstatus = \"disabled\";\n \t\t\t\tranges = <0 0 0x1000>;\n \n-\t\t\t\tecap1: ecap@100 {\n+\t\t\t\tecap1: pwm@100 {\n \t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n \t\t\t\t\t\t \"ti,am33xx-ecap\";\n \t\t\t\t\t#pwm-cells = <3>;\n@@ -1920,7 +1920,7 @@\n \t\t\t\tstatus = \"disabled\";\n \t\t\t\tranges = <0 0 0x1000>;\n \n-\t\t\t\tecap2: ecap@100 {\n+\t\t\t\tecap2: pwm@100 {\n \t\t\t\t\tcompatible = \"ti,am3352-ecap\",\n \t\t\t\t\t\t \"ti,am33xx-ecap\";\n \t\t\t\t\t#pwm-cells = <3>;\ndiff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi\nindex a9ce8fdd3d5..3c7e0385f36 100644\n--- a/arch/arm/dts/am33xx.dtsi\n+++ b/arch/arm/dts/am33xx.dtsi\n@@ -172,7 +172,7 @@\n \t * for the moment, just use a fake OCP bus entry to represent\n \t * the whole bus hierarchy.\n \t */\n-\tocp {\n+\tocp: ocp {\n \t\tcompatible = \"simple-bus\";\n \t\t#address-cells = <1>;\n \t\t#size-cells = <1>;\n@@ -322,11 +322,11 @@\n \t\t\tranges = <0x0 0x47810000 0x1000>;\n \n \t\t\tmmc3: mmc@0 {\n-\t\t\t compatible = \"ti,am335-sdhci\";\n-\t\t\t ti,needs-special-reset;\n-\t\t\t interrupts = <29>;\n-\t\t\t reg = <0x0 0x1000>;\n-\t\t\t status = \"disabled\";\n+\t\t\t\tcompatible = \"ti,am335-sdhci\";\n+\t\t\t\tti,needs-special-reset;\n+\t\t\t\tinterrupts = <29>;\n+\t\t\t\treg = <0x0 0x1000>;\n+\t\t\t\tstatus = \"disabled\";\n \t\t\t};\n \t\t};\n \ndiff --git a/arch/arm/dts/am3517-evm-ui.dtsi b/arch/arm/dts/am3517-evm-ui.dtsi\nindex 340e68178ce..75ad42179ae 100644\n--- a/arch/arm/dts/am3517-evm-ui.dtsi\n+++ b/arch/arm/dts/am3517-evm-ui.dtsi\n@@ -70,61 +70,61 @@\n \t\tcompatible = \"gpio-keys-polled\";\n \t\tpoll-interval = <100>;\n \n-\t\trecord {\n+\t\tkey-record {\n \t\t\tlabel = \"Record\";\n-\t\t\tlinux,code = <KEY_RECORD>;\n+\t\t\t/* linux,code = <BTN_0>; */\n \t\t\tgpios = <&tca6416_2 15 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tplay {\n+\t\tkey-play {\n \t\t\tlabel = \"Play\";\n \t\t\tlinux,code = <KEY_PLAY>;\n \t\t\tgpios = <&tca6416_2 14 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tStop {\n+\t\tkey-stop {\n \t\t\tlabel = \"Stop\";\n \t\t\tlinux,code = <KEY_STOP>;\n \t\t\tgpios = <&tca6416_2 13 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tfwd {\n+\t\tkey-fwd {\n \t\t\tlabel = \"FWD\";\n \t\t\tlinux,code = <KEY_FASTFORWARD>;\n \t\t\tgpios = <&tca6416_2 12 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\trwd {\n+\t\tkey-rwd {\n \t\t\tlabel = \"RWD\";\n \t\t\tlinux,code = <KEY_REWIND>;\n \t\t\tgpios = <&tca6416_2 11 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tshift {\n+\t\tkey-shift {\n \t\t\tlabel = \"Shift\";\n \t\t\tlinux,code = <KEY_LEFTSHIFT>;\n \t\t\tgpios = <&tca6416_2 10 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tMode {\n+\t\tkey-mode {\n \t\t\tlabel = \"Mode\";\n \t\t\tlinux,code = <BTN_MODE>;\n \t\t\tgpios = <&tca6416_2 9 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tMenu {\n+\t\tkey-menu {\n \t\t\tlabel = \"Menu\";\n \t\t\tlinux,code = <KEY_MENU>;\n \t\t\tgpios = <&tca6416_2 8 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tUp {\n+\t\tkey-up {\n \t\t\tlabel = \"Up\";\n \t\t\tlinux,code = <KEY_UP>;\n \t\t\tgpios = <&tca6416_2 7 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tDown {\n+\t\tkey-down {\n \t\t\tlabel = \"Down\";\n \t\t\tlinux,code = <KEY_DOWN>;\n \t\t\tgpios = <&tca6416_2 6 GPIO_ACTIVE_LOW>;\n@@ -137,14 +137,14 @@\n \ttlv320aic23_1: codec@1a {\n \t\tcompatible = \"ti,tlv320aic23\";\n \t\treg = <0x1a>;\n-\t\t#sound-dai-cells= <0>;\n+\t\t#sound-dai-cells = <0>;\n \t\tstatus = \"okay\";\n \t};\n \n \ttlv320aic23_2: codec@1b {\n \t\tcompatible = \"ti,tlv320aic23\";\n \t\treg = <0x1b>;\n-\t\t#sound-dai-cells= <0>;\n+\t\t#sound-dai-cells = <0>;\n \t\tstatus = \"okay\";\n \t};\n };\n@@ -154,7 +154,7 @@\n \ttlv320aic23_3: codec@1a {\n \t\tcompatible = \"ti,tlv320aic23\";\n \t\treg = <0x1a>;\n-\t\t#sound-dai-cells= <0>;\n+\t\t#sound-dai-cells = <0>;\n \t\tstatus = \"okay\";\n \t};\n \ndiff --git a/arch/arm/dts/am3517-evm.dts b/arch/arm/dts/am3517-evm.dts\nindex a01f9cf047d..d21bb2ccd0f 100644\n--- a/arch/arm/dts/am3517-evm.dts\n+++ b/arch/arm/dts/am3517-evm.dts\n@@ -26,66 +26,66 @@\n \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n \t};\n \n- vmmc_fixed: vmmc {\n- compatible = \"regulator-fixed\";\n- regulator-name = \"vmmc_fixed\";\n- regulator-min-microvolt = <3300000>;\n- regulator-max-microvolt = <3300000>;\n- };\n+\tvmmc_fixed: vmmc {\n+\t\tcompatible = \"regulator-fixed\";\n+\t\tregulator-name = \"vmmc_fixed\";\n+\t\tregulator-min-microvolt = <3300000>;\n+\t\tregulator-max-microvolt = <3300000>;\n+\t};\n \n \tgpio-keys {\n \t\tcompatible = \"gpio-keys-polled\";\n \t\tpoll-interval = <100>;\n \n-\t\tuser_pb {\n+\t\tbutton-user {\n \t\t\tlabel = \"User Push Button\";\n \t\t\tlinux,code = <BTN_0>;\n \t\t\tgpios = <&tca6416 5 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_1 {\n+\t\tswitch-1 {\n \t\t\tlabel = \"User Switch 1\";\n \t\t\tlinux,code = <BTN_1>;\n \t\t\tgpios = <&tca6416 8 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_2 {\n+\t\tswitch-2 {\n \t\t\tlabel = \"User Switch 2\";\n \t\t\tlinux,code = <BTN_2>;\n \t\t\tgpios = <&tca6416 9 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_3 {\n+\t\tswitch-3 {\n \t\t\tlabel = \"User Switch 3\";\n \t\t\tlinux,code = <BTN_3>;\n \t\t\tgpios = <&tca6416 10 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_4 {\n+\t\tswitch-4 {\n \t\t\tlabel = \"User Switch 4\";\n \t\t\tlinux,code = <BTN_4>;\n \t\t\tgpios = <&tca6416 11 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_5 {\n+\t\tswitch-5 {\n \t\t\tlabel = \"User Switch 5\";\n \t\t\tlinux,code = <BTN_5>;\n \t\t\tgpios = <&tca6416 12 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_6 {\n+\t\tswitch-6 {\n \t\t\tlabel = \"User Switch 6\";\n \t\t\tlinux,code = <BTN_6>;\n \t\t\tgpios = <&tca6416 13 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_7 {\n+\t\tswitch-7 {\n \t\t\tlabel = \"User Switch 7\";\n \t\t\tlinux,code = <BTN_7>;\n \t\t\tgpios = <&tca6416 14 GPIO_ACTIVE_LOW>;\n \t\t};\n \n-\t\tuser_sw_8 {\n+\t\tswitch-8 {\n \t\t\tlabel = \"User Switch 8\";\n \t\t\tlinux,code = <BTN_8>;\n \t\t\tgpios = <&tca6416 15 GPIO_ACTIVE_LOW>;\n@@ -150,7 +150,7 @@\n \t\tenable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */\n \t};\n \n-\tpwm11: dmtimer-pwm@11 {\n+\tpwm11: pwm-11 {\n \t\tcompatible = \"ti,omap-dmtimer-pwm\";\n \t\tpinctrl-names = \"default\";\n \t\tpinctrl-0 = <&pwm_pins>;\n@@ -176,7 +176,7 @@\n };\n \n &davinci_mdio {\n-\t status = \"okay\";\n+\tstatus = \"okay\";\n };\n \n &dss {\n@@ -223,7 +223,7 @@\n };\n \n &mmc3 {\n- status = \"disabled\";\n+\tstatus = \"disabled\";\n };\n \n &usbhshost {\ndiff --git a/arch/arm/dts/am3517.dtsi b/arch/arm/dts/am3517.dtsi\nindex 71f2b7b970c..2633fae14b3 100644\n--- a/arch/arm/dts/am3517.dtsi\n+++ b/arch/arm/dts/am3517.dtsi\n@@ -40,7 +40,7 @@\n \t\t\tclock-names = \"ick\";\n \t\t};\n \n-\t\tdavinci_mdio: ethernet@5c030000 {\n+\t\tdavinci_mdio: mdio@5c030000 {\n \t\t\tcompatible = \"ti,davinci_mdio\";\n \t\t\tti,hwmods = \"davinci_mdio\";\n \t\t\tstatus = \"disabled\";\n", "prefixes": [ "12/17" ] }