Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756765AbbFPR2a (ORCPT ); Tue, 16 Jun 2015 13:28:30 -0400 Received: from mail-bl2on0103.outbound.protection.outlook.com ([65.55.169.103]:21632 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754071AbbFPR2V (ORCPT ); Tue, 16 Jun 2015 13:28:21 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; barco.com; dkim=none (message not signed) header.d=none; From: York Sun To: CC: , , York Sun , Peter Korsgaard Subject: [PATCH] driver/i2c/mux: Add register based mux i2c-mux-reg Date: Tue, 16 Jun 2015 10:28:12 -0700 Message-ID: <1434475692-4611-1-git-send-email-yorksun@freescale.com> X-Mailer: git-send-email 1.7.9.5 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11OLC003;1:0SzWA0LP9ZtziPWYLBRoMPKryOHZGWJCiuzvfoZ8qUqbmbcfc2zcwdMH1c2S0UU12PJOGppOmzi/LxhU/dsl89reLtjeZEjWNX2BERFnxdO/fMXhmvKV8YG90cyeTqaXYwsd5hDM8vkOnJLzVCRIJxRUHLM/KfpgVn1GNR0zWpow8kPDjP6rrHjTCp0YF5lLxQHSjMibk+I1gyCSmvm3NWw2b2THDmgIj2et3D7ZxNOp0T89E9O5Lr/UZtrnIMIUEzK0zA0TZhY/eibMhAbCdR3QhVvDYPtw7zi8wPZSz9R04hu9Jb/ua/PuHN7+wGPDDCcdcJUMyEFJxKlLGYx88ICTc4kTrnDx+TgKsU5l4cw= X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(106466001)(2351001)(47776003)(229853001)(46102003)(50226001)(230783001)(104016003)(36756003)(87936001)(86362001)(33646002)(50466002)(19580405001)(19580395003)(48376002)(110136002)(105606002)(62966003)(189998001)(50986999)(77096005)(85426001)(5001960100002)(77156002)(92566002)(6806004);DIR:OUT;SFP:1102;SCL:1;SRVR:BN1PR03MB154;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB154;2:EDoodrBXAj/tbHXgsU7Yg3OC3FEiJBPpSWB4PWG4jynx+e8Bl9uMvKJIiekDqj0Y;2:IfwS0K+9YL239PtsvmSF6EIAIsaLIsHnLwqlrI20twzzWDLZKJBGJOOKN0Xm7qmSKIxJwGeZGpvy0rNQgF+idhZu0HvIfHKkBoqOCDlGJZXWHwvbKgOXkM0dj4WPsnZfhECG3zlYqQP84y7GApvZx9vEbpqZHVGGm/GDsRqYxsoKWYAWhgWge+4wXynuS6tbqfxMvL4xctQnno0u9SlDyEeOCRjipx0hl53JHAJiLEA=;6:kZtoT+5CnCD6XRINhp9AmI0FuoacB5wGx9hwqcDilsCMUY9We1cVpAYVbHKvy4sBxspZQ64QMS3MGWB3Kj5V+QIhYuk8vGyU3U8Hta+tJB/huS/D4qqeekdkylTZeQGAFLWi1AKNanRkzcOTZsM79OGgV7GTj9TstrvThHYBDEqlckEt1ebKr1+lBXIpIu+dejcmiIC+h92HDjuxGPbZP31ng6clSTxrrMrnYN//qmnZG2wf1MJvYR0MK9eTjU/Pp9WqYcqHA/ishpjcmDsu+N7pUVPVksspYtMvtcLaq0idEOMBy2bUBW2bKlJl/V7YQcAg11fOnkYF0eaSgtDYVg==;3:ZpbBWAq7dzSS7/xt5u6zhX9Ktm5CMpnbJjtnPUopx+K3y1a5RnSw7IIVRmgRAPuSlow85a3yVnIx88ToXZGaZSmC6gok+lcqtcCNFxrkvoKBF++K6HnFwORH2fCV+enE8xu5VEoQgy0ElsGGQ3oH9YBWw0m27phYO3quQsrYdNVtc1ltUpQYpZIKRj8g3aPrAnLiezqZ4nHodOYNCqCuhPR2qID6BB39elyW0Kr1Qi7vHXrhTZdM4IoDpST/ZciJ4monwkVH4dAkfmxnyBskG4G/Hl0/P0xpj81NH3+k31KE80sjlppB68Xli1WcRiav X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR03MB154; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(520003)(3002001);SRVR:BN1PR03MB154;BCL:0;PCL:0;RULEID:;SRVR:BN1PR03MB154; X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB154;9:ctJQsl3ta5s8jLdDBNteP+u4d57yZxklM++miRCf0M39apw9n8Zdwc1b5R0SpEWo42+GYMLBsOpiSU7PPeaTEY01eSxbKj1DfVJ7Zu/Fr6nm1jtjhNkxXjnodUHZDz6Gw8K1iHvBqgbnSj7rs+21Lk0ui12Wxps/v/eI7ivimLJZMRhv69GfCxSvSp5TEek1F3YV+/unMOxZiTStijUbRMeQfp0JyGNAcA9R9NrVWPG95plYWNbUuRF0ZtnXSjCnr+keakccwOL36xeFQV9U9v3wA08c/RtxpTn/694ZX8D/XoQ18BNWSVGXEOCnXrNChYQW98u6T5muabFlpGiuhkPxz/28OgzMRNEUwCT4HfMJemFPrlAXypCNc3x8qSKAOCPIBJ22AdtWrH0C75FaqCQOZe8VuIUF2gkAZ5C19eYz3szDmi4nd7SycMXBU7hgX/3WxyPfpLHf1AiZE4uFaAf9NTlGRxAULfAuobFA1PDVdHeHx/HHZWkjtKmEJBT6elxTTctZ22MMDYFnwSOnLV4LiUI3wNFhwL/Gl6J3Zey1zmD/RbcVzKzP3h7qJDDGsETDTYbVl2T0UAHrixoNz5GvewqS2QmoA6yy5sqDuAJckTjx+sz3SyytCNub54JmVaaTaQl4f3BdmYuGg3SaOldHqxiky8JzYjhr+Pgk/13G15nTXxPHVZahz/igfWXjdDT6AiKfSERorsPm/bdTKYgy5WDehFcxpaJXGNQCHarO9JLJZttgcrvbj18+w6YF1lbg7NYTeoYbkk6B2DwdtUZQb/v7uJCjqv5LyTqQ8Zdgucs9q4olflE8eupoNltUWJ1XMWUSLXxy6zFgXa5dsIErefDnrHM+0mpX8jzbjnQ= X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB154;3:6zPsBrFty2xQ+5KvR9BT3agjg90Gah6KfAvPQ4RJ3gdUlcd86XF2sH3VjZ+PzDPynx1KwQuLf2Rm0+v3LzuRV3znt9LCDoI7zjWznBHXikI9z0Wuft4qlBXhS9h8WOnYz9M73d2BDJekU8bOb/2t8Q==;10:TjbRb74sltbCAETIhXfmzgGEy89cAY3OY6zO7iez8gasaP6JbV5LSGZXWAb6LvemGj78rb9fLnlKLCM9H6ItlBnr/FFPZCfn2zgKZIjoDTE=;6:4v6aL4YgCsCClKKGEEXYrqIrGCaIcedACRpavlMNlqCfVjm4oMiMPJDMrZOReWp1 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2015 17:28:17.9910 (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: BN1PR03MB154 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 12362 Lines: 425 Based on i2c-mux-gpio driver, similarly the register based mux switch from one bus to another by setting a single register. The register can be on PCIe bus, local bus, or any memory-mapped address. Signed-off-by: York Sun CC: Wolfram Sang CC: Peter Korsgaard --- .../devicetree/bindings/i2c/i2c-mux-reg.txt | 69 ++++++ drivers/i2c/muxes/Kconfig | 11 + drivers/i2c/muxes/Makefile | 1 + drivers/i2c/muxes/i2c-mux-reg.c | 239 ++++++++++++++++++++ drivers/i2c/muxes/i2c-mux-reg.h | 38 ++++ 5 files changed, 358 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt create mode 100644 drivers/i2c/muxes/i2c-mux-reg.c create mode 100644 drivers/i2c/muxes/i2c-mux-reg.h diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt new file mode 100644 index 0000000..ad7cc4f --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt @@ -0,0 +1,69 @@ +Register-based I2C Bus Mux + +This binding describes an I2C bus multiplexer that uses a single regsiter +to route the I2C signals. + +Required properties: +- compatible: i2c-mux-reg +- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side + port is connected to. +* Standard I2C mux properties. See mux.txt in this directory. +* I2C child bus nodes. See mux.txt in this directory. + +Optional properties: +- reg: this pair of specifies the register to control the mux. + The depends on its parent node. It can be any memory-mapped + address. If omitted, the resource of this device will be used. +- idle-state: value to set the muxer to when idle. When no value is + given, it defaults to the last value used. + +For each i2c child node, an I2C child bus will be created. They will +be numbered based on their order in the device tree. + +Whenever an access is made to a device on a child bus, the value set +in the revelant node's reg property will be output to the register. + +If an idle state is defined, using the idle-state (optional) property, +whenever an access is not being made to a device on a child bus, the +register will be set according to the idle value. + +If an idle state is not defined, the most recently used value will be +left programmed into the register. + +Example of a mux on PCIe card, the host is a powerpc SoC (big endian): + + i2c-mux { + /* the depends on the address translation + * of the parent device. If omitted, device resource + * will be used instead. + */ + reg = <0x6028 0x4>; + compatible = "i2c-mux-reg"; + #address-cells = <1>; + #size-cells = <0>; + i2c-parent = <&i2c1>; + i2c@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + si5338: clock-generator@70 { + compatible = "silabs,si5338"; + reg = <0x70>; + /* other stuff */ + }; + }; + + i2c@1 { + /* data is in little endian on pcie bus */ + reg = <0x01000000>; + #address-cells = <1>; + #size-cells = <0>; + + si5338: clock-generator@70 { + compatible = "silabs,si5338"; + reg = <0x70>; + /* other stuff */ + }; + }; + }; diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index f6d313e..77c1257 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig @@ -29,6 +29,17 @@ config I2C_MUX_GPIO This driver can also be built as a module. If so, the module will be called i2c-mux-gpio. +config I2C_MUX_REG + tristate "Register-based I2C multiplexer" + help + If you say yes to this option, support will be included for a + register based I2C multiplexer. This driver provides access to + I2C busses connected through a MUX, which is controlled + by a sinple register. + + This driver can also be built as a module. If so, the module + will be called i2c-mux-reg. + config I2C_MUX_PCA9541 tristate "NXP PCA9541 I2C Master Selector" help diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile index 465778b..bc517bb 100644 --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o obj-$(CONFIG_I2C_MUX_GPIO) += i2c-mux-gpio.o +obj-$(CONFIG_I2C_MUX_REG) += i2c-mux-reg.o obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-pca9541.o obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o obj-$(CONFIG_I2C_MUX_PINCTRL) += i2c-mux-pinctrl.o diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c new file mode 100644 index 0000000..03ce858 --- /dev/null +++ b/drivers/i2c/muxes/i2c-mux-reg.c @@ -0,0 +1,239 @@ +/* + * I2C multiplexer using a single register + * + * Copyright 2015 Freescale Semiconductor + * York Sun + * + * 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 +#include +#include +#include "i2c-mux-reg.h" + +struct regmux { + struct i2c_adapter *parent; + struct i2c_adapter **adap; /* child busses */ + struct i2c_mux_reg_platform_data data; +}; + +static int i2c_mux_reg_set(const struct regmux *mux, unsigned int chan) +{ + if (!mux->data.reg || chan < 0 || chan > mux->data.n_values) + return -EINVAL; + + *mux->data.reg = mux->data.values[chan]; + + return 0; +} + +static int i2c_mux_reg_select(struct i2c_adapter *adap, void *data, + unsigned int chan) +{ + struct regmux *mux = data; + + return i2c_mux_reg_set(mux, chan); +} + +static int i2c_mux_reg_deselect(struct i2c_adapter *adap, void *data, + unsigned int chan) +{ + struct regmux *mux = data; + + return i2c_mux_reg_set(mux, mux->data.idle); +} + +#ifdef CONFIG_OF +static int i2c_mux_reg_probe_dt(struct regmux *mux, + struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *adapter_np, *child; + struct i2c_adapter *adapter; + struct resource res; + unsigned *values; + int i = 0; + + if (!np) + return -ENODEV; + + adapter_np = of_parse_phandle(np, "i2c-parent", 0); + if (!adapter_np) { + dev_err(&pdev->dev, "Cannot parse i2c-parent\n"); + return -ENODEV; + } + adapter = of_find_i2c_adapter_by_node(adapter_np); + if (!adapter) { + dev_err(&pdev->dev, "Cannot find parent bus\n"); + return -EPROBE_DEFER; + } + mux->parent = adapter; + mux->data.parent = i2c_adapter_id(adapter); + put_device(&adapter->dev); + + mux->data.n_values = of_get_child_count(np); + + values = devm_kzalloc(&pdev->dev, + sizeof(*mux->data.values) * mux->data.n_values, + GFP_KERNEL); + if (!values) { + dev_err(&pdev->dev, "Cannot allocate values array"); + return -ENOMEM; + } + + for_each_child_of_node(np, child) { + of_property_read_u32(child, "reg", values + i); + i++; + } + mux->data.values = values; + + if (of_property_read_u32(np, "idle-state", &mux->data.idle)) + mux->data.idle = I2C_MUX_REG_NO_IDLE; + + /* map address from "reg" if exists */ + if (!of_address_to_resource(np, 0, &res)) { + mux->data.reg = devm_ioremap_resource(&pdev->dev, &res); + if (IS_ERR(mux->data.reg)) + return PTR_ERR(mux->data.reg); + } + + return 0; +} +#else +static int i2c_mux_reg_probe_dt(struct gpiomux *mux, + struct platform_device *pdev) +{ + return 0; +} +#endif + +static int i2c_mux_reg_probe(struct platform_device *pdev) +{ + struct regmux *mux; + struct i2c_adapter *parent; + struct resource *res; + int (*deselect)(struct i2c_adapter *, void *, u32); + unsigned int initial_state, class; + int i, ret, nr; + + mux = devm_kzalloc(&pdev->dev, sizeof(*mux), GFP_KERNEL); + if (!mux) + return -ENOMEM; + + platform_set_drvdata(pdev, mux); + + if (dev_get_platdata(&pdev->dev)) { + memcpy(&mux->data, dev_get_platdata(&pdev->dev), + sizeof(mux->data)); + + parent = i2c_get_adapter(mux->data.parent); + if (!parent) { + dev_err(&pdev->dev, "Parent adapter (%d) not found\n", + mux->data.parent); + return -EPROBE_DEFER; + } + mux->parent = parent; + i2c_put_adapter(parent); + } else { + ret = i2c_mux_reg_probe_dt(mux, pdev); + if (ret < 0) { + dev_err(&pdev->dev, "Cannot locate device tree"); + return ret; + } + } + + if (!mux->data.reg) { + dev_info(&pdev->dev, + "Register not set, using platform resource\n"); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mux->data.reg = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(mux->data.reg)) + return PTR_ERR(mux->data.reg); + } + + mux->adap = devm_kzalloc(&pdev->dev, + sizeof(*mux->adap) * mux->data.n_values, + GFP_KERNEL); + if (!mux->adap) { + dev_err(&pdev->dev, "Cannot allocate i2c_adapter structure"); + return -ENOMEM; + } + + if (mux->data.idle != I2C_MUX_REG_NO_IDLE) { + initial_state = mux->data.idle; + deselect = i2c_mux_reg_deselect; + } else { + initial_state = mux->data.values[0]; + deselect = NULL; + } + + for (i = 0; i < mux->data.n_values; i++) { + nr = mux->data.base_nr ? (mux->data.base_nr + i) : 0; + class = mux->data.classes ? mux->data.classes[i] : 0; + + mux->adap[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev, mux, + nr, mux->data.values[i], + class, i2c_mux_reg_select, + deselect); + if (!mux->adap[i]) { + ret = -ENODEV; + dev_err(&pdev->dev, "Failed to add adapter %d\n", i); + goto add_adapter_failed; + } + } + + dev_info(&pdev->dev, "%d port mux on %s adapter\n", + mux->data.n_values, mux->parent->name); + + return 0; + +add_adapter_failed: + for (; i > 0; i--) + i2c_del_mux_adapter(mux->adap[i - 1]); + + return ret; +} + +static int i2c_mux_reg_remove(struct platform_device *pdev) +{ + struct regmux *mux = platform_get_drvdata(pdev); + int i; + + for (i = 0; i < mux->data.n_values; i++) + i2c_del_mux_adapter(mux->adap[i]); + + i2c_put_adapter(mux->parent); + + dev_info(&pdev->dev, "Removed\n"); + + return 0; +} + +static const struct of_device_id i2c_mux_reg_of_match[] = { + { .compatible = "i2c-mux-reg", }, + {}, +}; +MODULE_DEVICE_TABLE(of, i2c_mux_reg_of_match); + +static struct platform_driver i2c_mux_reg_driver = { + .probe = i2c_mux_reg_probe, + .remove = i2c_mux_reg_remove, + .driver = { + .owner = THIS_MODULE, + .name = "i2c-mux-reg", + }, +}; + +module_platform_driver(i2c_mux_reg_driver); + +MODULE_DESCRIPTION("Register-based I2C multiplexer driver"); +MODULE_AUTHOR("York Sun "); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:i2c-mux-reg"); diff --git a/drivers/i2c/muxes/i2c-mux-reg.h b/drivers/i2c/muxes/i2c-mux-reg.h new file mode 100644 index 0000000..e213988 --- /dev/null +++ b/drivers/i2c/muxes/i2c-mux-reg.h @@ -0,0 +1,38 @@ +/* + * I2C multiplexer using a single register + * + * Copyright 2015 Freescale Semiconductor + * York Sun + * + * 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. + */ + +#ifndef __LINUX_I2C_MUX_REG_H +#define __LINUX_I2C_MUX_REG_H + +/* MUX has no specific idel mode */ +#define I2C_MUX_REG_NO_IDLE ((unsigned)-1) + +/** + * struct i2c_mux_reg_platform_data - Platform-dependent data for i2c-mux-reg + * @parent: Parent I2C bus adapter number + * @base_nr: Base I2C bus number to number adapters from or zero for dynamic + * @values: Array of value for each channel + * @n_values: Number of multiplexer channels + * @classes: Optional I2C auto-detection classes + * @idle: Value to write to mux when idle + * @reg: Virtual address of the register to switch channel + */ +struct i2c_mux_reg_platform_data { + int parent; + int base_nr; + const unsigned int *values; + int n_values; + const unsigned int *classes; + unsigned int idle; + unsigned int *reg; +}; + +#endif /* __LINUX_I2C_MUX_REG_H */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/