From patchwork Tue Feb 6 05:56:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram Dash X-Patchwork-Id: 869682 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="IMWcOzKL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbDL83Mwlz9sBZ for ; Tue, 6 Feb 2018 16:59:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 00712C21E3C; Tue, 6 Feb 2018 05:58:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5B451C21E52; Tue, 6 Feb 2018 05:57:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 19880C21DB5; Tue, 6 Feb 2018 05:57:53 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0069.outbound.protection.outlook.com [104.47.1.69]) by lists.denx.de (Postfix) with ESMTPS id EC9EBC21E37 for ; Tue, 6 Feb 2018 05:57:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Tws3AKFX0nizlAoQAmHB9UnJN+8k1qF9ZCRUvh2/xSo=; b=IMWcOzKL/X69SLqa6q+N6ws138NJfTa4dhGa8QGMdefRbRtkdFyJ7sazLO5W4OfyRGTdcK+hVYH3YWQhf5bEFh+JVy07N7GMzM7WaeLjvU+t/TMy/c+d4Vk5VPjgcnQqKOWGRAxi1+/n1DtkdwW5w3nesweKgLSiDq61A6fK8P8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=sriram.dash@nxp.com; Received: from idcbfarm.ap.freescale.net (192.88.169.1) by VI1PR04MB1214.eurprd04.prod.outlook.com (2a01:111:e400:5186::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Tue, 6 Feb 2018 05:57:44 +0000 From: Sriram Dash To: hs@denx.de, york.sun@nxp.com, u-boot@lists.denx.de Date: Tue, 6 Feb 2018 11:26:31 +0530 Message-Id: <1517896591-16196-2-git-send-email-sriram.dash@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517896591-16196-1-git-send-email-sriram.dash@nxp.com> References: <1517896591-16196-1-git-send-email-sriram.dash@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.169.1] X-ClientProxiedBy: PN1PR0101CA0012.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:e::22) To VI1PR04MB1214.eurprd04.prod.outlook.com (2a01:111:e400:5186::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f3eab8ff-b3a6-4bec-5041-08d56d268bbc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:VI1PR04MB1214; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1214; 3:i9HF6txHT/zFNkjb/kIsofwMdH+Y6sDio47KoQW8/JDOCwwnPRblXeeazpp97b63FPlKsvOBf69dknvYF//jga7Oyd9PPCy0mMmImQFpRTR3/986lUu5t7denLe2cd/6JSY91uL704B8ib8jNNfBMVhPPSPMOEwq5TQb3c2pjU7q/yDfYsFPCrZvN0GYMYB6/LfGXTIglt7qPHk9X6mzAqStqPLwE1Q54SvPTJxkfjqjkM6E1hB3XDFpBi12tds+; 25:e8K8WIw6XV658bu3avzj3c7h9wxTsXCcO4litfbXD4Ii7frDQ0cqfUP6ec+d31I/0lxra9eAJOuNVq22UqqdXjjv/3IwIDirO+5irqYWholP2kqedMkUZetM41KYLDso7fwNRmZtL/TCUbTQVoVRF3OIQbgQ0aqIgRQfmAF9H00FZgQqfiueTtYbvZwe5bOCElNvAkrM2yLmsAoa81dMi/yPeCLhKnpS4GRNgBsaHcC1VTDj3xRUpYrljLf2w1U1dTBnPf0InP6FLbEbxQ69sLUXRP4Mnboma+l/vvGUezlbggRJWbMiw8pqlsBaolC7cRLkff5mNAg96sBU7bmYxA==; 31:YPvkrjdPgql6B+s23hmbeqpBrH1FXhcbUJWwTSMHtJXey8BfHPKbJkRxkFPwvHw1TRnNVMZz7SBmphHcJHdKEop4qAXlGs58u4GH55lJi1N0m37Jgay625NiRZ8gipB8W9oWhM1m7xaA7MAe67czvt11fVujLRIfmdh3HpaP4COAWcElPP62LelfceKAhG06i9QtKHW+v+awxyPXSlgrvz0Y0MW8+MgASWpSkkWKRPA= X-MS-TrafficTypeDiagnostic: VI1PR04MB1214: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1214; 20:eKoVLq9F93Dt3ZZmySbugv2lRLlF/27jTCGAEwoIfjp2ZyJ8tEz85XscntFFza6/tzXABOE7kM989lALXWDT/OG+KNIzJtGBQ6foPraX0K+lrL+dUvCMA0eKAKn6tiWgozJe8s3i7B7N0DgwQO5RUsnFn/Gh2XDu3/zhdEGDdlSoVbVg9aFzRVg3YmVOgbgIGl8DlAqrUV1iM18BQMm1f6G69gepdm/Nk3kcSTF9iM8kiWxfpkVx9Jk2lOxpbzSswYE+gqsp8P+2z6SOPyucnT19fw9cvbhM+QZq3t9kd+qtUoJiasgAZ7T7xYpoPIBpXz5NdtP1cHt4evd4QCVTRJuposaD/sgrmGr/aiXRLJ6F1ei5nP3yTS3Dqixt6Kzmx7ADeZl2GcjKaCPljT6uCB0zO4J1Okh5ifntEA4r18sbcI79JsFrZwm3JKUVSg1vOyKqPHOs6sSBuBO+qbaZQrPOLL2DKOLzrE2l1a+ulCt4wI8UN7/yLjYTE26vhqO0; 4:qEZH2dB/IsnTsS3yi7jLH6eE8mIWa9YkEryi1x8Gs0deW3Hiy4Xx4E9J16uWFN1bZFpV85c/vGcqSntsoKmNH4Pe1wKDojqOyueVWH4IA2btwSs4TxeYnRnt0+ed2tNIDTpq+VPSUnY6b0dyAcr6ISRaKRWcESV3OcJ8QfXqkxrpVmsduxacassO0xHITueE+BVnhHXAbxUjFCdQ8oC8DX/KfQXqAACy1uQniIbWEQGl6Is756tUnp19sb3wHPaQP5am0zQiG9j4JXh2tEkBBOg6FFmVkCE4CYRcs6kRWIzMa9n1Ym/msr+z/1heavG0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231101)(2400082)(944501161)(6055026)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:VI1PR04MB1214; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1214; X-Forefront-PRVS: 0575F81B58 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(366004)(39860400002)(39380400002)(376002)(396003)(346002)(189003)(199004)(36756003)(59450400001)(386003)(6506007)(26005)(186003)(81166006)(81156014)(16586007)(316002)(5660300001)(68736007)(8676002)(50466002)(6486002)(16526019)(48376002)(53936002)(76176011)(2906002)(2950100002)(6512007)(6666003)(97736004)(105586002)(4326008)(478600001)(8936002)(15650500001)(7736002)(25786009)(305945005)(6116002)(66066001)(51416003)(52116002)(50226002)(3846002)(47776003)(86362001)(106356001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1214; H:idcbfarm.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1214; 23:Rd7cP32Ja6V+ONw6CWq0WihGWBSudV93zvD17+ibF?= yPo1AtDR6t+v9M62RVLQQdL6d0CTs5cBTrRjZ6vsbXHNLYuSMiHKVkKvi/OJB7KisMvUfGb4JUBSGwfjUCNltZlCQKWnqMEQCYIGXEy2/1rlIcTtx1+7MfVQcTdyip4CI6AMHmt0Hw6vsLNprdn7KJIVENYETA8CfDaJ9TXFIkDgaAFg5jvAMHEf8UHvAPotvoVAz1zAlnW2vnsjnJe7zC9/RBFDy4RjwlBI1bQlSvyFoKowfJYrN6eHI+EZ/bXokl7NWYyDD6y/Y5rSVqyApeNMJvbQYxdeuzx3LBL/qV6IognG+/6mgRomiaAMiF2fvNMcYEI/RUL3xSI3+gu3k0HrKpKX4IkXxJa7zTN7O92LhmHp00apKuxReo+VwRbm3EpTR1755jqEBSzV9WD8tjSFW1i3GfEPWkX+EOQyErf+WrLXzECkQO5pIHaSSfC1C+RVf98mkZZpQsFjwAK3/UeqOcPCqXLuh8G/DBP49F0zCJpd648JJFTVCa1RRzB2WpXFPLUCN1Hj1hqgpgGxkWcR0gogNDnh93CF2UPbWZxcFax38AdyC14K3GaSm8Ud+FWNRKUrlCT12szoB77/Z0AHA/PZMFfKazi3mNZ8D1FbPwbQZ0NvXXYTXiwDacYnK713p+fTsE9XphBIKdHUOoXtPzsmLJV8qO0A9/e85RLVDdVN3alCLgkmMI9Ym+z5yLOhAYpj5B9/TIOBgj+o/Zm3y5eQ2DqoL2sPsdyNN0nLpoHu+ZOIB1rBhz5TLFeyTlVookvg6tu7VVEm5Hga3AzjPlpVS3aBu5mX8w9K+rWI6lYpW3MMRmumWe+sjxvtaYFKQcbryXKQv6bkTxUq6wOWc6PF3B5SFxdlNJaLpeeE79WXW8ZjhihXb8hxM93NS4ZFTSp9aAa4ALFkcfnTRvQf40mzOtu7T/h372Dyqu/qAig6ViNhGHJ+J9eB7+YnI6kKvHIJyBcU1+nkG0EekJtuAtt32DWbVL/fqXXdiAmkLAphV4pPouo5Ht+7GcN8zKYrSQdNFNsudX7sF4t+D2pm94mLsjjUjOgp9LYDx+xLOP67w5mwOkEx4dCwdw3nvRswltdjk7VB5K/iGFsnIV+m1P66kvPoq5sEvwvhJ2vfkUQEGZsOCWKNWTPK1loAbw7QurM6PYM99BF5dccldDjsKWbaIlkSu6HUEUbY4ZQ7A== X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1214; 6:O7CQj5a3K31tt1bvXkKdqQCGtuVj9OaVKTr3kyz+okU89Vo9WVGeZk0k+ZTwMH0X5Sph9Fn76NrSq5A83FE6SB29CGIkn8yjXCvgZKcmM6z14njlENyBxK1nvAdUqHdaCrLCDWUtl9nkT/DXeBXSKc/OqRxItyJUaY0rzh0aczETHRMVR/vvItcdL71Te0pJaq01oItITa6jZKjuvUNSYOCUhb78Sq3okWABYJAalpyPiCv1vWGjYl6XdmTfsM9Av6nbf3nfzhjepPiV7B4X+4o4ZAtFpowncMuXvmF9J9eJ+08QSWXC5KAcDuK75KNLSof08puwqek5bDbVHXoE0lvz1egrmgAy71fP3BGT6cg=; 5:1/bRSCQotp+B6U6bvBEtQ9CxvxGmvaJnSWr+WhgNcnys7bafvoG7oQdSpVXkgBzxyEHTCEA/SKWTcN6tx5ZEStl8uW0H2K0DKmGltZN3meb7O6xYAc/oECWsiMIDPrfIr1toDOYAsAFxIWHl88uhmJMF7SRZqxZ8CVcOUDjroRE=; 24:edb2I/7Tp7udSZj/AclJDrzZpwc7Oag3VmL4LaltyP1qukOGIGJKYNmrnyIH/WG+4CIKS5s+9WNjfw/q5lAF+ZDnqRunmE+Lwk6A0mRJnAM=; 7:sk9L2Fv7oz7tJH94aaST++Q/wKNyvyDOXHTCgQ8IYq/ykGqeG58EOmQ6HG3XJSev52DuqOmjJZM/KfyZg74ijkVPmwHbG0ZkC0FYnL0SSUFBvlP12zbo/cw16kw2HOzav5jlYwdqW1vNXrZapL3X2ZHjnQfbd+InGkDT2r8zI7zMXrmqzNwn3eI4hhKNLyV57VbMHPEqIV1HJJwjBkWcHC7+U/nYvPkegcLYHB9CcZteFQr7ht1yH3Gu+qT2Wcu3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2018 05:57:44.0851 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3eab8ff-b3a6-4bec-5041-08d56d268bbc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1214 Cc: priyanka.jain@nxp.com, bhaskar.upadhaya@nxp.com, ying.zhang22455@nxp.com Subject: [U-Boot] [PATCH 2/2] drivers: i2c: mxc: Update support to 8 I2C controllers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Existing driver supports upto 4 I2C controllers. But some of future NXPs SoCs like lx2160a has eight I2C controllers. Update MXC driver to support upto 8 I2C controllers Signed-off-by: Sriram Dash Signed-off-by: Priyanka Jain --- drivers/i2c/Kconfig | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/mxc_i2c.c | 56 ++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 7cad493..c863a6e 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -179,6 +179,30 @@ config SYS_I2C_MXC_I2C4 help Add support for NXP MXC I2C Controller 4. Required for SoCs which have I2C MXC controller 4 eg LS1088A, LS2080A + +config SYS_I2C_MXC_I2C5 + bool "NXP MXC I2C5" + help + Add support for NXP MXC I2C Controller 5. + Required for SoCs which have I2C MXC controller 5 eg LX2160A + +config SYS_I2C_MXC_I2C6 + bool "NXP MXC I2C6" + help + Add support for NXP MXC I2C Controller 6. + Required for SoCs which have I2C MXC controller 6 eg LX2160A + +config SYS_I2C_MXC_I2C7 + bool "NXP MXC I2C7" + help + Add support for NXP MXC I2C Controller 7. + Required for SoCs which have I2C MXC controller 7 eg LX2160A + +config SYS_I2C_MXC_I2C8 + bool "NXP MXC I2C8" + help + Add support for NXP MXC I2C Controller 8. + Required for SoCs which have I2C MXC controller 8 eg LX2160A endif if SYS_I2C_MXC_I2C1 @@ -239,6 +263,62 @@ config SYS_MXC_I2C4_SLAVE MXC I2C4 Slave endif +if SYS_I2C_MXC_I2C5 +config SYS_MXC_I2C5_SPEED + int "I2C Channel 5 speed" + default 100000 + help + MXC I2C Channel 5 speed + +config SYS_MXC_I2C5_SLAVE + int "I2C5 Slave" + default 0 + help + MXC I2C5 Slave +endif + +if SYS_I2C_MXC_I2C6 +config SYS_MXC_I2C6_SPEED + int "I2C Channel 6 speed" + default 100000 + help + MXC I2C Channel 6 speed + +config SYS_MXC_I2C6_SLAVE + int "I2C6 Slave" + default 0 + help + MXC I2C6 Slave +endif + +if SYS_I2C_MXC_I2C7 +config SYS_MXC_I2C7_SPEED + int "I2C Channel 7 speed" + default 100000 + help + MXC I2C Channel 7 speed + +config SYS_MXC_I2C7_SLAVE + int "I2C7 Slave" + default 0 + help + MXC I2C7 Slave +endif + +if SYS_I2C_MXC_I2C8 +config SYS_MXC_I2C8_SPEED + int "I2C Channel 8 speed" + default 100000 + help + MXC I2C Channel 8 speed + +config SYS_MXC_I2C8_SLAVE + int "I2C8 Slave" + default 0 + help + MXC I2C8 Slave +endif + config SYS_I2C_OMAP24XX bool "TI OMAP2+ I2C driver" depends on ARCH_OMAP2PLUS diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 79228c2..a17c1ec 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -589,6 +589,22 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr, #define I2C4_BASE_ADDR 0 #endif +#if !defined(I2C5_BASE_ADDR) +#define I2C5_BASE_ADDR 0 +#endif + +#if !defined(I2C6_BASE_ADDR) +#define I2C6_BASE_ADDR 0 +#endif + +#if !defined(I2C7_BASE_ADDR) +#define I2C7_BASE_ADDR 0 +#endif + +#if !defined(I2C8_BASE_ADDR) +#define I2C8_BASE_ADDR 0 +#endif + static struct mxc_i2c_bus mxc_i2c_buses[] = { #if defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_VF610) || \ defined(CONFIG_FSL_LAYERSCAPE) @@ -596,11 +612,19 @@ static struct mxc_i2c_bus mxc_i2c_buses[] = { { 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG }, { 2, I2C3_BASE_ADDR, I2C_QUIRK_FLAG }, { 3, I2C4_BASE_ADDR, I2C_QUIRK_FLAG }, + { 4, I2C5_BASE_ADDR, I2C_QUIRK_FLAG }, + { 5, I2C6_BASE_ADDR, I2C_QUIRK_FLAG }, + { 6, I2C7_BASE_ADDR, I2C_QUIRK_FLAG }, + { 7, I2C8_BASE_ADDR, I2C_QUIRK_FLAG }, #else { 0, I2C1_BASE_ADDR, 0 }, { 1, I2C2_BASE_ADDR, 0 }, { 2, I2C3_BASE_ADDR, 0 }, { 3, I2C4_BASE_ADDR, 0 }, + { 4, I2C5_BASE_ADDR, 0 }, + { 5, I2C6_BASE_ADDR, 0 }, + { 6, I2C7_BASE_ADDR, 0 }, + { 7, I2C8_BASE_ADDR, 0 }, #endif }; @@ -738,6 +762,38 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc3, mxc_i2c_init, mxc_i2c_probe, CONFIG_SYS_MXC_I2C4_SLAVE, 3) #endif +#ifdef CONFIG_SYS_I2C_MXC_I2C5 +U_BOOT_I2C_ADAP_COMPLETE(mxc4, mxc_i2c_init, mxc_i2c_probe, + mxc_i2c_read, mxc_i2c_write, + mxc_i2c_set_bus_speed, + CONFIG_SYS_MXC_I2C5_SPEED, + CONFIG_SYS_MXC_I2C5_SLAVE, 4) +#endif + +#ifdef CONFIG_SYS_I2C_MXC_I2C6 +U_BOOT_I2C_ADAP_COMPLETE(mxc5, mxc_i2c_init, mxc_i2c_probe, + mxc_i2c_read, mxc_i2c_write, + mxc_i2c_set_bus_speed, + CONFIG_SYS_MXC_I2C6_SPEED, + CONFIG_SYS_MXC_I2C6_SLAVE, 5) +#endif + +#ifdef CONFIG_SYS_I2C_MXC_I2C7 +U_BOOT_I2C_ADAP_COMPLETE(mxc6, mxc_i2c_init, mxc_i2c_probe, + mxc_i2c_read, mxc_i2c_write, + mxc_i2c_set_bus_speed, + CONFIG_SYS_MXC_I2C7_SPEED, + CONFIG_SYS_MXC_I2C7_SLAVE, 6) +#endif + +#ifdef CONFIG_SYS_I2C_MXC_I2C8 +U_BOOT_I2C_ADAP_COMPLETE(mxc7, mxc_i2c_init, mxc_i2c_probe, + mxc_i2c_read, mxc_i2c_write, + mxc_i2c_set_bus_speed, + CONFIG_SYS_MXC_I2C8_SPEED, + CONFIG_SYS_MXC_I2C8_SLAVE, 7) +#endif + #else static int mxc_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)