From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754659AbcBXMXQ (ORCPT ); Wed, 24 Feb 2016 07:23:16 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:44613 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753983AbcBXMXL (ORCPT ); Wed, 24 Feb 2016 07:23:11 -0500 From: qiujiang To: , CC: , , , , , , , Subject: [PATCH v3 1/2] gpio: designware: switch device node to fwnode Date: Wed, 24 Feb 2016 20:33:29 +0800 Message-ID: <1456317210-42742-2-git-send-email-qiujiang@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456317210-42742-1-git-send-email-qiujiang@huawei.com> References: <1456317210-42742-1-git-send-email-qiujiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.71.200.31] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56CDA0AB.01BF,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8e888b1339c62949c61f6a9cbea56926 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch switch device node to fwnode in dwapb_port_property, so as to apply a unified data structure for DT and ACPI. This change also needs to be done in intel_quark_i2c_gpio driver, since it depends on gpio-dwapb driver. Acked-by: Mika Westerberg Signed-off-by: qiujiang --- drivers/gpio/gpio-dwapb.c | 36 ++++++++++++++++---------------- drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index 597de1e..0ebbdf1 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -290,14 +290,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, struct dwapb_port_property *pp) { struct gpio_chip *gc = &port->gc; - struct device_node *node = pp->node; + struct fwnode_handle *fwnode = pp->fwnode; struct irq_chip_generic *irq_gc = NULL; unsigned int hwirq, ngpio = gc->ngpio; struct irq_chip_type *ct; int err, i; - gpio->domain = irq_domain_add_linear(node, ngpio, - &irq_generic_chip_ops, gpio); + gpio->domain = irq_domain_create_linear(fwnode, ngpio, + &irq_generic_chip_ops, gpio); if (!gpio->domain) return; @@ -415,7 +415,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, } #ifdef CONFIG_OF_GPIO - port->gc.of_node = pp->node; + port->gc.of_node = to_of_node(pp->fwnode); #endif port->gc.ngpio = pp->ngpio; port->gc.base = pp->gpio_base; @@ -449,17 +449,16 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio) static struct dwapb_platform_data * dwapb_gpio_get_pdata_of(struct device *dev) { - struct device_node *node, *port_np; + struct fwnode_handle *fwnode; struct dwapb_platform_data *pdata; struct dwapb_port_property *pp; int nports; int i; - node = dev->of_node; - if (!IS_ENABLED(CONFIG_OF_GPIO) || !node) + if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_node)) return ERR_PTR(-ENODEV); - nports = of_get_child_count(node); + nports = device_get_child_node_count(dev); if (nports == 0) return ERR_PTR(-ENODEV); @@ -474,21 +473,21 @@ dwapb_gpio_get_pdata_of(struct device *dev) pdata->nports = nports; i = 0; - for_each_child_of_node(node, port_np) { + device_for_each_child_node(dev, fwnode) { pp = &pdata->properties[i++]; - pp->node = port_np; + pp->fwnode = fwnode; - if (of_property_read_u32(port_np, "reg", &pp->idx) || + if (fwnode_property_read_u32(fwnode, "reg", &pp->idx) || pp->idx >= DWAPB_MAX_PORTS) { dev_err(dev, "missing/invalid port index for %s\n", - port_np->full_name); + to_of_node(fwnode)->full_name); return ERR_PTR(-EINVAL); } - if (of_property_read_u32(port_np, "snps,nr-gpios", + if (fwnode_property_read_u32(fwnode, "snps,nr-gpios", &pp->ngpio)) { dev_info(dev, "failed to get number of gpios for %s\n", - port_np->full_name); + to_of_node(fwnode)->full_name); pp->ngpio = 32; } @@ -497,17 +496,18 @@ dwapb_gpio_get_pdata_of(struct device *dev) * the IP. */ if (pp->idx == 0 && - of_property_read_bool(port_np, "interrupt-controller")) { - pp->irq = irq_of_parse_and_map(port_np, 0); + of_property_read_bool(to_of_node(fwnode), + "interrupt-controller")) { + pp->irq = irq_of_parse_and_map(to_of_node(fwnode), 0); if (!pp->irq) { dev_warn(dev, "no irq for bank %s\n", - port_np->full_name); + to_of_node(fwnode)->full_name); } } pp->irq_shared = false; pp->gpio_base = -1; - pp->name = port_np->full_name; + pp->name = to_of_node(fwnode)->full_name; } return pdata; diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c index 0421374..265bd3c 100644 --- a/drivers/mfd/intel_quark_i2c_gpio.c +++ b/drivers/mfd/intel_quark_i2c_gpio.c @@ -227,7 +227,7 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell) return -ENOMEM; /* Set the properties for portA */ - pdata->properties->node = NULL; + pdata->properties->fwnode = NULL; pdata->properties->name = "intel-quark-x1000-gpio-portA"; pdata->properties->idx = 0; pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; diff --git a/include/linux/platform_data/gpio-dwapb.h b/include/linux/platform_data/gpio-dwapb.h index 28702c8..80954f2 100644 --- a/include/linux/platform_data/gpio-dwapb.h +++ b/include/linux/platform_data/gpio-dwapb.h @@ -15,7 +15,7 @@ #define GPIO_DW_APB_H struct dwapb_port_property { - struct device_node *node; + struct fwnode_handle *fwnode; const char *name; unsigned int idx; unsigned int ngpio; -- 1.9.1