From patchwork Mon Oct 17 16:30:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 77769 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp476358qge; Mon, 17 Oct 2016 09:31:23 -0700 (PDT) X-Received: by 10.66.10.132 with SMTP id i4mr33070179pab.101.1476721881981; Mon, 17 Oct 2016 09:31:21 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id h62si31506681pfj.182.2016.10.17.09.31.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 09:31:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B4366E564; Mon, 17 Oct 2016 16:31:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x22a.google.com (mail-qt0-x22a.google.com [IPv6:2607:f8b0:400d:c0d::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 393586E561 for ; Mon, 17 Oct 2016 16:31:10 +0000 (UTC) Received: by mail-qt0-x22a.google.com with SMTP id q7so128630076qtq.1 for ; Mon, 17 Oct 2016 09:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U0mlTwELU1HszJgywKHohgfLYIYumlr7+rsH834+hY4=; b=hbi7DO2GTXNZJUg1sQmRgBwUSf+13zrdKVbz7IKNaXyonaYFb86UzDFxoPZy4BBmAV C7GLrmt1PvBebj1kyeQ9PGsLOAlvfXK/bu9Bwpnoqnl2ElhH3PWKHOHTsazsJucLS14H MV8kwpucyrc+bU/U0m2hJAWTw8yd2RvXzoa5CFZOL9ExQwNx/0ZvsNJGmQe2ZeOEYl+0 Sq90GPLM9kR8Cek37dm5LkuiEGwG1MeMdkrdBIo0Tby4pJwO0M7f1Fm3UYK3QoZOquG+ 7UlYCOeO0yh1DkQ/bs+Uzdp6ot/wbeDOoDxMlhsiClkck3H69emOoEiT8CVotXVcx4kM Q0Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U0mlTwELU1HszJgywKHohgfLYIYumlr7+rsH834+hY4=; b=Mn+jnNCn3gCiDwmZ23Wcud6YzO7UzLIWTOOVVKNzkPzyfZd94qgyZk1xMOMJCMzM7y vQ633cRDvgPyS31XNPec6zQAZvv58rpSY2xP+g4CHxYWoC9Kdl+xGU7dbk5Pwr9dlnkJ 53Bh23BmTcNT2erL9XNd/3SalHBwzqEwnJzEfbC+m0e8Ilu4zpndIhaV4gjCjHjgWS3o 0X32p3/C3RNBAxN5tIQO6LGUn0Vj0wocti/DRe1EAnbzKOrGMgiFFhEhZk/5ctxZNCFN OTbIsprcMFqipydEDKx4dwtT3xqmm09eHWKozpoRmCOY2ZPxXnEqK5P688cJ66r944IU xbUA== X-Gm-Message-State: AA6/9RmGtPG/J3k0JNQ34SAUyh1G24JGrKhq2iFrPss0OGpGXqeJ1Unl7uYsT7XP4mhMUJSQ X-Received: by 10.28.93.137 with SMTP id r131mr8484044wmb.2.1476721868942; Mon, 17 Oct 2016 09:31:08 -0700 (PDT) Received: from localhost.localdomain (static-46-238-241-125.awacom.net. [46.238.241.125]) by smtp.gmail.com with ESMTPSA id j1sm43945514wjl.21.2016.10.17.09.31.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 09:31:08 -0700 (PDT) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Rob Herring , Frank Rowand , Mark Rutland , Peter Ujfalusi , Russell King Subject: [PATCH 2/3] ARM: bus: da8xx-syscfg: new driver Date: Mon, 17 Oct 2016 18:30:49 +0200 Message-Id: <1476721850-454-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1476721850-454-1-git-send-email-bgolaszewski@baylibre.com> References: <1476721850-454-1-git-send-email-bgolaszewski@baylibre.com> Cc: linux-devicetree , LKML , linux-drm , Bartosz Golaszewski , Tomi Valkeinen , Jyri Sarha , arm-soc , Laurent Pinchart X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Create the driver for the da8xx System Configuration and implement support for writing to the three Master Priority registers. Signed-off-by: Bartosz Golaszewski --- .../devicetree/bindings/bus/ti,da850-syscfg.txt | 63 +++++++ drivers/bus/Kconfig | 8 + drivers/bus/Makefile | 2 + drivers/bus/da8xx-syscfg.c | 206 +++++++++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 Documentation/devicetree/bindings/bus/ti,da850-syscfg.txt create mode 100644 drivers/bus/da8xx-syscfg.c diff --git a/Documentation/devicetree/bindings/bus/ti,da850-syscfg.txt b/Documentation/devicetree/bindings/bus/ti,da850-syscfg.txt new file mode 100644 index 0000000..07e5c38 --- /dev/null +++ b/Documentation/devicetree/bindings/bus/ti,da850-syscfg.txt @@ -0,0 +1,63 @@ +* Device tree bindings for Texas Instruments da8xx system configuration driver + +The system configuration (SYSCFG) module is a system-level module containing +status and top level control logic required by the device. The system +configuration module consists of a set of memory-mapped status and control +registers, accessible by the CPU, supporting all of the following system +features, and miscellaneous functions and operations. + +Documentation: +OMAP-L138 (DA850) - http://www.ti.com/lit/ug/spruh82c/spruh82c.pdf + +Required properties: + +- compatible: "ti,da850-syscfg" + +Optional properties: + +The below properties are used to specify the priority of master peripherals. +They must be between 0-7 where 0 is the highest priority and 7 is the lowest. + +- ti,pri-arm-i: ARM_I port priority. + +- ti,pri-arm-d: ARM_D port priority. + +- ti,pri-upp: uPP port priority. + +- ti,pri-sata: SATA port priority. + +- ti,pri-pru0: PRU0 port priority. + +- ti,pri-pru1: PRU1 port priority. + +- ti,pri-edma30tc0: EDMA3_0_TC0 port priority. + +- ti,pri-edma30tc1: EDMA3_0_TC1 port priority. + +- ti,pri-edma31tc0: EDMA3_1_TC0 port priority. + +- ti,pri-vpif-dma-0: VPIF DMA0 port priority. + +- ti,pri-vpif-dma-1: VPIF DMA1 port priority. + +- ti,pri-emac: EMAC port priority. + +- ti,pri-usb0cfg: USB0 CFG port priority. + +- ti,pri-usb0cdma: USB0 CDMA port priority. + +- ti,pri-uhpi: HPI port priority. + +- ti,pri-usb1: USB1 port priority. + +- ti,pri-lcdc: LCDC port priority. + +If any of the above properties is absent, the default value will be used as +defined in the documentation. + +Example for da850-lcdk is shown below. + +mstpri { + compatible = "ti,da850-mstpri"; + ti,pri-lcdc = 0; +}; diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 5a2d47c..6276132 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -165,4 +165,12 @@ config VEXPRESS_CONFIG help Platform configuration infrastructure for the ARM Ltd. Versatile Express. + +config DA8XX_SYSCFG + bool "TI da8xx system configuration driver" + depends on ARCH_DAVINCI_DA8XX + help + Driver for Texas Instruments da8xx system configuration. Allows to + adjust various SoC configuration options. + endmenu diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index c6cfa6b..3cba66a 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -21,3 +21,5 @@ obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o obj-$(CONFIG_TEGRA_ACONNECT) += tegra-aconnect.o obj-$(CONFIG_UNIPHIER_SYSTEM_BUS) += uniphier-system-bus.o obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o + +obj-$(CONFIG_DA8XX_SYSCFG) += da8xx-syscfg.o diff --git a/drivers/bus/da8xx-syscfg.c b/drivers/bus/da8xx-syscfg.c new file mode 100644 index 0000000..8a2cb4f --- /dev/null +++ b/drivers/bus/da8xx-syscfg.c @@ -0,0 +1,206 @@ +/* + * TI da8xx System Configuration driver + * + * Copyright (C) 2016 BayLibre SAS + * + * Author: + * Bartosz Golaszewski + * + * 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 + +#define DA8XX_IO_PHYS 0x01c00000ul +#define DA8XX_SYSCFG0_BASE (DA8XX_IO_PHYS + 0x14000) + +#define DA8XX_MSTPRI0_REG 0x110 +#define DA8XX_MSTPRI1_REG 0x114 +#define DA8XX_MSTPRI2_REG 0x118 + +#define DA8XX_MSTPRI_MAX 7 + +struct da8xx_mstpri_descr { + const char *property; + int reg; + int shift; + int mask; +}; + +static const struct da8xx_mstpri_descr priorities[] = { + { + .property = "ti,pri-arm-i", + .reg = DA8XX_MSTPRI0_REG, + .shift = 0, + .mask = 0xfffffff0, + }, + { + .property = "ti,pri-arm-d", + .reg = DA8XX_MSTPRI0_REG, + .shift = 4, + .mask = 0xffffff0f, + }, + { + .property = "ti,pri-upp", + .reg = DA8XX_MSTPRI0_REG, + .shift = 16, + .mask = 0xfff0ffff, + }, + { + .property = "ti,pri-sata", + .reg = DA8XX_MSTPRI0_REG, + .shift = 20, + .mask = 0xff0fffff, + }, + { + .property = "ti,pri-pru0", + .reg = DA8XX_MSTPRI1_REG, + .shift = 0, + .mask = 0xfffffff0, + }, + { + .property = "ti,pri-pru1", + .reg = DA8XX_MSTPRI1_REG, + .shift = 4, + .mask = 0xffffff0f, + }, + { + .property = "ti,pri-edma30tc0", + .reg = DA8XX_MSTPRI1_REG, + .shift = 8, + .mask = 0xfffff0ff, + }, + { + .property = "ti,pri-edma30tc1", + .reg = DA8XX_MSTPRI1_REG, + .shift = 12, + .mask = 0xffff0fff, + }, + { + .property = "ti,pri-edma31tc0", + .reg = DA8XX_MSTPRI1_REG, + .shift = 16, + .mask = 0xfff0ffff, + }, + { + .property = "ti,pri-vpif-dma-0", + .reg = DA8XX_MSTPRI1_REG, + .shift = 24, + .mask = 0xf0ffffff, + }, + { + .property = "ti,pri-vpif-dma-1", + .reg = DA8XX_MSTPRI1_REG, + .shift = 28, + .mask = 0x0fffffff, + }, + { + .property = "ti,pri-emac", + .reg = DA8XX_MSTPRI2_REG, + .shift = 0, + .mask = 0xfffffff0, + }, + { + .property = "ti,pri-usb0cfg", + .reg = DA8XX_MSTPRI2_REG, + .shift = 8, + .mask = 0xfffff0ff, + }, + { + .property = "ti,pri-usb0cdma", + .reg = DA8XX_MSTPRI2_REG, + .shift = 12, + .mask = 0xffff0fff, + }, + { + .property = "ti,pri-uhpi", + .reg = DA8XX_MSTPRI2_REG, + .shift = 20, + .mask = 0xff0fffff, + }, + { + .property = "ti,pri-usb1", + .reg = DA8XX_MSTPRI2_REG, + .shift = 24, + .mask = 0xf0ffffff, + }, + { + .property = "ti,pri-lcdc", + .reg = DA8XX_MSTPRI2_REG, + .shift = 28, + .mask = 0x0fffffff, + }, +}; + +static void da8xx_syscfg_set_mstpri(void __iomem *syscfg0, struct device *dev) +{ + const struct da8xx_mstpri_descr *pri_descr; + struct device_node *node = dev->of_node; + void __iomem *mstpri; + u32 old_pri, new_pri; + int ret, i; + + for (i = 0; i < ARRAY_SIZE(priorities); i++) { + pri_descr = &priorities[i]; + + ret = of_property_read_u32(node, pri_descr->property, &new_pri); + if (ret) + continue; + + if (new_pri > DA8XX_MSTPRI_MAX) { + dev_warn(dev, + "omitting property '%s' - value too high\n", + pri_descr->property); + continue; + } + + mstpri = syscfg0 + pri_descr->reg; + old_pri = __raw_readl(mstpri); + old_pri &= pri_descr->mask; + new_pri <<= pri_descr->shift; + new_pri |= old_pri; + + __raw_writel(new_pri, mstpri); + } +} + +static int da8xx_syscfg_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + void __iomem *syscfg0; + + syscfg0 = ioremap(DA8XX_SYSCFG0_BASE, SZ_4K); + if (!syscfg0) { + dev_err(dev, "unable to map syscfg0\n"); + return -EIO; + } + + da8xx_syscfg_set_mstpri(syscfg0, dev); + + iounmap(syscfg0); + + return 0; +} + +static const struct of_device_id da8xx_syscfg_of_match[] = { + { .compatible = "ti,da850-syscfg", }, + { }, +}; + +static struct platform_driver da8xx_syscfg_driver = { + .probe = da8xx_syscfg_probe, + .driver = { + .name = "da8xx-syscfg", + .of_match_table = da8xx_syscfg_of_match, + }, +}; +module_platform_driver(da8xx_syscfg_driver); + +MODULE_AUTHOR("Bartosz Golaszewski "); +MODULE_DESCRIPTION("TI da8xx System Configuration driver"); +MODULE_LICENSE("GPL v2");