Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp4738927imm; Fri, 18 May 2018 09:50:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpvd1epC8GgOLpImODIJfmyY2MwTl1Xh31Pa/u6iJ3iK/tGf2G4KUGzfQ6uezPd0JMZkIAT X-Received: by 2002:a63:a34d:: with SMTP id v13-v6mr8206335pgn.224.1526662253638; Fri, 18 May 2018 09:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662253; cv=none; d=google.com; s=arc-20160816; b=Y3SUakhop/GVbpf0WTUCEc9cViQlXz4R1psxB1Z1talBdjqyWYX5MP54DQAxc+OD04 IRwJNo8eBvNJmEIjn+k7zL5V6tzP2pbMXmT2/J8d2LI3I5VMEyntAd4iph6AftuPI1f4 cXXiKA5CHySvtRsoMEvLIZGliPAxO4m1y8iNWq61IznrjTJovfwK8iew3rHDukLl1eWJ aNZZ3GFeghrZMdUfZyhIFOuIgBtajLpUsxwW3UqMzjJNzHPNcS7sGPWNTdqh10UYnU4H g8S4GLXVWQatgco22id7otL19RrKY8aiy+U6eKIQaky6LuYslCFL5jlEAY3rs4TKKoZC mJtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=GNBnZOdwUozBhcBMLOPt2kWMD6/L+8Kyu2wq4FuzhhA=; b=n7UWMUsNWwWUAdBsgL7G48nvw5ZYFT/Qmipz2to/jZJGx3vVpJFMfyjxD0qSXW80Dw huGsZRplL6Iz7W0ANS7q23d64tWIGmvk3OMb8kVsL83o031gdtV3zdCOJG4OIJxQDvB6 AVcIEqb5sNH+V6BU9W0rJQN/e2bL2DKy1J7lBg1NHcqG4WgZegXGS69LiSCgoWrUFN/D Idxpt0k2+JPfdwsG1nAJ+bDrRGKF7HFYMBfljHbNS2Kys1mJEXaCV7aozqpz5FoBrti6 P4XhhJylaHyL63fLJVF4CvKdcGsixfxprdg4oR+rkWD1d6vZe1CVgzD6oMQIFKlAZ7L9 /D+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@lechnology.com header.s=default header.b=ntfzEo8d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v6-v6si8145245plp.60.2018.05.18.09.50.39; Fri, 18 May 2018 09:50:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@lechnology.com header.s=default header.b=ntfzEo8d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbeERQuR (ORCPT + 99 others); Fri, 18 May 2018 12:50:17 -0400 Received: from vern.gendns.com ([206.190.152.46]:56735 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752491AbeERQuI (ORCPT ); Fri, 18 May 2018 12:50:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GNBnZOdwUozBhcBMLOPt2kWMD6/L+8Kyu2wq4FuzhhA=; b=ntfzEo8d5HdeN0+m7RlRMSXMyL s8TTLnP7y8wuibcrXdjUGt52NmMLkj9ukd1x9S/Icvw+4Fkm8p1jpvVBtP+AJlDimhwtgQIIENYCl iHkIvj5p+ewr/yYnVUfJ2K3GjXsW1kCOOsEnsAKqIdqJdaUPkn74IFqWleBxqyyHh25pUTB1384iN iDameAKFjLOsfh6lNwQwkfcABW/bHN8vA9ymalz1h/wv4RsBrYmcCSYgZF/pcV+IPOcCghol5kYJc BElJuZeVDmQhr7JUtIbTo0m/sl84Ys80Oq+THv5O6niJMZspz0g03cz7XMonnw5gokF9oE7KnMfon csQP+8fQ==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:35704 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1fJiZx-00FrC3-LU; Fri, 18 May 2018 12:50:06 -0400 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: David Lechner , Michael Turquette , Stephen Boyd , Rob Herring , Mark Rutland , Sekhar Nori , Kevin Hilman , Bartosz Golaszewski , Adam Ford , linux-kernel@vger.kernel.org Subject: =?UTF-8?q?=5BPATCH=20v11=2000/27=5D=20ARM=3A=20davinci=3A=20convert=20to=20common=20clock=20framework=E2=80=8B?= Date: Fri, 18 May 2018 11:48:02 -0500 Message-Id: <20180518164829.27052-1-david@lechnology.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series converts mach-davinci to use the common clock framework. The series works like this, the first 3 patches fix some issues with the clock drivers that have already been accepted into the mainline kernel. Then, starting with "ARM: davinci: pass clock as parameter to davinci_timer_init()", we get the mach code ready for the switch by adding the code needed for the new clock drivers and adding #ifndef CONFIG_COMMON_CLK around the legacy clocks so that we can switch easily between the old and the new. "ARM: davinci: switch to common clock framework" actually flips the switch to start using the new clock drivers. Then the next 8 patches remove all of the old clock code. The final four patches add device tree clock support to the one SoC that supports it. This series has been tested on TI OMAP-L138 LCDK (both device tree and legacy board file). Changes: v11 changes (also see individual patches for details): - Proper unwinding on error in clk patches - Dropped ref_clk fallback in device tree timer patch - Fix W=1 and sparse warnings v10 changes (also see individual patches for details): - Reworked device tree bindings for DaVinci timer. - Dropped helper functions to conditionally call devm_* versions of functions - Fix some typos - Fix some rebasing issues introduced in v9 v9 changes (also see individual patches for details): - Rebased on linux-davnci/master (f5e3203bb775) - Dropped drivers/clk patches that landed in v4.17 - New drivers/clk patches for early boot special case - New patch for ti,davinci-timer device tree bindings - Updated mach/davinci patches to register clocks in early boot when needed v8 changes (also see individual patches for details): - Rebased on linux-davinci/master - Dropped use of __init and __initconst attributes in clk drivers - Add clkdev lookups for PLL SYSCLKs - Fix genpd clock reference counting issue - Fix PSC clock driver loading order issue - Fix typo in device tree and add more power-domains properties v7 changes (also see individual patches for details): - Rebased on linux-davinci/master (v4.16-rc) - Convert clock drivers to platform devices - New patch "ARM: davinci: pass clock as parameter to davinci_timer_init()" - Fix issues with lcdk and aemif clock lookups and power domains - Fixed other minor issues brought up in v6 review v6 changes (also see individual patches for details): - All of the device tree bindings are changed - All of the clock drivers are changed significantly - Fixed issues brought up during review of v5 - "ARM: davinci: move davinci_clk_init() to init_time" is removed from this series and submitted separately v5 changes: - Basically, this is an entirely new series - Patches are broken up into bite-sized pieces - Converted PSC clock driver to use regmap - Restored "force" flag for certain DA850 clocks - Added device tree bindings - Moved more of the clock init to drivers/clk - Fixed frequency scaling (maybe*) * I have frequency scaling using cpufreq-dt, so I know the clocks are doing what they need to do to make this work, but I haven't figured out how to test davinci-cpufreq driver yet. (Patches to make cpufreq-dt work will be sent separately after this series has landed.) Dependencies: There are still some outstanding fixes to get everything working correctly. For the most part, these are just runtime dependencies and only needed for certain platforms. Of the clk patches, only "clk: davinci: psc-da830: fix USB0 48MHz PHY clock registration" has been picked up in clk-next so far. Theoretically, there has been a pull request made for "drm/tilcdc: Fix setting clock divider for omap-l138", but I haven't seen it land anywhere yet. The series "remoteproc/ davinci: common clock framework related fixes" is in rproc-next already. - "drm/tilcdc: Fix setting clock divider for omap-l138"[1] - "clk: davinci: pll-dm355: fix SYSCLKn parent names"[2] - "remoteproc/davinci: common clock framework related fixes"[3] - "clk: davinci: psc-da830: fix USB0 48MHz PHY clock registration"[4] - "clk: davinci: some more fixes"[5] - "clk: davinci: psc-dm355: fix ASP0/1 clkdev lookups"[6] [1]: https://patchwork.freedesktop.org/patch/210696/ [2]: https://lkml.org/lkml/2018/5/9/626 [3]: https://lkml.org/lkml/2018/5/2/201 [4]: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/commit/?h=clk-davinci-psc-da830&id=a714dceb721407c2a5d2887938f37e34ed00669c [5]: https://www.spinics.net/lists/arm-kernel/msg652656.html [6]: https://patchwork.kernel.org/patch/10395979/ You can find a working branch with everything included (plus a few extras, like cpufreq-dt) in the "common-clk-v11" branch of https://github.com/dlech/ev3dev-kernel.git. Testing/debugging for the uninitiated: I only have one device to test with, which is based on da850, so I will have to rely on others to do some testing here. Since we are dealing with clocks, if something isn't working, you most likely won't see output on the serial port. To figure out what is going on, you need to enable... CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y and add "earlyprintk clk_ignore_unused" to the kernel command line options. You may need to select a different UART for this depending on your board. I think UART1 is the default in the kernel configuration. On da850 devices comment out the lines: /* pll1_sysclk2 is not affected by CPU scaling, so use it for async3 */ parent = clk_hw_get_parent_by_index(&mux->hw, 1); if (parent) clk_set_parent(mux->hw.clk, parent->clk); else dev_warn(dev, "Failed to find async3 parent clock\n"); in da8xx-cfgchip.c or, if using device tree, comment out the lines: assigned-clocks = <&async3_clk>; assigned-clock-parents = <&pll1_sysclk 2>; in da850.dtsi when doing earlyprintk, otherwise the UART1 and UART2 clock source will change during boot and cause garbled output after a point. David Lechner (27): clk: davinci: pll: allow dev == NULL clk: davinci: da850-pll: change PLL0 to CLK_OF_DECLARE clk: davinci: psc: allow for dev == NULL ARM: davinci: pass clock as parameter to davinci_timer_init() ARM: davinci: da830: add new clock init using common clock framework ARM: davinci: da850: add new clock init using common clock framework ARM: davinci: dm355: add new clock init using common clock framework ARM: davinci: dm365: add new clock init using common clock framework ARM: davinci: dm644x: add new clock init using common clock framework ARM: davinci: dm646x: add new clock init using common clock framework ARM: davinci: da8xx: add new USB PHY clock init using common clock framework ARM: davinci: da8xx: add new sata_refclk init using common clock framework ARM: davinci: remove CONFIG_DAVINCI_RESET_CLOCKS ARM: davinci_all_defconfig: remove CONFIG_DAVINCI_RESET_CLOCKS ARM: davinci: switch to common clock framework ARM: davinci: da830: Remove legacy clock init ARM: davinci: da850: Remove legacy clock init ARM: davinci: dm355: Remove legacy clock init ARM: davinci: dm365: Remove legacy clock init ARM: davinci: dm644x: Remove legacy clock init ARM: davinci: dm646x: Remove legacy clock init ARM: davinci: da8xx: Remove legacy USB and SATA clock init ARM: davinci: remove legacy clocks dt-bindings: timer: new bindings for TI DaVinci timer ARM: davinci: add device tree support to timer ARM: davinci: da8xx-dt: switch to device tree clocks ARM: dts: da850: Add clocks .../bindings/timer/ti,davinci-timer.txt | 37 + arch/arm/Kconfig | 5 +- arch/arm/boot/dts/da850-enbw-cmc.dts | 4 + arch/arm/boot/dts/da850-evm.dts | 4 + arch/arm/boot/dts/da850-lcdk.dts | 9 + arch/arm/boot/dts/da850-lego-ev3.dts | 4 + arch/arm/boot/dts/da850.dtsi | 168 ++++ arch/arm/configs/davinci_all_defconfig | 1 - arch/arm/mach-davinci/Kconfig | 13 +- arch/arm/mach-davinci/Makefile | 4 +- arch/arm/mach-davinci/board-da830-evm.c | 12 +- arch/arm/mach-davinci/board-da850-evm.c | 2 + arch/arm/mach-davinci/board-dm355-evm.c | 2 + arch/arm/mach-davinci/board-dm355-leopard.c | 2 + arch/arm/mach-davinci/board-dm365-evm.c | 2 + arch/arm/mach-davinci/board-dm644x-evm.c | 2 + arch/arm/mach-davinci/board-dm646x-evm.c | 2 + arch/arm/mach-davinci/board-mityomapl138.c | 2 + arch/arm/mach-davinci/board-neuros-osd2.c | 2 + arch/arm/mach-davinci/board-omapl138-hawk.c | 11 +- arch/arm/mach-davinci/board-sffsdr.c | 2 + arch/arm/mach-davinci/clock.c | 745 ----------------- arch/arm/mach-davinci/clock.h | 76 -- arch/arm/mach-davinci/common.c | 3 - arch/arm/mach-davinci/da830.c | 462 ++--------- arch/arm/mach-davinci/da850.c | 778 +++--------------- arch/arm/mach-davinci/da8xx-dt.c | 66 -- arch/arm/mach-davinci/davinci.h | 8 + arch/arm/mach-davinci/devices-da8xx.c | 43 +- arch/arm/mach-davinci/devices.c | 1 - arch/arm/mach-davinci/dm355.c | 406 ++------- arch/arm/mach-davinci/dm365.c | 485 +---------- arch/arm/mach-davinci/dm644x.c | 344 +------- arch/arm/mach-davinci/dm646x.c | 372 +-------- arch/arm/mach-davinci/include/mach/clock.h | 3 - arch/arm/mach-davinci/include/mach/common.h | 11 +- arch/arm/mach-davinci/include/mach/da8xx.h | 6 +- arch/arm/mach-davinci/pm_domain.c | 5 + arch/arm/mach-davinci/psc.c | 137 --- arch/arm/mach-davinci/psc.h | 12 - arch/arm/mach-davinci/time.c | 22 +- arch/arm/mach-davinci/usb-da8xx.c | 242 +----- drivers/clk/davinci/pll-da830.c | 5 +- drivers/clk/davinci/pll-da850.c | 37 +- drivers/clk/davinci/pll-dm355.c | 9 +- drivers/clk/davinci/pll-dm365.c | 9 +- drivers/clk/davinci/pll-dm644x.c | 9 +- drivers/clk/davinci/pll-dm646x.c | 9 +- drivers/clk/davinci/pll.c | 279 +++++-- drivers/clk/davinci/pll.h | 30 +- drivers/clk/davinci/psc-dm355.c | 3 +- drivers/clk/davinci/psc-dm365.c | 3 +- drivers/clk/davinci/psc-dm644x.c | 3 +- drivers/clk/davinci/psc-dm646x.c | 3 +- drivers/clk/davinci/psc.c | 58 +- include/linux/clk/davinci.h | 29 + 56 files changed, 1005 insertions(+), 3998 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/ti,davinci-timer.txt delete mode 100644 arch/arm/mach-davinci/clock.c delete mode 100644 arch/arm/mach-davinci/psc.c create mode 100644 include/linux/clk/davinci.h -- 2.17.0