From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbdFFRvo (ORCPT ); Tue, 6 Jun 2017 13:51:44 -0400 Received: from mail-co1nam03on0066.outbound.protection.outlook.com ([104.47.40.66]:36734 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751733AbdFFRvC (ORCPT ); Tue, 6 Jun 2017 13:51:02 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=fail action=none header.from=nxp.com; From: Leonard Crestez To: Shawn Guo CC: Peter Chen , Anson Huang , , Fabio Estevam , , Lucas Stach Subject: [PATCH v2 1/2] ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull Date: Tue, 6 Jun 2017 20:50:42 +0300 Message-ID: <1b0dac2d2236f86c87b066a95f33bd80a5ad5c6b.1496771145.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131412450545834605;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(39860400002)(39840400002)(39410400002)(39450400003)(39400400002)(39850400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(76176999)(50986999)(498600001)(6666003)(6916009)(33646002)(2950100002)(305945005)(4326008)(189998001)(5003940100001)(106466001)(105606002)(104016004)(8936002)(77096006)(85426001)(118296001)(50226002)(48376002)(47776003)(54906002)(50466002)(38730400002)(53936002)(110136004)(8676002)(81166006)(8656002)(356003)(36756003)(5660300001)(86362001)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB161;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC008;1:E/jodO0n+5ME68Xs2rs3AkTLgXc0CZMKyGXPwTy+C6EuvMexCRIcdrFHMGZvcuW9B8YpmUtuEE0AAUObdoa1Yd78n8CQpAz98xMNGp8J4DhkAKP5hc9vo0aa97nmv42dZ5ZG+chvfG5R28wIR4WY1jIJy03ivREvjgGT9g+u+U5xUucBbAAHpY5XWm8lPis078MlwkhKD0LGx0U2ES72CmnvyNP7AkDdckMwge+KQUcYcDILSGAULI1kGlTlctT+kRk6DXFWKK7uj5APnZUW2tpV+Z6dUPojCgU3Ar8S844kvyiMsLkTd77cUxATtIfjgz9R6dbgFnBKKrxhyORcM2aNqNUnr6n1lM38e1BQxDEPmMy+Qw2nMO5TPX1KdXZ1Lt7a/Mtg/RQGjXfq43zuNzj4Y5ARcRwAhVzHfMgqO+1+9OQXtc54j+2XmKuaS+IH1zkdfC7gQnjJU01aNGZeD4KKfEkUnYxNFykUmYS/jtN3fc2rOgod4R8cbEniCOBJJ+gxS3wgnixcK36UugS8x7TyJIGD/qnrmTv9yOfRVTXHi06ab1rhgd5OYchEcVA8IMjuA0sB9WCGf4d6eoFooQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL2PR03MB161: X-MS-Office365-Filtering-Correlation-Id: 0ee8ee40-f3f2-41e2-0f8d-08d4ad04943d X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:BL2PR03MB161; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB161;3:fJ8rRT+LVSSC2zCmcAZZe5QxdaKdUZwXquwN4uqsvBtVFaTWLz3AP40agR9qrKOK4cjAdYjGTOOqBDxtwBsCGhICoqKUaEJXLCE1NdR/ikV0vtgO9jIaO/Xh0x9IUhZpB3XhzzB6l/R99BSGOd6IepsIbFhoIf0mNiXZ3WEIY5dEuBSROEanjJrgMKfpQnHfz4l6vMbxcas6fn76io1NYanqlbcVjbV1Hvsm238RLwKyRfsjv/fdmJLPMqeoWZO1qa4sBzbJAby2xy/jnEAh/EbcLxEbg3rIHr1bK674rcSUtOxYXTSEtf9yYQeGEP2JY3pyqDqMW7NdKnzDxLb6sjBV2CmpP9cBsbBjF9mwb4kPF3Nvorp4SDLLpghMlmH0lvgmMO9ZrQ09dsEx+m4maRAHyrJNF2PewQVceJiBAFZjev5wLeLNRC1Hfs5zoGMN;25:9Hv6tZZYNOLf3RuWAG0pF7Ko8OTHZ6lIq5XR+d4h/M5yF+9MMUNv9YOoSGTkwF7F8eOtv0KcYVMC986WF1Kj2DhqUDWpBTtOCYtxL8cY//1AW/N2PYA7VRgsxcPnaaUOvBlCRHS5n1Nc/rPghPQqvZlbirC8xy/QzsuhQ3VJr3VEMWqRWrAE18LcXA6K9NfKdFvnN02ARtzNDwoy4DOVTXsFF29dzAVmGCnHRtxFO7Wrhtw81WbtPUL5TsvS9BjLabEwIagePZOzN6iApp458XM7awl5qOm1mft1ZRIYXC2qWvMll3cdM6C5upVKRWIfTyKEjS65WWQXyZCevu3eWP+VtaWUqsP0JDo5e008nStpLDz90OnCIvC89rZwDGK1V/Kl1gdyE4MYMRKOrv2QRPCDDw3IqhRkBQtvS5xhCtjP2ThxK+xsVF8SPOg90LsIkdBFendkwaXJqq3tRSJuN/TjOAUweTG4faxDZx/sppU= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB161;31:oVa813+wJBrgxp/n0Z9RtUI7AiOTFRqvBx8sMBr4hwJSDYcQtkqRadH4kgfroyxERR7+ZXYXrRVpK87bOq2fMWy+O93l02dcHCUIy6bxWYdBhWgId6thoc7fm0IizZr7+sAi28ShOIZqKCvSk/Z18LMIM7Eim98tFfgKSb7SjMO09OhObulLMBOnl5jcfBxK3gbHh4t5snSwqsmcn6fJlz0mUOg+5294IeHspkhrV21JF+jxsNIX+Xuyzc4J9KpHzF/trxD2/a2nx3mDKJlg7g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123556025)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(20161123563025)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BL2PR03MB161;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BL2PR03MB161; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB161;4:HfLPG9KjwUmRT0RQ6Amgp+oiS4pCoUyTN0t5ld6nPHJ?= =?us-ascii?Q?YbqBvtwSCo85DBLWlqBSyflaD/7InAfCUQ4mG2bspq5dV7BnHtYl59+uzT97?= =?us-ascii?Q?UMma7/m5riBe0PzRg7Zi17XIlKNSXerM2sIAiGByJ/de3VGUV+/+6ZgukJT/?= =?us-ascii?Q?5+KZ2KtCP+wWcUQak1cGTVylMXWf3YyNc0iF6or0hEAjXP3Wy5cckXxOTNOR?= =?us-ascii?Q?+UHM4UA21lltgBRZZ91HdvuAmZJZfQ7/Pc1s9xQSfIpAFxyQDRUVKbrjLVro?= =?us-ascii?Q?qPtJbbRyLP57SigttGcnrhxptOT4OBfuoKwk3VwHoBgYFpNhzei+Ql0LHwEF?= =?us-ascii?Q?cgy49e/fFlB2HO0h6v4O6T4XfDW/1ATbSWj8PQuMpIFImXfiDJ8dDnT01wiD?= =?us-ascii?Q?+xUtPRZ7yC+Fw/a2K7V5m4gsKn/8TRns9dmCQFIv7tadZK6DMuTef+aayZiy?= =?us-ascii?Q?oWXXLD3IzcHYhiSeM+BRLiTLt0z95IkZ/YKWYndJVBdiUYAXdrndyyorNTkV?= =?us-ascii?Q?b2/TOD7tXRg9ShktZK+dA+FCdPlXqOZd1ZDG0I34nGfSURQHpWOOhpAcY8II?= =?us-ascii?Q?z0usHvU/WcQZseC0EJSji7K9lRCXHnIEJ1C+V+8qqptRdLfcpsmRz6lhJ+ZD?= =?us-ascii?Q?3tzzrYKPs2BOWaf45bR+wG4AJ8sp6iNRUGrGfksYNiH8eEAySmHPYZHnC0O0?= =?us-ascii?Q?GQ2TnpT9bdIpY7gSMhcpcgvyTMyqsb+86YuFs8jq02pwJQhz0+8C0qaUy7JL?= =?us-ascii?Q?OeLJmtAX4hoUQ+rk/LnGcaBObHdxGauA6YgR8COPMGt9k78rlG6Ui9ZJfxSn?= =?us-ascii?Q?pag1hE/Tnf7obDXMntaCtqnsxM4XHgKkizZt5ywXM1aNhMAE1xLcLpuKThtG?= =?us-ascii?Q?ZI9zpICQkRLBG3JJQ857udu8FymYxm/E6nUnEg1v2xmDuuPaa5FkKhWeqWeW?= =?us-ascii?Q?EUZmqr47XjatvFxcQgNgQODnjQMo2g62JjNgLQTsELFAXGORbDjegMm4Hxnd?= =?us-ascii?Q?VyOZNtVC5Km2iI28w7WUVEp5FY+HEhDys7nmeZRcY5+j+9aIiMXANKZx5KL7?= =?us-ascii?Q?oLWW1jJczaJvo0NHTuZIn5Vsqxu+Vuv9MT/pmeyzOPpAGPUeAocaCdqQ7Rsx?= =?us-ascii?Q?d76nEMLUCtSe/2rry3AvYR8weg/OJ3FqtkBzW9KrJCJEnkLyODetHPA4RqQE?= =?us-ascii?Q?J5UEtdlF0hoVmN4jL8EAKonCLFGoQw1u5vKtw9V2HGK/sMy+pYHH8zZ7S/N5?= =?us-ascii?Q?2rDHIjC5mGr72QT6D/fHe3YYtkbqZGTV5Flmx?= X-Forefront-PRVS: 033054F29A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB161;23:SdY/1c7f7ufN0W0Yj50KYyuVBe99Ueq/UJFKkLFXyB?= =?us-ascii?Q?iTJnIhYYISplgA/B0DGZpi9e5aS5Tq/XH7HB1ID8+4u95RkyLU1dNvM9xiFN?= =?us-ascii?Q?uODEOUDGjHjbUG3tV3qbIRDz9xlCgRQjNrDhPZreRRazyt42QyYosGTM4+Ts?= =?us-ascii?Q?oYq14VzsWiRfNeS48nxUn8tnTrg82aBmOk5MKLviLtpvDW3doqK3hPY2hUBN?= =?us-ascii?Q?iQVIXcK9by19l099vuRghEDcTIvAy7fR17BKwgHK/uSl08pGa2nS3+oeBhEf?= =?us-ascii?Q?rBdpSll896TUFVJs7xv9aLqtyFe8hy1ks6T66nAl52JVbkfXLLyDbuQnP+2a?= =?us-ascii?Q?OQt0eqF1DrGwAFX5ISFklrS2SzSLiiXBloUQNotV1Hw4USKbOTvf0nC72RuU?= =?us-ascii?Q?+1L9W7YNzn++3JozTXz0aA0tOtKU/VQkOUlXJ6QxgHrR7TTIQSz+f7V+l+P+?= =?us-ascii?Q?5DUfxcaEfW5mbwHCCNtieBQ2qYDG3BX+h2MR2NHAYb0kd0uI9HgwagfnYodu?= =?us-ascii?Q?aJATefzvY8RZVL/RYPA8OEx68426847mJxB1KMyuWzMR2bsOkT+UKGQ4VSt+?= =?us-ascii?Q?JR6tDyf8eH/+Xfie5c9r++3W9+8FJBEJunRRU5PxzHUtBBRNw8giLLtvuqfS?= =?us-ascii?Q?q+FQMU11PgOIrv1+9R3BECPx9ggBDsa2x70O46oWoNwVsfB7CV8Xn7NO45GF?= =?us-ascii?Q?NQtXmLkgNKdl0ZlCzP+CJaavpcce6JbGZntQxY7Oz4DteaVtVoAZ3M8mQ98e?= =?us-ascii?Q?RCRcxWoz3IbhNEXb8ZGmUxTBihI7B+whvxl0izr7t+5JJUG7rGeHBvlWivBs?= =?us-ascii?Q?A5IGApZxy08+Cj6lcQNGYrBFbOLHFdZvW1X4zPINV0f3FWE15RCUb5num2wB?= =?us-ascii?Q?pXOKvSNScslQ6oXAlNCTbM/SxzUqhZ4un73FoyTUj7GZCluP53skC6wRxWGx?= =?us-ascii?Q?bW8p6w92V/7aqCfDMciuXUHHX+B7abus48HUD7qUxL0bij1rA3BeAUI7BI/k?= =?us-ascii?Q?QC2hVrRB16ULkccTdJgikTF6vixljy5uVBl/zc/N9j6lweNQyK4SekZe65Ie?= =?us-ascii?Q?l7dEIVES1RUzwb6HuTVt7jk54CmcdA4lV4PuDK1T7fqI00+8X42gAA41a57H?= =?us-ascii?Q?Nf+uVPUpDsNTcSUoQBjwc1tUyhtwjhYK8rO1IQry+0jcwa1EV8gjGXNmDO6r?= =?us-ascii?Q?n+9ekVRFWzuAQXclydMelgqe7zhhV9hAA8PWTVBjZVO+1lQxmWisRFQfmax6?= =?us-ascii?Q?DrslazZYRE/VrjZqE=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB161;6:iSyYy+98x8yn+W5ldKfEOBf/GDmPgMeNPR3TJj7FGG/cCUk0ObCteiiz9ccdfH9CTdOIlJ2t7o0VKsKiiezc3tQGmW7P5C5RvBlle8FGRaZMbJvX8w0JPR63NXBLbbANt/4vTGjjXWUHq6LMSpO4HN4bN8A9qfXTpD6Md7AtqBDROnBPCPvui2ServrFG3viuaq6eNpy8XI66qly4Rs17cHdp8zxVoYGpE+AVn5oM4WjXickS/diZ3PJVL2oli3FpDRoLoaq/hOzicsN2eg61b/R2rZW4SRhopcW39dOroDBYzGxuhNPAKpLPsPIQ6/nZ06gTZZ0WxFovVTDtRus/BSQgAbnQVbu26FOc3J4nIWz06270N2Gvup/9BMrhWCp2wHjU/a+w/ThbT2lGakvNTAi0ZB9h/aMw8/lBwpZIE/lGm/1OyYv7qKoSLdH4HA6AOcIsGhleKkYCf7HhZiyvGEiNyEHNVf+R+UF/YWd1presODmop1y/R2IbpD2e3sMFwuWQckARYrHwtdzoEfjTQ== X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB161;5:YTFIajFfiiXTGCXEoi7ecyphaBhLDa8aDCptBWnANMmTXWbGmreQHWgMMxDH+vOt74SX1ErSUMnz9W1Vav5xsdrHo+Cw1urSLTMgaHrs2wIM8rc/wuJx5wwpm7f4go5b+eb9RLPNMeNmO6dwNgWrtMEKBeAuURlx9kJDVRjsYECaF7zT1nOltWRUwPLWs0lJtUTpSjzbzGgBdrC+DkKVMP+Zf/MQIAE4h4Td57KMlNyq/KlGyz9WAtOecEQHwqffwhomrFxzXK5o+RtQMUee5kzHYZivIGx87C/NQ5rDy51lKtbZgoizJqAZcfy5xchABdFdUPmlChQ3vVqIuBxzH68Tap6HTK/t+JcCAdTOGsfK6WjQoeIJbg8DJQIuzNsVOxkes/c0YvmHGDVV7RiODaH6y3Ii/9tMcW/t7Dvx2zYtWK8EjgvM07SdLG8O8nxHf1tuXLk0vb6WMNeMLPDz3qisHItWThG6nlYvt5GoDsiAaHNXxcL1NAdB6rQnaA704s9SFY5qL4+6PRS2V9FdQQ==;24:qcKTXJI+vUhA4IbNhnV3RU8+ouXScxxLMqpQZEe4wj3/eBsPsm/AOmTInNN1O6Y3euvmmOd/PGSCOuMQlq56rxQhXPG/wKiyRuqVcryGrzg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB161;7:tIMw0/CX9NEB8Dcdaa3CxVj+rza+SmIaYCgxm1XRaNJdyToit9zOzXtHJsum+JYTCaEBEkYDDpk/Bt0QTJ4M/tQMjSkEBL1MPJfQFUkEhXZeCCWOFDj1QA+7ScxMmI+oX4vh/EZxGzS+LsdXOfVEWZeV7TuHTcERZIAUbs9lJP2FPucuRZBE9PuYvWUViCWBgLjO690h4gmnIcJku+RGvKyLdPNcUz77xpAxOmMO77lVXk88gJCklVxVdpI4ccO6IFXkNqusGeZNJDd+IwEZ+SC41qDtYKTZFIENTLqtZWKt+kvM0vT1fQcWoUhF71dDH9tAtngbbJdaQ0YBAdmNgA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 17:50:54.2714 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB161 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Support for imx6ull is already present but it's based on of_machine_is_compatible("fsl,imx6ull") checks. Add it to the MXC_CPU_* enumeration as well. This also fixes /sys/devices/soc0/soc_id reading "Unknown". Signed-off-by: Leonard Crestez --- arch/arm/mach-imx/cpu.c | 3 +++ arch/arm/mach-imx/mxc.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index b3347d3..94906ed 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -131,6 +131,9 @@ struct device * __init imx_soc_device_init(void) case MXC_CPU_IMX6UL: soc_id = "i.MX6UL"; break; + case MXC_CPU_IMX6ULL: + soc_id = "i.MX6ULL"; + break; case MXC_CPU_IMX7D: soc_id = "i.MX7D"; break; diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index 34f2ff6..e00d626 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -39,6 +39,7 @@ #define MXC_CPU_IMX6SX 0x62 #define MXC_CPU_IMX6Q 0x63 #define MXC_CPU_IMX6UL 0x64 +#define MXC_CPU_IMX6ULL 0x65 #define MXC_CPU_IMX7D 0x72 #define IMX_DDR_TYPE_LPDDR2 1 @@ -73,6 +74,11 @@ static inline bool cpu_is_imx6ul(void) return __mxc_cpu_type == MXC_CPU_IMX6UL; } +static inline bool cpu_is_imx6ull(void) +{ + return __mxc_cpu_type == MXC_CPU_IMX6ULL; +} + static inline bool cpu_is_imx6q(void) { return __mxc_cpu_type == MXC_CPU_IMX6Q; -- 2.7.4