From patchwork Mon Jun 17 13:42:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 251854 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2B6DE2C009E for ; Mon, 17 Jun 2013 23:47:00 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoZle-0003WB-7x; Mon, 17 Jun 2013 13:46:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoZlY-000103-Cx; Mon, 17 Jun 2013 13:46:40 +0000 Received: from co9ehsobe001.messaging.microsoft.com ([207.46.163.24] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoZlU-0000ye-RU for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 13:46:37 +0000 Received: from mail106-co9-R.bigfish.com (10.236.132.232) by CO9EHSOBE027.bigfish.com (10.236.130.90) with Microsoft SMTP Server id 14.1.225.23; Mon, 17 Jun 2013 13:46:15 +0000 Received: from mail106-co9 (localhost [127.0.0.1]) by mail106-co9-R.bigfish.com (Postfix) with ESMTP id 112853C0282; Mon, 17 Jun 2013 13:46:15 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz936eIzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz8275dhz2dh87h2a8h668h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail106-co9 (localhost.localdomain [127.0.0.1]) by mail106-co9 (MessageSwitch) id 1371476772195593_8411; Mon, 17 Jun 2013 13:46:12 +0000 (UTC) Received: from CO9EHSMHS028.bigfish.com (unknown [10.236.132.228]) by mail106-co9.bigfish.com (Postfix) with ESMTP id 23B85320313; Mon, 17 Jun 2013 13:46:12 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS028.bigfish.com (10.236.130.38) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 17 Jun 2013 13:46:09 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 17 Jun 2013 13:41:02 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.38]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r5HDexX4012026; Mon, 17 Jun 2013 06:41:00 -0700 Date: Mon, 17 Jun 2013 21:42:04 +0800 From: Shawn Guo To: Subject: [GIT PULL] ARM: imx: soc changes for 3.11 Message-ID: <20130617134203.GH31687@S2101-09.ap.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_094637_062706_8B6D0B02 X-CRM114-Status: GOOD ( 12.77 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.24 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Arnd, Olof, This is the imx soc change set I queued for 3.11. There is a trivial merge conflict with branch mvebu/regmap, and linux-next should have the resolution. Shawn The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f: Linux 3.10-rc6 (2013-06-15 11:51:07 -1000) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.11 for you to fetch changes up to 3bfbc6cd9b41f937a134ba65a4a1eefba062b9a8: ARM: imx_v6_v7_defconfig: Enable Vybrid VF610 (2013-06-17 15:45:17 +0800) ---------------------------------------------------------------- imx soc changes for 3.11: * New SoCs i.MX6 Sololite and Vybrid VF610 support * imx5 and imx6 clock fixes and additions * Update clock driver to use of_clk_init() function * Refactor restart routine mxc_restart() to get it work for DT boot as well * Clean up mxc specific ulpi access ops * imx defconfig updates ---------------------------------------------------------------- Dirk Behme (3): ARM: i.MX6: add i.MX6 specific L2 cache configuration ARM: i.MX6: clk: add i.MX6 DualLite differences ARM: i.MX6: clk: add different DualLite MLB clock config Fabio Estevam (6): ARM: imx: imx_v6_v7_defconfig: Select CONFIG_DRM_IMX_TVE ARM: imx: Enable mx6 solo-lite support ARM: imx: irq-common: Include header to avoid sparse warning ARM: imx: clk: No need to initialize phandle struct ARM: imx_v6_v7_defconfig: Enable PWM and backlight options ARM: imx_v6_v7_defconfig: Enable Vybrid VF610 Huang Shijie (1): ARM: imx6q: clk: add the eim_slow clock Jiada Wang (2): ARM: imx: disable pll8_mlb in mx6q_clks ARM: imx: remove MLB PLL from pllv3 Jingchang Lu (2): ARM: imx: add VF610 clock support ARM: imx: add initial support for VF610 Markus Pargmann (1): ARM: imx: Remove mxc specific ulpi access ops Martin Fuzzey (1): ARM: i.MX5: Allow DT clock providers Nicolin Chen (2): ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default Philipp Zabel (1): ARM i.MX5: Add S/PDIF clocks Rogerio Pimentel (1): ARM: imx_v6_v7_defconfig: enable parallel display Sascha Hauer (1): ARM i.MX53: Add SATA clock Shawn Guo (8): ARM: imx: include in hardware.h ARM: imx: move clk_prepare() out from mxc_restart() ARM: imx: create mxc_arch_reset_init_dt() for DT boot ARM: imx: add clock support for imx6sl ARM: imx: enable low-level debug support for imx6sl ARM: imx: add initial support for imx6sl ARM: imx6q: call of_clk_init() to register fixed rate clocks ARM: imx6: use common of_clk_init() call to initialize clocks .../devicetree/bindings/clock/imx5-clock.txt | 13 + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + .../devicetree/bindings/clock/imx6sl-clock.txt | 10 + .../devicetree/bindings/clock/vf610-clock.txt | 26 ++ arch/arm/Kconfig.debug | 13 +- arch/arm/configs/imx_v6_v7_defconfig | 10 + arch/arm/include/debug/imx-uart.h | 10 + arch/arm/mach-imx/Kconfig | 63 +++- arch/arm/mach-imx/Makefile | 4 +- arch/arm/mach-imx/clk-imx51-imx53.c | 73 +++-- arch/arm/mach-imx/clk-imx6q.c | 48 +-- arch/arm/mach-imx/clk-imx6sl.c | 267 ++++++++++++++++ arch/arm/mach-imx/clk-pllv3.c | 10 - arch/arm/mach-imx/clk-vf610.c | 319 ++++++++++++++++++++ arch/arm/mach-imx/clk.c | 35 +++ arch/arm/mach-imx/clk.h | 4 +- arch/arm/mach-imx/common.h | 2 +- arch/arm/mach-imx/hardware.h | 1 + arch/arm/mach-imx/imx25-dt.c | 2 + arch/arm/mach-imx/imx27-dt.c | 2 + arch/arm/mach-imx/imx31-dt.c | 2 + arch/arm/mach-imx/imx51-dt.c | 2 + arch/arm/mach-imx/irq-common.c | 1 + arch/arm/mach-imx/mach-imx53.c | 3 + arch/arm/mach-imx/mach-imx6q.c | 81 ++++- arch/arm/mach-imx/mach-imx6sl.c | 52 ++++ arch/arm/mach-imx/mach-pca100.c | 4 +- arch/arm/mach-imx/mach-vf610.c | 48 +++ arch/arm/mach-imx/mm-imx1.c | 2 +- arch/arm/mach-imx/mm-imx21.c | 2 +- arch/arm/mach-imx/mm-imx25.c | 2 +- arch/arm/mach-imx/mm-imx27.c | 2 +- arch/arm/mach-imx/mm-imx3.c | 4 +- arch/arm/mach-imx/mm-imx5.c | 3 +- arch/arm/mach-imx/system.c | 47 ++- arch/arm/mach-imx/ulpi.c | 118 -------- arch/arm/mach-imx/ulpi.h | 11 +- include/dt-bindings/clock/imx6sl-clock.h | 148 +++++++++ include/dt-bindings/clock/vf610-clock.h | 163 ++++++++++ 39 files changed, 1374 insertions(+), 234 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/vf610-clock.txt create mode 100644 arch/arm/mach-imx/clk-imx6sl.c create mode 100644 arch/arm/mach-imx/clk-vf610.c create mode 100644 arch/arm/mach-imx/mach-imx6sl.c create mode 100644 arch/arm/mach-imx/mach-vf610.c delete mode 100644 arch/arm/mach-imx/ulpi.c create mode 100644 include/dt-bindings/clock/imx6sl-clock.h create mode 100644 include/dt-bindings/clock/vf610-clock.h