From patchwork Mon Aug 24 08:40:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 7061771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CC819C05AC for ; Mon, 24 Aug 2015 08:42:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E15A201F2 for ; Mon, 24 Aug 2015 08:42:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FC3A20149 for ; Mon, 24 Aug 2015 08:42:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZTnJQ-0002Ft-IX; Mon, 24 Aug 2015 08:41:04 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZTnJH-0002CR-C0; Mon, 24 Aug 2015 08:40:55 +0000 Received: from 212-186-180-163.dynamic.surfer.at ([212.186.180.163] helo=cgate.sperl.org) by merlin.infradead.org with esmtp (Exim 4.85 #2 (Red Hat Linux)) id 1ZTnJF-000869-TA; Mon, 24 Aug 2015 08:40:54 +0000 Received: from raspb.intern.sperl.org (account martin@sperl.org [10.10.10.32] verified) by sperl.org (CommuniGate Pro SMTP 6.1.2) with ESMTPSA id 6342147; Mon, 24 Aug 2015 08:40:17 +0000 From: kernel@martin.sperl.org To: Stephen Warren , Lee Jones , Russell King , Mark Brown , Mark Rutland , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, Ian Campbell , Rob Herring , Pawel Moll , Kumar Gala Subject: [PATCH v4 1/5] soc: bcm2835: auxiliar devices enable infrastructure Date: Mon, 24 Aug 2015 08:40:04 +0000 Message-Id: <1440405608-3995-2-git-send-email-kernel@martin.sperl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1440405608-3995-1-git-send-email-kernel@martin.sperl.org> References: <1440405608-3995-1-git-send-email-kernel@martin.sperl.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150824_044054_205860_A76A3DBB X-CRM114-Status: GOOD ( 25.54 ) X-Spam-Score: -0.9 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Sperl MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Sperl The bcm2835 SOC contains 3 auxiliar devices (spi1, spi2 and uart1) that all are enabled via a shared register. To serialize access to this shared register this soc-driver is created that implements: bcm2835aux_enable(struct device *dev, const char *property); bcm2835aux_disable(struct device *dev, const char *property); Which will read the property from the device tree of the device and enable/disable that specific device as per device tree. First use of this api will be spi-bcm2835aux. Signed-off-by: Martin Sperl --- drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/bcm/Kconfig | 11 +++ drivers/soc/bcm/Makefile | 1 + drivers/soc/bcm/bcm2835-aux.c | 154 +++++++++++++++++++++++++++++++++++ include/linux/soc/bcm/bcm2835-aux.h | 23 ++++++ 6 files changed, 191 insertions(+) create mode 100644 drivers/soc/bcm/Kconfig create mode 100644 drivers/soc/bcm/Makefile create mode 100644 drivers/soc/bcm/bcm2835-aux.c create mode 100644 include/linux/soc/bcm/bcm2835-aux.h -- 1.7.10.4 diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index 96ddecb..5506e39 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -1,5 +1,6 @@ menu "SOC (System On Chip) specific Drivers" +source "drivers/soc/bcm/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" source "drivers/soc/sunxi/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 7dc7c0d..c5744e1 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -2,6 +2,7 @@ # Makefile for the Linux Kernel SOC specific device drivers. # +obj-$(CONFIG_ARCH_BCM) += bcm/ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_QCOM) += qcom/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig new file mode 100644 index 0000000..b0af34b3 --- /dev/null +++ b/drivers/soc/bcm/Kconfig @@ -0,0 +1,11 @@ +# +# Broadcom SoC drivers +# +config SOC_BCM2835_AUX + tristate "Broadcom BCM2835 aux" + depends on OF + depends on ARCH_BCM2835 || COMPILE_TEST + + help + Support to enable/disable the BCM2835 auxiliar + devices spi1, spi2, uart1 diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile new file mode 100644 index 0000000..370a872 --- /dev/null +++ b/drivers/soc/bcm/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_SOC_BCM2835_AUX) += bcm2835-aux.o diff --git a/drivers/soc/bcm/bcm2835-aux.c b/drivers/soc/bcm/bcm2835-aux.c new file mode 100644 index 0000000..887508d --- /dev/null +++ b/drivers/soc/bcm/bcm2835-aux.c @@ -0,0 +1,154 @@ +/* + * bcm2835-aux + * + * Copyright (C) 2015 Martin Sperl + * + * Author: Martin Sperl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static DEFINE_SPINLOCK(bcm2835aux_lock); + +static struct platform_driver bcm2835aux_driver; + +static int bcm2835aux_dev_match(struct device *dev, void *data) +{ + struct device_node *dn = data; + + return (dev->of_node == dn) ? 1 : 0; +} + +static void *bcm2835aux_find_base(struct device *dev, const char *property) +{ + struct device *found = NULL; + struct device_node *np; + + /* get the phandle of the device */ + np = of_parse_phandle(dev->of_node, property, 0); + if (!np) { + dev_err(dev, "missing property %s\n", property); + return ERR_PTR(-ENODEV); + } + + /* now find the device it points to */ + found = driver_find_device(&bcm2835aux_driver.driver, NULL, + np, bcm2835aux_dev_match); + if (!found) { + dev_err(dev, "device for phandle of %s not found\n", + property); + return ERR_PTR(-ENODEV); + } + + /* now we got the device, so return the pointer */ + return dev_get_drvdata(found); +} + +static u32 bcm2835aux_find_mask(struct device *dev, const char *property) +{ + int err; + u32 mask; + + err = of_property_read_u32_index(dev->of_node, property, 1, &mask); + if (err) { + dev_err(dev, "missing argument to %s: %d\n", + property, err); + return 0; + } + + return mask; +} + +static int bcm2835aux_bitset(struct device *dev, const char *property, + bool set) +{ + u32 v, mask; + unsigned long flags; + void __iomem *base; + + /* find the device */ + base = bcm2835aux_find_base(dev, property); + if (IS_ERR(base)) + return PTR_ERR(base); + + /* and extract the mask */ + mask = bcm2835aux_find_mask(dev, property); + if (!mask) + return -ENOENT; + + spin_lock_irqsave(&bcm2835aux_lock, flags); + + v = readl(base); + if (set) + v |= mask; + else + v &= ~mask; + + writel(v, base); + + spin_unlock_irqrestore(&bcm2835aux_lock, flags); + + return 0; +} + +int bcm2835aux_enable(struct device *dev, const char *property) +{ + return bcm2835aux_bitset(dev, property, true); +} +EXPORT_SYMBOL_GPL(bcm2835aux_enable); + +int bcm2835aux_disable(struct device *dev, const char *property) +{ + return bcm2835aux_bitset(dev, property, false); +} +EXPORT_SYMBOL_GPL(bcm2835aux_disable); + +static int bcm2835aux_probe(struct platform_device *pdev) +{ + struct resource *res; + void __iomem *base; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENOENT; + + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); + + platform_set_drvdata(pdev, base); + + return 0; +} + +static const struct of_device_id bcm2835aux_match[] = { + { .compatible = "brcm,bcm2835-aux", }, + {} +}; +MODULE_DEVICE_TABLE(of, bcm2835aux_match); + +static struct platform_driver bcm2835aux_driver = { + .driver = { + .name = "bcm2835-aux", + .of_match_table = bcm2835aux_match, + }, + .probe = bcm2835aux_probe, +}; +module_platform_driver(bcm2835aux_driver); + +MODULE_DESCRIPTION("enable/disable driver for aux-spi1/spi2/uart1 on Broadcom BCM2835"); +MODULE_AUTHOR("Martin Sperl "); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/soc/bcm/bcm2835-aux.h b/include/linux/soc/bcm/bcm2835-aux.h new file mode 100644 index 0000000..17a64c6 --- /dev/null +++ b/include/linux/soc/bcm/bcm2835-aux.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 Martin Sperl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __BCM2835_AUX_H__ +#define __BCM2835_AUX_H__ + +struct device; + +int bcm2835aux_enable(struct device *dev, const char *property); +int bcm2835aux_disable(struct device *dev, const char *property); + +#endif