{"id":806773,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806773/?format=json","project":{"id":37,"url":"http://patchwork.ozlabs.org/api/1.0/projects/37/?format=json","name":"Devicetree Bindings","link_name":"devicetree-bindings","list_id":"devicetree.vger.kernel.org","list_email":"devicetree@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170828211918.11573-4-tony@atomide.com>","date":"2017-08-28T21:19:04","name":"[03/17] ARM: dts: Add missing properties for omap4 control modules","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"407b468111475c36efcc1b9a9f71c6b8a4618bba","submitter":{"id":365,"url":"http://patchwork.ozlabs.org/api/1.0/people/365/?format=json","name":"Tony Lindgren","email":"tony@atomide.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/devicetree-bindings/patch/20170828211918.11573-4-tony@atomide.com/mbox/","series":[{"id":261,"url":"http://patchwork.ozlabs.org/api/1.0/series/261/?format=json","date":"2017-08-28T21:19:01","name":"Fix missing device tree hwmods and IO ranges omap variants","version":1,"mbox":"http://patchwork.ozlabs.org/series/261/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806773/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming-dt@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-dt@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=devicetree-owner@vger.kernel.org; receiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh4gD2Ys8z9sD9\n\tfor ;\n\tTue, 29 Aug 2017 07:30:16 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751300AbdH1VT7 (ORCPT\n\t);\n\tMon, 28 Aug 2017 17:19:59 -0400","from muru.com ([72.249.23.125]:38184 \"EHLO muru.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751297AbdH1VT6 (ORCPT );\n\tMon, 28 Aug 2017 17:19:58 -0400","from sampyla.muru.com (localhost [127.0.0.1])\n\tby muru.com (Postfix) with ESMTP id 489B0855C;\n\tMon, 28 Aug 2017 21:20:18 +0000 (UTC)"],"From":"Tony Lindgren ","To":"linux-omap@vger.kernel.org","Cc":"=?utf-8?q?Beno=C3=AEt_Cousson?= ,\n\tdevicetree@vger.kernel.org","Subject":"[PATCH 03/17] ARM: dts: Add missing properties for omap4 control\n\tmodules","Date":"Mon, 28 Aug 2017 14:19:04 -0700","Message-Id":"<20170828211918.11573-4-tony@atomide.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170828211918.11573-1-tony@atomide.com>","References":"<20170828211918.11573-1-tony@atomide.com>","Sender":"devicetree-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"devicetree@vger.kernel.org"},"content":"On omap4, we are missing several ti,hwmods properties and IO\nranges for system control modules. These are needed by the SoC\ninterconnect code.\n\nNote that this will only show up as a bug with \"doesn't have\nmpu register target base\" boot errors when the legacy platform\ndata is removed.\n\nIn order to add these, we need to move omap4_pmx_wkup to be a\nchild of omap4_padconf_wkup.\n\nOn omap4 there are separate modules for control module and\ncontrol module pads. For control module core, we have this\nalready configured except for the missing ti,hwmods and reg\nentries.\n\nSigned-off-by: Tony Lindgren \n---\n .../devicetree/bindings/arm/omap/ctrl.txt | 2 ++\n arch/arm/boot/dts/omap4.dtsi | 39 ++++++++++++++++------\n 2 files changed, 31 insertions(+), 10 deletions(-)","diff":"diff --git a/Documentation/devicetree/bindings/arm/omap/ctrl.txt b/Documentation/devicetree/bindings/arm/omap/ctrl.txt\n--- a/Documentation/devicetree/bindings/arm/omap/ctrl.txt\n+++ b/Documentation/devicetree/bindings/arm/omap/ctrl.txt\n@@ -21,6 +21,8 @@ Required properties:\n \t\t\"ti,omap3-scm\"\n \t\t\"ti,omap4-scm-core\"\n \t\t\"ti,omap4-scm-padconf-core\"\n+\t\t\"ti,omap4-scm-wkup\"\n+\t\t\"ti,omap4-scm-padconf-wkup\"\n \t\t\"ti,omap5-scm-core\"\n \t\t\"ti,omap5-scm-padconf-core\"\n \t\t\"ti,dra7-scm-core\"\ndiff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi\n--- a/arch/arm/boot/dts/omap4.dtsi\n+++ b/arch/arm/boot/dts/omap4.dtsi\n@@ -174,6 +174,7 @@\n \t\t\t\t#address-cells = <1>;\n \t\t\t\t#size-cells = <1>;\n \t\t\t\tranges = <0 0x2000 0x1000>;\n+\t\t\t\tti,hwmods = \"ctrl_module_core\";\n \n \t\t\t\tscm_conf: scm_conf@0 {\n \t\t\t\t\tcompatible = \"syscon\";\n@@ -186,9 +187,11 @@\n \t\t\tomap4_padconf_core: scm@100000 {\n \t\t\t\tcompatible = \"ti,omap4-scm-padconf-core\",\n \t\t\t\t\t \"simple-bus\";\n+\t\t\t\treg = <0x100000 0x1000>;\n \t\t\t\t#address-cells = <1>;\n \t\t\t\t#size-cells = <1>;\n \t\t\t\tranges = <0 0x100000 0x1000>;\n+\t\t\t\tti,hwmods = \"ctrl_module_pad_core\";\n \n \t\t\t\tomap4_pmx_core: pinmux@40 {\n \t\t\t\t\tcompatible = \"ti,omap4-padconf\",\n@@ -263,17 +266,33 @@\n \t\t\t\t\t};\n \t\t\t\t};\n \n-\t\t\t\tomap4_pmx_wkup: pinmux@1e040 {\n-\t\t\t\t\tcompatible = \"ti,omap4-padconf\",\n-\t\t\t\t\t\t \"pinctrl-single\";\n-\t\t\t\t\treg = <0x1e040 0x0038>;\n+\t\t\t\tomap4_scm_wkup: scm@c000 {\n+\t\t\t\t\tcompatible = \"ti,omap4-scm-wkup\";\n+\t\t\t\t\treg = <0xc000 0x1000>;\n+\t\t\t\t\tti,hwmods = \"ctrl_module_wkup\";\n+\t\t\t\t};\n+\n+\t\t\t\tomap4_padconf_wkup: padconf@1e000 {\n+\t\t\t\t\tcompatible = \"ti,omap4-scm-padconf-wkup\",\n+\t\t\t\t\t\t \"simple-bus\";\n+\t\t\t\t\treg = <0x1e000 0x1000>;\n \t\t\t\t\t#address-cells = <1>;\n-\t\t\t\t\t#size-cells = <0>;\n-\t\t\t\t\t#pinctrl-cells = <1>;\n-\t\t\t\t\t#interrupt-cells = <1>;\n-\t\t\t\t\tinterrupt-controller;\n-\t\t\t\t\tpinctrl-single,register-width = <16>;\n-\t\t\t\t\tpinctrl-single,function-mask = <0x7fff>;\n+\t\t\t\t\t#size-cells = <1>;\n+\t\t\t\t\tranges = <0 0x1e000 0x1000>;\n+\t\t\t\t\tti,hwmods = \"ctrl_module_pad_wkup\";\n+\n+\t\t\t\t\tomap4_pmx_wkup: pinmux@40 {\n+\t\t\t\t\t\tcompatible = \"ti,omap4-padconf\",\n+\t\t\t\t\t\t\t \"pinctrl-single\";\n+\t\t\t\t\t\treg = <0x40 0x0038>;\n+\t\t\t\t\t\t#address-cells = <1>;\n+\t\t\t\t\t\t#size-cells = <0>;\n+\t\t\t\t\t\t#pinctrl-cells = <1>;\n+\t\t\t\t\t\t#interrupt-cells = <1>;\n+\t\t\t\t\t\tinterrupt-controller;\n+\t\t\t\t\t\tpinctrl-single,register-width = <16>;\n+\t\t\t\t\t\tpinctrl-single,function-mask = <0x7fff>;\n+\t\t\t\t\t};\n \t\t\t\t};\n \t\t\t};\n \t\t};\n","prefixes":["03/17"]}