From patchwork Tue Oct 27 23:42:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 537136 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 450BE141369 for ; Wed, 28 Oct 2015 10:43:53 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 26C771A0A9A for ; Wed, 28 Oct 2015 10:43:53 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0133.outbound.protection.outlook.com [207.46.100.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3AEDB1A0410 for ; Wed, 28 Oct 2015 10:42:56 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.50) by BY1PR03MB1484.namprd03.prod.outlook.com (10.162.210.142) with Microsoft SMTP Server (TLS) id 15.1.306.13; Tue, 27 Oct 2015 23:42:49 +0000 From: Scott Wood To: Subject: [PATCH] powerpc/fsl: Add #clock-cells and clockgen label to clockgen nodes Date: Tue, 27 Oct 2015 18:42:35 -0500 Message-ID: <1445989355-8405-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-Originating-IP: [192.88.168.50] X-ClientProxiedBy: BY1PR15CA0030.namprd15.prod.outlook.com (25.162.17.168) To BY1PR03MB1484.namprd03.prod.outlook.com (25.162.210.142) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1484; 2:2tFH8HbPQ/aXrLjS5/q8YuGepZUl2EWNe1qdD4WCza6ofRvSfKZGNgntGpaeVhYrSb+S2hFepqbODw+ZmqQo6+Tz6hUa38zc8iuXInjetMRlHazrqQfDsSdAujzLrGvYZWcZM/bfldQqc/5O1n3AsHDHqZiJ2nqdsHYGPTTm9vA=; 3:Z9erbYQySYvszKoZm2JULdsqrApiF4yI31TmYTnj2jlLWz7sgq1KjViVDCRFpsVgB6wzi3OD8vDU0RVTLioAFJAK3/D1CoybiFDXIR491/v99p8onuol0RWwq80xv8XE6m79tKogrtRKVfn2EEDreA==; 25:6cyCx+qnVeiHQI6xcaq8kgrYh8uaiRcIT9wQV/ICqVg96Zao/0wL/H/ojmhCsEsrlMD1g6VDvXa3K/KjJluAiGosdcTgBDTivSGcQZZKfngGpCpoQod727LlIBI7UFazA2I4sVhEyRPu0zvYg7PtlVLyzwEO1jpxKt9RaKVr/gTSgGoCDvSMs1raV+zbAGqP8urcZYLSDq5/DfeezCj0k1OXEX+NMUqFFTKIXSpYccCj3O87YHGwopokKCSPOTTCz67dWUpvIWqX8R53xagt0A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1484; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1484; 20:UAUsCVVeoPqAAQsccVSJK1QR/s6iZSAo6PtlvVrF0+1Uys9haXQ5J+uLa8BUlby1pICJ8dBP+kusjDAi18ef0YLZHHVG8k7gHWquIoPGxaTZeXt54wYE09oCdXj322o/bouJmC6FQm7Z3sNTGfoEHk5c2ZiWT5+ViQoHS4QzJ8mOvuC9hrcCLoMKjJwXmzCTloIGunVIG8wi+8dRju2QbZ10bHdiAsMWl5oggQXsXIwGCdl9SbBkLMlwR9QKgb2pKmkyhX27VQZFmCQjDLYuuf3kPNTpo22rKAz5hviLTdXzdsqiYw7xvIuYubLjUGnIHpZITEU/mAMRkju6o8kn9r9zwhezgnLv+6vkFIGbKOI+0551t4nOxqM85amJgTllIIKBAlLhBmcRZUETnFPfeIzw4FCzPKAmmKPdst0lRCdqBMSx7Ke2+PxxrFtHTVl74wXoNlhWlhdo4f4mYHEEUceHEtMKWsbjx+sb6wXBVQoR2wKGgNWuK20CkeMHHEdo; 4:ddSCuoGqtzvJ1TmA9EPhwiNFq0/P9jK+S0SUlCUKuBQiOV/4hWf5kNPZAmH1MQvkF5ZoH3SMrR/ui+efFQdQzYLr70nDtXOreuqW28GVEA4HrgRwkygw7M4kITD1T7GM38zOUDjGkh8rHYEj1khmM5h63KEXDSCNHim3+UZWJ/uo2xpk73MAuJIdOZfIz6F7eC3bY215UfLDULmtAb8ieFveoHMh0sfItbfs8Sr6qAWR4S6EBs3vKUcjkTECjQYMFz8j32qXfnZRMSmwZ86P+DCmbT4CBtDrKYaIDeexH9i/+dpElM9uoX1tKb6L4ET82b9Z3SPxpzsc4vct2qc3QNS2y8DN7ADxPq0QUxhhXnZ9VccrtazWcL5LfJRMHsaE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(102215026); SRVR:BY1PR03MB1484; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1484; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(47776003)(66066001)(19580405001)(101416001)(2351001)(105586002)(33646002)(4001430100002)(106356001)(87976001)(229853001)(86362001)(575784001)(42186005)(5007970100001)(36756003)(19580395003)(40100003)(5004730100002)(97736004)(5003940100001)(48376002)(50986999)(5008740100001)(5001960100002)(50226001)(77096005)(450100001)(122386002)(110136002)(107886002)(92566002)(189998001)(81156007)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1484; H:snotra.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1484; 23:BqERfpp1tLXAanllpNpcQ3DUnS6LEh9lgI7Qwiw0i?= =?us-ascii?Q?gp3gA1oeEzq6/R+x2HOwUh+rpv12kgBhbSZnJv8p19yG5nD6MIJXKQB3Pxwa?= =?us-ascii?Q?SuPv8Oj2DsKD9SpicyxuM2lLyCMnVahfF8mWoC66fTcGb9jO0AiDFCNUqFV5?= =?us-ascii?Q?BX2Y9zu2/HCLDDkbCp+7cZyQIgp51/eb3U8JQ/5/7E80Jqo7Y7aduKLHW/3G?= =?us-ascii?Q?Jjk4DoyqGoHVPEX+Q4CQ8HZBSaLXH9ch286Ex5feveOXSxX/9GKEUsDilSWY?= =?us-ascii?Q?EVnBYBuCKMHkwLpAQZdfE4iTFEbs8jOOfsppQbg7qjjyfT1SO0sfk5OXOWUs?= =?us-ascii?Q?6PCNtC3Cb8eSe7raFvAN4V0BiA0YSLlASOw4D8em5nC3x/BhM7G34O2pN0j4?= =?us-ascii?Q?zXCysmLC7aIkIxemuHJXgMdw80FlgcN5iO+RVfPTG5OTKRro0YHgkeF4BF4f?= =?us-ascii?Q?MHW2AMdyBTOB13DAmB3efEsQqnUc/5Wiab+bEzyWQQtOZgELdHChMDQ13mu2?= =?us-ascii?Q?+dA4t2xcUTSmDk7wQ/2XT0CWiup3x3y42GVN/lSFD1YACsCEBKZGn61DO+Hx?= =?us-ascii?Q?ud0V6m8TMX8wp+Yp2SUFWzFJAVzPKAyl9MQoKp07pnTVgA+fRryxnITa/i3w?= =?us-ascii?Q?ZdiGqVhQeposUewwuI1wRsgF5nfj5L/sjeSg//SnTP3/PQrBStoyQnLstIKq?= =?us-ascii?Q?R+sdfBeWL57AmN44inmYTjQZ+iahD8ZStqUgNpDAbPvGZ8WR3xjt1he0EmJ3?= =?us-ascii?Q?WJFdZYXCUMcRhtiXjN50WP2Pf8RlupGSTbbD+A/JmeQoSdun8BfaZ2TH6n4I?= =?us-ascii?Q?chycoXR/bfvKUJfqlld3FKqTkNjLLqnzVfCFS6fl9DLm/+xm2BWUzg+HbJtF?= =?us-ascii?Q?0id33g03rUPT25Rg88NDOVUYQNzokOz420MXOHAUl03aFALGdhMlpNZyx/P6?= =?us-ascii?Q?Vi4xuzgd6GGyhH8n9K5KTo9CCNRuIeoTie+r3TVd8pQyRz42bEpfRdijw83/?= =?us-ascii?Q?YzzM4dseAtdqit9MQvs3vh/OqtDCuHqlm0uNS24VDph5D47n6dissDRpQayc?= =?us-ascii?Q?xW3kvA=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1484; 5:jWfgeyDbSSvdhi7R/LpggKiV/mZEhMrG6RmVH08A6t/C8HrjHgvgHufPwBsBPsEukhbMQnRtd/3DxeZRa2Lmwuh8zQJ7b3BRofV5Av4D9IaEmc2D4GGwHSkcqLTicRq6q1+rMkivuh+lPdZFjMLKQg==; 24:NITfUxLPba6Zg9M6yxhGJTNrqit5sF/ssa+7opGrMOa2yPvabUSeR8fk0a9x0gBanKIFdNUgRBMsVw+OGRLeaZg7WMmNCfhqYwVR+Q4aTQY=; 20:LjbKd059tSlAYhjt0mlnpmA90/Im85YaM+WY0tz+ivXrbWWCBpaFeobFOjPV/n3fsgrKPqmsCTVzHqvHL2IKZw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2015 23:42:49.2058 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1484 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This allows new-style clock references to be used, which is needed for fman. The old clock nodes will be removed and all clock references converted to new-style once the qoriq-cpufreq driver is updated to stop depending on the old-style references in cpu nodes. Signed-off-by: Scott Wood --- Patches to update the cpufreq driver have been posted, but they require a change to include/linux/clk.h which is still awaiting a response from Russell King. arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi | 3 ++- arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi index 4ece1ed..88cd70d 100644 --- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi +++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi @@ -32,13 +32,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -global-utilities@e1000 { +clockgen: global-utilities@e1000 { compatible = "fsl,qoriq-clockgen-1.0"; ranges = <0x0 0xe1000 0x1000>; reg = <0xe1000 0x1000>; clock-frequency = <0>; #address-cells = <1>; #size-cells = <1>; + #clock-cells = <2>; sysclk: sysclk { #clock-cells = <0>; diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi index 48e0b6e..6dfd7c5 100644 --- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi +++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi @@ -32,12 +32,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -global-utilities@e1000 { +clockgen: global-utilities@e1000 { compatible = "fsl,qoriq-clockgen-2.0"; ranges = <0x0 0xe1000 0x1000>; reg = <0xe1000 0x1000>; #address-cells = <1>; #size-cells = <1>; + #clock-cells = <2>; sysclk: sysclk { #clock-cells = <0>;