From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754981AbbIOJXx (ORCPT ); Tue, 15 Sep 2015 05:23:53 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:60764 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754813AbbIOJL0 (ORCPT ); Tue, 15 Sep 2015 05:11:26 -0400 Message-ID: <1442308284.3979.33.camel@pengutronix.de> Subject: Re: [PATCH V3 3/3] reset: hi6220: Reset driver for hisilicon hi6220 SoC From: Philipp Zabel To: Chen Feng Cc: linux-kernel@vger.kernel.org, robh+dt@kernel.org, pawel.moll@arm.com, xuwei5@hisilicon.com, haojian.zhuang@linaro.org, zhangfei.gao@foxmail.com, arnd@arndb.de, bintian.wang@huawei.com, xuyiping@hisilicon.com, devicetree@vger.kernel.org, dan.zhao@hisilicon.com, suzhuangluan@hisilicon.com, w.f@huawei.com Date: Tue, 15 Sep 2015 11:11:24 +0200 In-Reply-To: <1442289504-183550-3-git-send-email-puck.chen@hisilicon.com> References: <1442289504-183550-1-git-send-email-puck.chen@hisilicon.com> <1442289504-183550-3-git-send-email-puck.chen@hisilicon.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Am Dienstag, den 15.09.2015, 11:58 +0800 schrieb Chen Feng: [...] > diff --git a/drivers/reset/hisilicon/Kconfig b/drivers/reset/hisilicon/Kconfig > new file mode 100644 > index 0000000..26bf95a > --- /dev/null > +++ b/drivers/reset/hisilicon/Kconfig > @@ -0,0 +1,5 @@ > +config COMMON_RESET_HI6220 > + tristate "Hi6220 Reset Driver" > + depends on (ARCH_HISI && RESET_CONTROLLER) > + help > + Build the Hisilicon Hi6220 reset driver. > diff --git a/drivers/reset/hisilicon/Makefile b/drivers/reset/hisilicon/Makefile > new file mode 100644 > index 0000000..c932f86 > --- /dev/null > +++ b/drivers/reset/hisilicon/Makefile > @@ -0,0 +1 @@ > +obj-$(CONFIG_COMMON_RESET_HI6220) += hi6220_reset.o > diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c > new file mode 100644 > index 0000000..3d3de94 > --- /dev/null > +++ b/drivers/reset/hisilicon/hi6220_reset.c > @@ -0,0 +1,121 @@ > +/* > + * Hisilicon Hi6220 reset controller driver > + * > + * Copyright (c) 2015 Hisilicon Limited. > + * > + * Author: Feng Chen > + * > + * 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 > + > +#define ASSET_OFFSET 0x300 Typo, missing 'R': +#define ASSERT_OFFSET 0x300 > +#define DEASSET_OFFSET 0x304 Same here: +#define DEASSERT_OFFSET 0x304 > +#define to_reset_data(x) container_of(x, struct hi6220_reset_data, rc_dev) > + > +struct hi6220_reset_data { > + spinlock_t reset_lock; /*device spin-lock*/ > + void __iomem *asset_base; > + void __iomem *deasset_base; > + struct reset_controller_dev rc_dev; > +}; > + > +static int hi6220_reset_assert(struct reset_controller_dev *rc_dev, > + unsigned long idx) > +{ > + struct hi6220_reset_data *data = to_reset_data(rc_dev); > + > + unsigned long flags; > + int bank = idx >> 8; > + int offset = idx & 0xff; > + > + spin_lock_irqsave(&data->reset_lock, flags); Not necessary, the spinlock can be removed. > + writel(BIT(offset), data->asset_base + (bank * 0x10)); > + > + spin_unlock_irqrestore(&data->reset_lock, flags); > + return 0; > +} > + > +static int hi6220_reset_deassert(struct reset_controller_dev *rc_dev, > + unsigned long idx) > +{ > + struct hi6220_reset_data *data = to_reset_data(rc_dev); > + > + unsigned long flags; > + int bank = idx >> 8; > + int offset = idx & 0xff; > + > + spin_lock_irqsave(&data->reset_lock, flags); > + > + writel(BIT(offset), data->deasset_base + (bank * 0x10)); > + > + spin_unlock_irqrestore(&data->reset_lock, flags); > + > + return 0; > +} > + > +static struct reset_control_ops hi6220_reset_ops = { > + .assert = hi6220_reset_assert, > + .deassert = hi6220_reset_deassert, > +}; > + > +static int hi6220_reset_probe(struct platform_device *pdev) > +{ > + struct hi6220_reset_data *data; > + struct resource *res; > + void __iomem *src_base; > + > + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + src_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(src_base)) > + return PTR_ERR(src_base); > + > + spin_lock_init(&data->reset_lock); > + > + data->asset_base = src_base + ASSET_OFFSET; > + data->deasset_base = src_base + DEASSET_OFFSET; > + data->rc_dev.nr_resets = SZ_4K; The default .of_xlate implementation checks if a given index value from the device tree is smaller than this value. Just set this to the largest valid reset index + 1, or implement .of_xlate to check that the index is a valid bank/offset combination. > + data->rc_dev.ops = &hi6220_reset_ops; > + data->rc_dev.of_node = pdev->dev.of_node; > + > + reset_controller_register(&data->rc_dev); > + > + return 0; > +} > + > +static const struct of_device_id hi6220_reset_match[] = { > + { .compatible = "hisilicon,hi6220_reset_ctl" }, This should be: + { .compatible = "hisilicon,hi6220-reset-ctl" }, > + { }, > +}; > + > +static struct platform_driver hi6220_reset_driver = { > + .probe = hi6220_reset_probe, > + .driver = { > + .name = "reset-hi6220", > + .owner = THIS_MODULE, Drop this line, .owner will be set by __platform_driver_register below. > + .of_match_table = hi6220_reset_match, > + }, > +}; > + > +static int __init hi6220_reset_init(void) > +{ > + return platform_driver_register(&hi6220_reset_driver); The platform_driver_register macro expands to __platform_driver_register(&hi6220_reset_driver, THIS_MODULE); regards Philipp