From patchwork Fri Mar 16 02:52:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 886599 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lechnology.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=lechnology.com header.i=@lechnology.com header.b="J8BHkJJK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 402VQK1Hmtz9sVp for ; Fri, 16 Mar 2018 13:53:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751966AbeCPCx1 (ORCPT ); Thu, 15 Mar 2018 22:53:27 -0400 Received: from vern.gendns.com ([206.190.152.46]:55298 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbeCPCx0 (ORCPT ); Thu, 15 Mar 2018 22:53:26 -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=cuTZ50Eko4ZmacXWKmnHLyX3TLz1QWXcbKkmL/0e728=; b=J8BHkJJKRhoTf2rqn6VYdC6SHp O8+Nj+HchOrIat0RaBnwTwYEkqCY6mBNnKDWIvGg/VfwWB0FH+/4vn6VyNlYhuWJuwEXD62TO3SnC Gk6ZnrGHFqbbKifAfc9WuWouLwHEz0Wlf6XCS8V/vpVTVZ2yaAnM0J+ewZeJ/zjbaXchAwgR59uEQ nrFBGeohn8nFa43e0YExJhGcfRV5o5pBG0hJIQCZB7V3F4zZoc5KVyMobkBd9w90oTQNWQmPSOchQ tza7n9su1/ReZFBsJXJW0aXdwRkeEhN7uakARDUZMD942U5IETpWhGLzxB0XdGmKMIsCVqIDRsCZ4 /M9TVu9Q==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:44986 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1ewfSl-002UlD-1k; Thu, 15 Mar 2018 22:51:23 -0400 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Michael Turquette , Stephen Boyd , Rob Herring , Mark Rutland , Sekhar Nori , Kevin Hilman , Bartosz Golaszewski , Adam Ford , linux-kernel@vger.kernel.org, David Lechner Subject: =?utf-8?q?=5BPATCH_v8_00/42=5D_ARM=3A_davinci=3A_convert_to_comm?= =?utf-8?q?on_clock_framework=E2=80=8B?= Date: Thu, 15 Mar 2018 21:52:16 -0500 Message-Id: <1521168778-27236-1-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 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: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This series converts mach-davinci to use the common clock framework. The series works like this, the first 19 patches create new clock drivers using the common clock framework. There are basically 3 groups of clocks - PLL, PSC and CFGCHIP (syscon). There are six different SoCs that each have unique init data, which is the reason for so many patches. 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 three patches add device tree clock support to the one SoC that supports it. This series has been tested on LEGO MINDSTORMS EV3 (device tree) and TI OMAP-L138 LCDK (both device tree and legacy board file). Changes: 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: - "ARM: davinci: fix the GPIO lookup for omapl138-hawk"[1] (in linux-davinci/fixes) - "drm/tilcdc: Fix setting clock divider for omap-l138"[2] (new) - "ARM: davinci: DA8XX: fix oops in USB PHY driver due to stack allocated platform platform_data"[3] (new) - "ARM: davinci: DA8XX: simplify CFGCHIP regmap_config"[4] (new) - "clk: divider: export clk_div_mask() helper"[5] (in clk/fixes) - "clk: divider: read-only divider can propagate rate change"[6] (in clk/fixes) - "gpio: Handle deferred probing in of_find_gpio() properly"[7] (in v4.16-rc4) - "gpiolib: Keep returning EPROBE_DEFER when we should"[8] (in v4.16-rc4) [1]: https://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git/commit/?h=fixes&id=c4dc56be7e26040bfc60ce73425353516a356955 [2]: https://patchwork.freedesktop.org/patch/210696/ [3]: https://patchwork.kernel.org/patch/10285679/ [4]: https://patchwork.kernel.org/patch/10285605/ [5]: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=e6d3cc7b1fac3d7f1313faf8ac9b23830113e3ec [6]: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=b15ee490e16324c35b51f04bad54ae45a2cefd29 [7]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ce27fb2c56db6ccfe8099343bb4afdab15e77e7b [8]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6662ae6af82df10259a70c7569b4c12ea7f3ba93 You can find a working branch with everything included (plus a few extras, like cpufreq-dt) in the "common-clk-v8" 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: else clk_set_parent(clk, parent->clk); in da850.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 (42): dt-bindings: clock: Add new bindings for TI Davinci PLL clocks clk: davinci: New driver for davinci PLL clocks clk: davinci: Add platform information for TI DA830 PLL clk: davinci: Add platform information for TI DA850 PLL clk: davinci: Add platform information for TI DM355 PLL clk: davinci: Add platform information for TI DM365 PLL clk: davinci: Add platform information for TI DM644x PLL clk: davinci: Add platform information for TI DM646x PLL dt-bindings: clock: New bindings for TI Davinci PSC clk: davinci: New driver for davinci PSC clocks clk: davinci: Add platform information for TI DA830 PSC clk: davinci: Add platform information for TI DA850 PSC clk: davinci: Add platform information for TI DM355 PSC clk: davinci: Add platform information for TI DM365 PSC clk: davinci: Add platform information for TI DM644x PSC clk: davinci: Add platform information for TI DM646x PSC dt-bindings: clock: Add bindings for DA8XX CFGCHIP clocks clk: davinci: New driver for TI DA8XX CFGCHIP clocks clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks 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 ARM: davinci: add device tree support to timer ARM: davinci: da8xx-dt: switch to device tree clocks ARM: dts: da850: Add clocks .../bindings/clock/ti/davinci/da8xx-cfgchip.txt | 93 +++ .../devicetree/bindings/clock/ti/davinci/pll.txt | 96 +++ .../devicetree/bindings/clock/ti/davinci/psc.txt | 71 ++ MAINTAINERS | 7 + 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 | 167 ++++ 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 | 469 ++--------- arch/arm/mach-davinci/da850.c | 789 ++++-------------- arch/arm/mach-davinci/da8xx-dt.c | 60 -- 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 | 425 ++-------- arch/arm/mach-davinci/dm365.c | 517 ++---------- arch/arm/mach-davinci/dm644x.c | 363 ++------- arch/arm/mach-davinci/dm646x.c | 394 ++------- 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 | 46 +- arch/arm/mach-davinci/usb-da8xx.c | 242 +----- drivers/clk/Makefile | 1 + drivers/clk/davinci/Makefile | 21 + drivers/clk/davinci/da8xx-cfgchip.c | 790 ++++++++++++++++++ drivers/clk/davinci/pll-da830.c | 70 ++ drivers/clk/davinci/pll-da850.c | 212 +++++ drivers/clk/davinci/pll-dm355.c | 79 ++ drivers/clk/davinci/pll-dm365.c | 145 ++++ drivers/clk/davinci/pll-dm644x.c | 80 ++ drivers/clk/davinci/pll-dm646x.c | 84 ++ drivers/clk/davinci/pll.c | 901 +++++++++++++++++++++ drivers/clk/davinci/pll.h | 141 ++++ drivers/clk/davinci/psc-da830.c | 116 +++ drivers/clk/davinci/psc-da850.c | 149 ++++ drivers/clk/davinci/psc-dm355.c | 88 ++ drivers/clk/davinci/psc-dm365.c | 96 +++ drivers/clk/davinci/psc-dm644x.c | 83 ++ drivers/clk/davinci/psc-dm646x.c | 80 ++ drivers/clk/davinci/psc.c | 552 +++++++++++++ drivers/clk/davinci/psc.h | 108 +++ include/linux/platform_data/clk-da8xx-cfgchip.h | 21 + include/linux/platform_data/clk-davinci-pll.h | 21 + 66 files changed, 4876 insertions(+), 3836 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/da8xx-cfgchip.txt create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/pll.txt create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/psc.txt delete mode 100644 arch/arm/mach-davinci/clock.c delete mode 100644 arch/arm/mach-davinci/psc.c create mode 100644 drivers/clk/davinci/Makefile create mode 100644 drivers/clk/davinci/da8xx-cfgchip.c create mode 100644 drivers/clk/davinci/pll-da830.c create mode 100644 drivers/clk/davinci/pll-da850.c create mode 100644 drivers/clk/davinci/pll-dm355.c create mode 100644 drivers/clk/davinci/pll-dm365.c create mode 100644 drivers/clk/davinci/pll-dm644x.c create mode 100644 drivers/clk/davinci/pll-dm646x.c create mode 100644 drivers/clk/davinci/pll.c create mode 100644 drivers/clk/davinci/pll.h create mode 100644 drivers/clk/davinci/psc-da830.c create mode 100644 drivers/clk/davinci/psc-da850.c create mode 100644 drivers/clk/davinci/psc-dm355.c create mode 100644 drivers/clk/davinci/psc-dm365.c create mode 100644 drivers/clk/davinci/psc-dm644x.c create mode 100644 drivers/clk/davinci/psc-dm646x.c create mode 100644 drivers/clk/davinci/psc.c create mode 100644 drivers/clk/davinci/psc.h create mode 100644 include/linux/platform_data/clk-da8xx-cfgchip.h create mode 100644 include/linux/platform_data/clk-davinci-pll.h