From patchwork Thu Jul 9 17:16:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 493515 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D28311402BB for ; Fri, 10 Jul 2015 04:28:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZDGWY-00044R-JE; Thu, 09 Jul 2015 18:26:18 +0000 Received: from mail-bn1bon0781.outbound.protection.outlook.com ([2a01:111:f400:fc10::1:781] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZDGWK-0003fo-SN for linux-arm-kernel@lists.infradead.org; Thu, 09 Jul 2015 18:26:06 +0000 Received: from BN3PR0301CA0056.namprd03.prod.outlook.com (10.160.152.152) by BY2PR0301MB1639.namprd03.prod.outlook.com (10.163.28.141) with Microsoft SMTP Server (TLS) id 15.1.201.16; Thu, 9 Jul 2015 18:25:41 +0000 Received: from BY2FFO11FD032.protection.gbl (2a01:111:f400:7c0c::129) by BN3PR0301CA0056.outlook.office365.com (2a01:111:e400:401e::24) with Microsoft SMTP Server (TLS) id 15.1.213.14 via Frontend Transport; Thu, 9 Jul 2015 18:25:40 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD032.mail.protection.outlook.com (10.1.14.210) with Microsoft SMTP Server (TLS) id 15.1.201.10 via Frontend Transport; Thu, 9 Jul 2015 18:25:40 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t69IPYG1008556; Thu, 9 Jul 2015 11:25:37 -0700 From: To: , , , , , Subject: [PATCH v3 1/7] ARM: imx: add i.mx6ul msl support Date: Fri, 10 Jul 2015 01:16:38 +0800 Message-ID: <1436462204-32654-2-git-send-email-Frank.Li@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436462204-32654-1-git-send-email-Frank.Li@freescale.com> References: <1436462204-32654-1-git-send-email-Frank.Li@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD032; 1:JJWvPrbkTcUS/tIM/8NDdR4yb7USahrYy0fcRClTldeneOo6giMWT7IS2NiozHnnXviWrRjmln1cSO9zLtP5QVDOEoIViTX3BJ/yJPfmqzAsOBhGuZt8VaOvYLFH2hjYAQkFr4IBPryleXkUYJMJhyiNn0mK59snsAS+qx8m79wrF4iGu5kRoRrZHpOgk45HBn6FrxXnUnRNhWRZqdLwZQPYozMc6riM9kfgrG4R3KTK4/Qr3KNDY0fv0SMJOkSG5XpAkvpAO4qbOFC1yZVDrf0XQVgDX1cRwHsfZqVVydkNoxoEm6n1sSemiZBWzsv+lMUVdkEkmVZNc71fE597uA== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(5003940100001)(229853001)(76176999)(87936001)(106466001)(86152002)(50986999)(2950100001)(5001960100002)(107886002)(5001770100001)(104016003)(50226001)(2201001)(77156002)(86362001)(575784001)(6806004)(47776003)(62966003)(19580395003)(92566002)(46102003)(36756003)(50466002)(189998001)(48376002)(19580405001)(105606002)(77096005)(85426001)(2004002)(4001430100001)(2101003); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB1639; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1639; 2:B0jAx2nx/Oy4YzlS3MTHQcYpYzfyjZDDU70EBjQ2Mf0G4Z5CVr61Va5lDwnawlCF; 3:5a60/AhcqCABqYZ8venFXjIHCh4EGYu3tKUXqF5Z0+ObIwrxAIiXWwngKTyytZYZKMCgM0YJxc+6AY6bEuPGKSSEM4wSX0XPdJu1AV+Au2E5iKzfGB6CnLZwU7I46I+3D5YeWj+U92RpzXOmGBHv4YfR+c4hX7rBTcnO6W/+zts0xK3iY9vZtg3cV77/nMzPcHPyVjqnrbJ6hxAkC5fAsQX9sF7nIXhOfhXA/sgYHqo=; 25:PkjEdX7dGZTOd6WwnN/8ntFSapx2Xk3cIHkT62YFu7vjiWk7hJ5yAwQDWx7Fdl6IjA6jlrQw8BtgKbE0oO1xcQ51yZyWzim7B2vRDQyoC+cvtejOxoHl+rj4YepNJTGo3rGsYzLB9kmdrWPUUQdpHX1De/UPf5lYz+J84p3zgnWD1tP6ydKgv5KZQzPjkatRlH7JjP9mT5wDA5zSympNcjaj8bU4PnvlgtDkWPydjz/Vqm6wvqgSb3JEgfYtMlfe87LqwS+heeZxSBzZFdTcJw==; 20:go7pFn6fQ2QwMx2HseBFfQwM7RU3RpYtZw124RvRxT9UDvHwzUI8fEtp7eSAGNgsPo9QtSK89iI4+SDHMO7TSCLkC4RHN9D0Xf34r1nUCkYNmO8Cg278MXp1I/EYUmrsrTp4KhR9Pv+ZAkc03w7q+ycEA4kQIadtHOp9bDB/TJ/F4ixGLrabA5+6btxpJCI2YoLylA45Gd5ncvz6MT8mYuBLWbfSj8zge78hZv1SIFgIUba1vRNdIc5VCy7zt/8HP3sj2jkh03zaXGWVA9HJMhv+tzrLXFY7rNJnFq0qAuIW9oHqUetMQcwQHdFq52IM9dYR5tlawXqQ0sSiiTiGygrFe/cpOeRWIUioxJQjt0Q= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1639; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR0301MB1639; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB1639; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1639; 4:497pjko74WPyfDDgB/TisKAXWaSABeGtFgaUQvavYYB0G43CwDkTpC7AR9jFBeCJdMAL4/GpV+hMsHgXy5nGFx9QdZVw8qZ4fg5rDkMH8qg2lm4yhLbUrItKfYctxw3B0N1pHD7misdn2ZC8fGEja6kVnxXEqdE3HXNJEao9EcQgasnGSznjZu2J74Is6y6BO5/T16dJGC0TIRYWaBSVterYEKzEBKUfvi8BPbczUTZosEK38EwcsrvhJFJpZOxqZXi+cCJ+Nbcxxa3dL8d6ws89NBWK+FCTeKM64Jg+ak8= X-Forefront-PRVS: 0632519F33 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB1639; 23:wKz0RLvBwdN/72/iVrh2c+NDL/cUc2i+4T4PT0m?= =?us-ascii?Q?EoWvE5g3Q4iAMgbk10IoksG0nyFV3hCKrn2BwQOWD5XI5zsuponPNvlX9gnm?= =?us-ascii?Q?aqNs9JPlybZEe1LNYkUGh+TfmV6fcEcmGJpAbOapkHyKGHf2OEu/vM2liHdy?= =?us-ascii?Q?Pl/ePSsz4uYG1Tl5xiFZJeyVG4cm51pp19zT8p2st2fO0s8S3juPQOjRWdRe?= =?us-ascii?Q?SXITQveAkjRKxD8dgtozLETY/wU8RMRnodYEfCQ3LaOhd/Vl0DyOUmsxteVJ?= =?us-ascii?Q?4tkuUysS2AkSVuyD8RKXoCbLwJpW0s2pYcOI7v/I5tqecqFnMVRXXFePq/5d?= =?us-ascii?Q?9iHWvefp664GS+Z0OJI1pv/4tLxZ28UT0pxNAfOzolUkbvaedd4Nce5Se3kN?= =?us-ascii?Q?FAXEAZ5khz6oJTA+JysADR9VcB1ZrHCQ3Ln98G/WEOCQ3QTwKFvOPcJsyNze?= =?us-ascii?Q?DbKepz5bIS7aFYppfAzk92DhStRR/ET2t30o2xUY/YZPyB+LbsfJntA97YIl?= =?us-ascii?Q?z8eVORtLDGYlirua077LT+CMExav3yyzVdJspWDe1/LhRFGKmA7k9t77la+w?= =?us-ascii?Q?+Z9o1mpTDilSxiRLCwrOMN2U+12riW91HLZJWGlUkhuN+2nxKg7TG/tHqFOR?= =?us-ascii?Q?YEK49qUdqUSNCeXfmfb9UT4BXohvMPw57hMagryw1p4wElR654pHv7iXmLll?= =?us-ascii?Q?NaHezunGZ/uHq/4cqtn7Zvr1NwFnH72lLdKjFygXuNL2JoQZNKwa6SJ3NIsU?= =?us-ascii?Q?pDowXW0HtwRleMc0WwGRn4DEq2ZCx0hVn5SBA1Bfz9/tS4qriR8H9+SkGIYi?= =?us-ascii?Q?Gw8u+QYu0mRRAdZ9IUXpqthpb4kAYDMxX5/9+z88erJQcN2Vptfle/lVm01o?= =?us-ascii?Q?zZAg+TW7LeYBXFceUnPk+WSQxhV5eQHhJwWvAOldUWVuvLjwv+4cDWYe7yw9?= =?us-ascii?Q?PcKPptp18ssfY1nPROueBlKnZ3KMvv+qiUQfeYU9PdSXZGONCvI2ytVCgTvO?= =?us-ascii?Q?5FHXWCGqTu0EImYr8cgJH4B3PBIb5nmWd7tUNn5SpzLmq9w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1639; 5:1AhoZqbfnxRYDNhWXblfHKni9ZSTeF6zEzmkOX+4y4czNXmY6Se/tqXgwzaVZSVRYEBvO+sXbUwYSl+gpP5RTsuzs3jmpkqzrbkWeIeBcl2rC9NrxxRuMnYNaYpNbKJsHSDNqI3IMn/MZ3n2xE/VuQ==; 24:L5ijWyEZI94C/DwdxFX3LLDaa0Q3dIQgNItROb4TsyBreme4l7NdAmjtZkx5GdVqEMnGeU8BXXxNvQ6ZZUXWMX2VFBctGLZ0UK6RIm88yRI=; 20:IcMFm7Tf6I+1XfM/ekHgAwZQ7cgpArJlt4CS41mpVk3L4Y5NqdALpNMtHu5sgkUtU5WeMJm0GiXzDyo/KToi/Q== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2015 18:25:40.1260 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1639 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150709_112605_209692_493A7D9B X-CRM114-Status: GOOD ( 20.34 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fc10:0:0:1:781 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Li 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 From: Frank Li i.MX6UL is a new SOC, add MSL support Signed-off-by: Frank Li --- arch/arm/mach-imx/Kconfig | 8 ++++++++ arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/cpu.c | 3 +++ arch/arm/mach-imx/mach-imx6ul.c | 43 +++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/mxc.h | 6 ++++++ 5 files changed, 61 insertions(+) create mode 100644 arch/arm/mach-imx/mach-imx6ul.c diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 573536f..8ceda28 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -548,6 +548,14 @@ config SOC_IMX6SX help This enables support for Freescale i.MX6 SoloX processor. +config SOC_IMX6UL + bool "i.MX6 UltraLite support" + select PINCTRL_IMX6UL + select SOC_IMX6 + + help + This enables support for Freescale i.MX6 UltraLite processor. + config SOC_IMX7D bool "i.MX7 Dual support" select PINCTRL_IMX7D diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 37c502a..fb689d8 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -83,6 +83,7 @@ endif obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o +obj-$(CONFIG_SOC_IMX6UL) += mach-imx6ul.o obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o ifeq ($(CONFIG_SUSPEND),y) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index a7fa92a..5b0f752 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -130,6 +130,9 @@ struct device * __init imx_soc_device_init(void) case MXC_CPU_IMX6Q: soc_id = "i.MX6Q"; break; + case MXC_CPU_IMX6UL: + soc_id = "i.MX6UL"; + break; case MXC_CPU_IMX7D: soc_id = "i.MX7D"; break; diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c new file mode 100644 index 0000000..706d5f6 --- /dev/null +++ b/arch/arm/mach-imx/mach-imx6ul.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include +#include +#include +#include + +#include "common.h" + +static void __init imx6ul_init_machine(void) +{ + struct device *parent; + + parent = imx_soc_device_init(); + if (parent == NULL) + pr_warn("failed to initialize soc device\n"); + + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + imx_anatop_init(); +} + +static void __init imx6ul_init_irq(void) +{ + imx_init_revision_from_anatop(); + imx_src_init(); + irqchip_init(); +} + +static const char *imx6ul_dt_compat[] __initconst = { + "fsl,imx6ul", + NULL, +}; + +DT_MACHINE_START(IMX7D, "Freescale i.MX6 Ultralite (Device Tree)") + .init_irq = imx6ul_init_irq, + .init_machine = imx6ul_init_machine, + .dt_compat = imx6ul_dt_compat, +MACHINE_END diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index c4436d4..a5b1af6 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -38,6 +38,7 @@ #define MXC_CPU_IMX6DL 0x61 #define MXC_CPU_IMX6SX 0x62 #define MXC_CPU_IMX6Q 0x63 +#define MXC_CPU_IMX6UL 0x64 #define MXC_CPU_IMX7D 0x72 #define IMX_DDR_TYPE_LPDDR2 1 @@ -165,6 +166,11 @@ static inline bool cpu_is_imx6sx(void) return __mxc_cpu_type == MXC_CPU_IMX6SX; } +static inline bool cpu_is_imx6ul(void) +{ + return __mxc_cpu_type == MXC_CPU_IMX6UL; +} + static inline bool cpu_is_imx6q(void) { return __mxc_cpu_type == MXC_CPU_IMX6Q;