| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 6 Sep 2016 16:28:20 +0800
From: Yangbo Lu <yangbo.lu@....com>
To: <linux-mmc@...r.kernel.org>, <ulf.hansson@...aro.org>,
Scott Wood <oss@...error.net>, Arnd Bergmann <arnd@...db.de>
CC: <linuxppc-dev@...ts.ozlabs.org>, <devicetree@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, <linux-clk@...r.kernel.org>,
<linux-i2c@...r.kernel.org>, <iommu@...ts.linux-foundation.org>,
<netdev@...r.kernel.org>, Mark Rutland <mark.rutland@....com>,
Rob Herring <robh+dt@...nel.org>,
Russell King <linux@....linux.org.uk>,
Jochen Friedrich <jochen@...am.de>,
Joerg Roedel <joro@...tes.org>,
Claudiu Manoil <claudiu.manoil@...escale.com>,
"Bhupesh Sharma" <bhupesh.sharma@...escale.com>,
Qiang Zhao <qiang.zhao@....com>,
"Kumar Gala" <galak@...eaurora.org>,
Santosh Shilimkar <ssantosh@...nel.org>, <leoyang.li@....com>,
<xiaobo.xie@....com>, Yangbo Lu <yangbo.lu@....com>
Subject: [v11, 5/8] soc: fsl: add GUTS driver for QorIQ platforms
The global utilities block controls power management, I/O device
enabling, power-onreset(POR) configuration monitoring, alternate
function selection for multiplexed signals,and clock control.
This patch adds a driver to manage and access global utilities block.
Initially only reading SVR and registering soc device are supported.
Other guts accesses, such as reading RCW, should eventually be moved
into this driver as well.
Signed-off-by: Yangbo Lu <yangbo.lu@....com>
Signed-off-by: Scott Wood <oss@...error.net>
---
Changes for v4:
- Added this patch
Changes for v5:
- Modified copyright info
- Changed MODULE_LICENSE to GPL
- Changed EXPORT_SYMBOL_GPL to EXPORT_SYMBOL
- Made FSL_GUTS user-invisible
- Added a complete compatible list for GUTS
- Stored guts info in file-scope variable
- Added mfspr() getting SVR
- Redefined GUTS APIs
- Called fsl_guts_init rather than using platform driver
- Removed useless parentheses
- Removed useless 'extern' key words
Changes for v6:
- Made guts thread safe in fsl_guts_init
Changes for v7:
- Removed 'ifdef' for function declaration in guts.h
Changes for v8:
- Fixes lines longer than 80 characters checkpatch issue
- Added 'Acked-by: Scott Wood'
Changes for v9:
- None
Changes for v10:
- None
Changes for v11:
- Changed to platform driver
- Registered soc device
---
drivers/soc/Kconfig | 2 +-
drivers/soc/fsl/Kconfig | 20 ++
drivers/soc/fsl/Makefile | 1 +
drivers/soc/fsl/guts.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++
include/linux/fsl/guts.h | 127 ++++++++-----
5 files changed, 584 insertions(+), 49 deletions(-)
create mode 100644 drivers/soc/fsl/Kconfig
create mode 100644 drivers/soc/fsl/guts.c
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index fe42a2f..f31bceb 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -1,7 +1,7 @@
menu "SOC (System On Chip) specific Drivers"
source "drivers/soc/bcm/Kconfig"
-source "drivers/soc/fsl/qe/Kconfig"
+source "drivers/soc/fsl/Kconfig"
source "drivers/soc/mediatek/Kconfig"
source "drivers/soc/qcom/Kconfig"
source "drivers/soc/rockchip/Kconfig"
diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
new file mode 100644
index 0000000..439998d
--- /dev/null
+++ b/drivers/soc/fsl/Kconfig
@@ -0,0 +1,20 @@
+#
+# Freescale SOC drivers
+#
+
+source "drivers/soc/fsl/qe/Kconfig"
+
+config FSL_GUTS
+ bool "Freescale QorIQ GUTS driver"
+ select SOC_BUS
+ select GLOB
+ help
+ The global utilities block controls power management, I/O device
+ enabling, power-onreset(POR) configuration monitoring, alternate
+ function selection for multiplexed signals,and clock control.
+ This driver is to manage and access global utilities block.
+ Initially only reading SVR and registering soc device are supported.
+ Other guts accesses, such as reading RCW, should eventually be moved
+ into this driver as well.
+
+ If you want GUTS driver support, you should say Y here.
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
index 203307f..02afb7f 100644
--- a/drivers/soc/fsl/Makefile
+++ b/drivers/soc/fsl/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_QUICC_ENGINE) += qe/
obj-$(CONFIG_CPM) += qe/
+obj-$(CONFIG_FSL_GUTS) += guts.o
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
new file mode 100644
index 0000000..93c39315
--- /dev/null
+++ b/drivers/soc/fsl/guts.c
@@ -0,0 +1,483 @@
+/*
+ * Freescale QorIQ Platforms GUTS Driver
+ *
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * 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 <linux/io.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/of_fdt.h>
+#include <linux/sys_soc.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/glob.h>
+#include <linux/fsl/guts.h>
+#include <linux/fsl/svr.h>
+
+struct guts {
+ struct ccsr_guts __iomem *regs;
+ bool little_endian;
+};
+
+static struct guts *guts;
+static struct soc_device_attribute *soc_dev_attr;
+static struct soc_device *soc_dev;
+
+
+/* SoC attribute definition for QorIQ platform */
+static const struct soc_device_attribute qoriq_soc[] = {
+#ifdef CONFIG_PPC
+ /*
+ * Power Architecture-based SoCs T Series
+ */
+
+ /* SoC: T1024/T1014/T1023/T1013 Rev: 1.0 */
+ { .soc_id = "svr:0x85400010,name:T1024,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85480010,name:T1024E,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85440010,name:T1014,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x854C0010,name:T1014E,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85410010,name:T1023,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85490010,name:T1023E,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85450010,name:T1013,die:T1024",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x854D0010,name:T1013E,die:T1024",
+ .revision = "1.0",
+ },
+ /* SoC: T1040/T1020/T1042/T1022 Rev: 1.0/1.1 */
+ { .soc_id = "svr:0x85200010,name:T1040,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85280010,name:T1040E,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85210010,name:T1020,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85290010,name:T1020E,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85200210,name:T1042,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85280210,name:T1042E,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85210210,name:T1022,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85290210,name:T1022E,die:T1040",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85200011,name:T1040,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85280011,name:T1040E,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85210011,name:T1020,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85290011,name:T1020E,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85200211,name:T1042,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85280211,name:T1042E,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85210211,name:T1022,die:T1040",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85290211,name:T1022E,die:T1040",
+ .revision = "1.1",
+ },
+ /* SoC: T2080/T2081 Rev: 1.0/1.1 */
+ { .soc_id = "svr:0x85300010,name:T2080,die:T2080",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85380010,name:T2080E,die:T2080",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85310010,name:T2081,die:T2080",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85390010,name:T2081E,die:T2080",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x85300011,name:T2080,die:T2080",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85380011,name:T2080E,die:T2080",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85310011,name:T2081,die:T2080",
+ .revision = "1.1",
+ },
+ { .soc_id = "svr:0x85390011,name:T2081E,die:T2080",
+ .revision = "1.1",
+ },
+ /* SoC: T4240/T4160/T4080 Rev: 1.0/2.0 */
+ { .soc_id = "svr:0x82400010,name:T4240,die:T4240",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x82480010,name:T4240E,die:T4240",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x82410010,name:T4160,die:T4240",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x82490010,name:T4160E,die:T4240",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x82400020,name:T4240,die:T4240",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x82480020,name:T4240E,die:T4240",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x82410020,name:T4160,die:T4240",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x82490020,name:T4160E,die:T4240",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x82410220,name:T4080,die:T4240",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x82490220,name:T4080E,die:T4240",
+ .revision = "2.0",
+ },
+#endif /* CONFIG_PPC */
+#if defined(CONFIG_ARCH_MXC) || defined(CONFIG_ARCH_LAYERSCAPE)
+ /*
+ * ARM-based SoCs LS Series
+ */
+
+ /* SoC: LS1021A/LS1020A/LS1022A Rev: 1.0/2.0 */
+ { .soc_id = "svr:0x87001110,name:LS1021A,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87081110,name:LS1021AE,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87001010,name:LS1020A,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87081010,name:LS1020AE,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87001210,name:LS1022A,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87081210,name:LS1022AE,die:LS1021A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87001120,name:LS1021A,die:LS1021A",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x87081120,name:LS1021AE,die:LS1021A",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x87001020,name:LS1020A,die:LS1021A",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x87081020,name:LS1020AE,die:LS1021A",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x87001220,name:LS1022A,die:LS1021A",
+ .revision = "2.0",
+ },
+ { .soc_id = "svr:0x87081220,name:LS1022AE,die:LS1021A",
+ .revision = "2.0",
+ },
+ /* SoC: LS1046A/LS1026A Rev: 1.0 */
+ { .soc_id = "svr:0x87070110,name:LS1046A,die:LS1046A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87070010,name:LS1046AE,die:LS1046A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87070910,name:LS1026A,die:LS1046A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87070810,name:LS1026AE,die:LS1046A",
+ .revision = "1.0",
+ },
+ /* SoC: LS1043A/LS1023A Rev: 1.0 Package: 21*21 */
+ { .soc_id = "svr:0x87920110,name:LS1043A,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920010,name:LS1043AE,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920910,name:LS1023A,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920810,name:LS1023AE,die:LS1043A",
+ .revision = "1.0",
+ },
+ /* SoC: LS1043A/LS1023A Rev: 1.0 Package: 23*23 */
+ { .soc_id = "svr:0x87920310,name:LS1043A,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920210,name:LS1043AE,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920B10,name:LS1023A,die:LS1043A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87920A10,name:LS1023AE,die:LS1043A",
+ .revision = "1.0",
+ },
+ /* SoC: LS1012A Rev: 1.0 */
+ { .soc_id = "svr:0x87040110,name:LS1012A,die:LS1012A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87040010,name:LS1012AE,die:LS1012A",
+ .revision = "1.0",
+ },
+ /* SoC: LS2088A/LS2048A/LS2084A/LS2044A Rev: 1.0 */
+ { .soc_id = "svr:0x87090110,name:LS2088A,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87090010,name:LS2088AE,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87092110,name:LS2048A,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87092010,name:LS2048AE,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87091110,name:LS2084A,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87091010,name:LS2084AE,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87093110,name:LS2044A,die:LS2088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87093010,name:LS2044AE,die:LS2088A",
+ .revision = "1.0",
+ },
+ /* SoC: LS2080A/LS2040A Rev: 1.0 */
+ { .soc_id = "svr:0x87011010,name:LS2080AE,die:LS2080A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87013010,name:LS2040AE,die:LS2080A",
+ .revision = "1.0",
+ },
+ /* SoC: LS2085A Rev: 1.0 */
+ { .soc_id = "svr:0x87010110,name:LS2085A,die:LS2085A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87010010,name:LS2085AE,die:LS2085A",
+ .revision = "1.0",
+ },
+ /* SoC: LS1088A/LS1048A/LS1084A/LS1044A Rev: 1.0 */
+ { .soc_id = "svr:0x87030110,name:LS1088A,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87030010,name:LS1088AE,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87032110,name:LS1048A,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87032010,name:LS1048AE,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87030310,name:LS1084A,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87030210,name:LS1084AE,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87032310,name:LS1044A,die:LS1088A",
+ .revision = "1.0",
+ },
+ { .soc_id = "svr:0x87032210,name:LS1044AE,die:LS1088A",
+ .revision = "1.0",
+ },
+#endif /* CONFIG_ARCH_MXC || CONFIG_ARCH_LAYERSCAPE */
+ { },
+};
+
+static const struct soc_device_attribute *fsl_soc_device_match(
+ unsigned int svr, const struct soc_device_attribute *matches)
+{
+ char svr_match[50];
+ int n;
+
+ n = sprintf(svr_match, "*%08x*", svr);
+
+ do {
+ if (!matches->soc_id)
+ return NULL;
+ if (glob_match(svr_match, matches->soc_id))
+ break;
+ } while (matches++);
+
+ return matches;
+}
+
+unsigned int fsl_guts_get_svr(void)
+{
+ unsigned int svr = 0;
+
+ if (!guts || !guts->regs)
+ return svr;
+
+ if (guts->little_endian)
+ svr = ioread32(&guts->regs->svr);
+ else
+ svr = ioread32be(&guts->regs->svr);
+
+ return svr;
+}
+EXPORT_SYMBOL(fsl_guts_get_svr);
+
+static int fsl_guts_probe(struct platform_device *pdev)
+{
+ struct device_node *np;
+ const struct soc_device_attribute *fsl_soc;
+ const char *machine;
+ unsigned int svr;
+ int ret = 0;
+
+ np = pdev->dev.of_node;
+
+ /* Initialize guts */
+ guts = kzalloc(sizeof(*guts), GFP_KERNEL);
+ if (!guts)
+ return -ENOMEM;
+
+ guts->little_endian = of_property_read_bool(np, "little-endian");
+
+ guts->regs = of_iomap(np, 0);
+ if (!guts->regs) {
+ ret = -ENOMEM;
+ goto out_free;
+ }
+
+ /* Register soc device */
+ soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+ if (!soc_dev_attr) {
+ ret = -ENOMEM;
+ goto out_unmap;
+ }
+
+ machine = of_flat_dt_get_machine_name();
+ if (machine)
+ soc_dev_attr->machine = kasprintf(GFP_KERNEL, "%s", machine);
+
+ soc_dev_attr->family = kasprintf(GFP_KERNEL, "QorIQ");
+
+ svr = fsl_guts_get_svr();
+ fsl_soc = fsl_soc_device_match(svr, qoriq_soc);
+ if (fsl_soc) {
+ soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%s",
+ fsl_soc->soc_id);
+ soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%s",
+ fsl_soc->revision);
+ } else {
+ soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "0x%08x", svr);
+ soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d",
+ SVR_MAJ(svr), SVR_MIN(svr));
+ }
+
+ soc_dev = soc_device_register(soc_dev_attr);
+ if (IS_ERR(soc_dev)) {
+ ret = -ENODEV;
+ goto out;
+ } else {
+ pr_info("Detected: %s\n", soc_dev_attr->machine);
+ pr_info("Detected SoC family: %s\n", soc_dev_attr->family);
+ pr_info("Detected SoC ID: %s, revision: %s\n",
+ soc_dev_attr->soc_id, soc_dev_attr->revision);
+ }
+ return 0;
+out:
+ kfree(soc_dev_attr->machine);
+ kfree(soc_dev_attr->family);
+ kfree(soc_dev_attr->soc_id);
+ kfree(soc_dev_attr->revision);
+ kfree(soc_dev_attr);
+out_unmap:
+ iounmap(guts->regs);
+out_free:
+ kfree(guts);
+ return ret;
+}
+
+static int fsl_guts_remove(struct platform_device *dev)
+{
+ kfree(soc_dev_attr->machine);
+ kfree(soc_dev_attr->family);
+ kfree(soc_dev_attr->soc_id);
+ kfree(soc_dev_attr->revision);
+ kfree(soc_dev_attr);
+ soc_device_unregister(soc_dev);
+ iounmap(guts->regs);
+ kfree(guts);
+ return 0;
+}
+
+/*
+ * Table for matching compatible strings, for device tree
+ * guts node, for Freescale QorIQ SOCs.
+ */
+static const struct of_device_id fsl_guts_of_match[] = {
+ { .compatible = "fsl,qoriq-device-config-1.0", },
+ { .compatible = "fsl,qoriq-device-config-2.0", },
+ { .compatible = "fsl,p1010-guts", },
+ { .compatible = "fsl,p1020-guts", },
+ { .compatible = "fsl,p1021-guts", },
+ { .compatible = "fsl,p1022-guts", },
+ { .compatible = "fsl,p1023-guts", },
+ { .compatible = "fsl,p2020-guts", },
+ { .compatible = "fsl,bsc9131-guts", },
+ { .compatible = "fsl,bsc9132-guts", },
+ { .compatible = "fsl,mpc8536-guts", },
+ { .compatible = "fsl,mpc8544-guts", },
+ { .compatible = "fsl,mpc8548-guts", },
+ { .compatible = "fsl,mpc8568-guts", },
+ { .compatible = "fsl,mpc8569-guts", },
+ { .compatible = "fsl,mpc8572-guts", },
+ { .compatible = "fsl,ls1021a-dcfg", },
+ { .compatible = "fsl,ls1043a-dcfg", },
+ { .compatible = "fsl,ls2080a-dcfg", },
+ {}
+};
+
+static struct platform_driver fsl_guts_driver = {
+ .driver = {
+ .name = "fsl-guts",
+ .of_match_table = fsl_guts_of_match,
+ },
+ .probe = fsl_guts_probe,
+ .remove = fsl_guts_remove,
+};
+
+module_platform_driver(fsl_guts_driver);
diff --git a/include/linux/fsl/guts.h b/include/linux/fsl/guts.h
index 649e917..c5e24cf 100644
--- a/include/linux/fsl/guts.h
+++ b/include/linux/fsl/guts.h
@@ -29,83 +29,114 @@
* #ifdefs.
*/
struct ccsr_guts {
- __be32 porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */
- __be32 porbmsr; /* 0x.0004 - POR Boot Mode Status Register */
- __be32 porimpscr; /* 0x.0008 - POR I/O Impedance Status and Control Register */
- __be32 pordevsr; /* 0x.000c - POR I/O Device Status Register */
- __be32 pordbgmsr; /* 0x.0010 - POR Debug Mode Status Register */
- __be32 pordevsr2; /* 0x.0014 - POR device status register 2 */
+ u32 porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */
+ u32 porbmsr; /* 0x.0004 - POR Boot Mode Status Register */
+ u32 porimpscr; /* 0x.0008 - POR I/O Impedance Status and
+ * Control Register
+ */
+ u32 pordevsr; /* 0x.000c - POR I/O Device Status Register */
+ u32 pordbgmsr; /* 0x.0010 - POR Debug Mode Status Register */
+ u32 pordevsr2; /* 0x.0014 - POR device status register 2 */
u8 res018[0x20 - 0x18];
- __be32 porcir; /* 0x.0020 - POR Configuration Information Register */
+ u32 porcir; /* 0x.0020 - POR Configuration Information
+ * Register
+ */
u8 res024[0x30 - 0x24];
- __be32 gpiocr; /* 0x.0030 - GPIO Control Register */
+ u32 gpiocr; /* 0x.0030 - GPIO Control Register */
u8 res034[0x40 - 0x34];
- __be32 gpoutdr; /* 0x.0040 - General-Purpose Output Data Register */
+ u32 gpoutdr; /* 0x.0040 - General-Purpose Output Data
+ * Register
+ */
u8 res044[0x50 - 0x44];
- __be32 gpindr; /* 0x.0050 - General-Purpose Input Data Register */
+ u32 gpindr; /* 0x.0050 - General-Purpose Input Data
+ * Register
+ */
u8 res054[0x60 - 0x54];
- __be32 pmuxcr; /* 0x.0060 - Alternate Function Signal Multiplex Control */
- __be32 pmuxcr2; /* 0x.0064 - Alternate function signal multiplex control 2 */
- __be32 dmuxcr; /* 0x.0068 - DMA Mux Control Register */
+ u32 pmuxcr; /* 0x.0060 - Alternate Function Signal
+ * Multiplex Control
+ */
+ u32 pmuxcr2; /* 0x.0064 - Alternate function signal
+ * multiplex control 2
+ */
+ u32 dmuxcr; /* 0x.0068 - DMA Mux Control Register */
u8 res06c[0x70 - 0x6c];
- __be32 devdisr; /* 0x.0070 - Device Disable Control */
+ u32 devdisr; /* 0x.0070 - Device Disable Control */
#define CCSR_GUTS_DEVDISR_TB1 0x00001000
#define CCSR_GUTS_DEVDISR_TB0 0x00004000
- __be32 devdisr2; /* 0x.0074 - Device Disable Control 2 */
+ u32 devdisr2; /* 0x.0074 - Device Disable Control 2 */
u8 res078[0x7c - 0x78];
- __be32 pmjcr; /* 0x.007c - 4 Power Management Jog Control Register */
- __be32 powmgtcsr; /* 0x.0080 - Power Management Status and Control Register */
- __be32 pmrccr; /* 0x.0084 - Power Management Reset Counter Configuration Register */
- __be32 pmpdccr; /* 0x.0088 - Power Management Power Down Counter Configuration Register */
- __be32 pmcdr; /* 0x.008c - 4Power management clock disable register */
- __be32 mcpsumr; /* 0x.0090 - Machine Check Summary Register */
- __be32 rstrscr; /* 0x.0094 - Reset Request Status and Control Register */
- __be32 ectrstcr; /* 0x.0098 - Exception reset control register */
- __be32 autorstsr; /* 0x.009c - Automatic reset status register */
- __be32 pvr; /* 0x.00a0 - Processor Version Register */
- __be32 svr; /* 0x.00a4 - System Version Register */
+ u32 pmjcr; /* 0x.007c - 4 Power Management Jog Control
+ * Register
+ */
+ u32 powmgtcsr; /* 0x.0080 - Power Management Status and
+ * Control Register
+ */
+ u32 pmrccr; /* 0x.0084 - Power Management Reset Counter
+ * Configuration Register
+ */
+ u32 pmpdccr; /* 0x.0088 - Power Management Power Down Counter
+ * Configuration Register
+ */
+ u32 pmcdr; /* 0x.008c - 4Power management clock disable
+ * register
+ */
+ u32 mcpsumr; /* 0x.0090 - Machine Check Summary Register */
+ u32 rstrscr; /* 0x.0094 - Reset Request Status and
+ * Control Register
+ */
+ u32 ectrstcr; /* 0x.0098 - Exception reset control register */
+ u32 autorstsr; /* 0x.009c - Automatic reset status register */
+ u32 pvr; /* 0x.00a0 - Processor Version Register */
+ u32 svr; /* 0x.00a4 - System Version Register */
u8 res0a8[0xb0 - 0xa8];
- __be32 rstcr; /* 0x.00b0 - Reset Control Register */
+ u32 rstcr; /* 0x.00b0 - Reset Control Register */
u8 res0b4[0xc0 - 0xb4];
- __be32 iovselsr; /* 0x.00c0 - I/O voltage select status register
+ u32 iovselsr; /* 0x.00c0 - I/O voltage select status register
Called 'elbcvselcr' on 86xx SOCs */
u8 res0c4[0x100 - 0xc4];
- __be32 rcwsr[16]; /* 0x.0100 - Reset Control Word Status registers
+ u32 rcwsr[16]; /* 0x.0100 - Reset Control Word Status registers
There are 16 registers */
u8 res140[0x224 - 0x140];
- __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */
- __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */
+ u32 iodelay1; /* 0x.0224 - IO delay control register 1 */
+ u32 iodelay2; /* 0x.0228 - IO delay control register 2 */
u8 res22c[0x604 - 0x22c];
- __be32 pamubypenr; /* 0x.604 - PAMU bypass enable register */
+ u32 pamubypenr; /* 0x.604 - PAMU bypass enable register */
u8 res608[0x800 - 0x608];
- __be32 clkdvdr; /* 0x.0800 - Clock Divide Register */
+ u32 clkdvdr; /* 0x.0800 - Clock Divide Register */
u8 res804[0x900 - 0x804];
- __be32 ircr; /* 0x.0900 - Infrared Control Register */
+ u32 ircr; /* 0x.0900 - Infrared Control Register */
u8 res904[0x908 - 0x904];
- __be32 dmacr; /* 0x.0908 - DMA Control Register */
+ u32 dmacr; /* 0x.0908 - DMA Control Register */
u8 res90c[0x914 - 0x90c];
- __be32 elbccr; /* 0x.0914 - eLBC Control Register */
+ u32 elbccr; /* 0x.0914 - eLBC Control Register */
u8 res918[0xb20 - 0x918];
- __be32 ddr1clkdr; /* 0x.0b20 - DDR1 Clock Disable Register */
- __be32 ddr2clkdr; /* 0x.0b24 - DDR2 Clock Disable Register */
- __be32 ddrclkdr; /* 0x.0b28 - DDR Clock Disable Register */
+ u32 ddr1clkdr; /* 0x.0b20 - DDR1 Clock Disable Register */
+ u32 ddr2clkdr; /* 0x.0b24 - DDR2 Clock Disable Register */
+ u32 ddrclkdr; /* 0x.0b28 - DDR Clock Disable Register */
u8 resb2c[0xe00 - 0xb2c];
- __be32 clkocr; /* 0x.0e00 - Clock Out Select Register */
+ u32 clkocr; /* 0x.0e00 - Clock Out Select Register */
u8 rese04[0xe10 - 0xe04];
- __be32 ddrdllcr; /* 0x.0e10 - DDR DLL Control Register */
+ u32 ddrdllcr; /* 0x.0e10 - DDR DLL Control Register */
u8 rese14[0xe20 - 0xe14];
- __be32 lbcdllcr; /* 0x.0e20 - LBC DLL Control Register */
- __be32 cpfor; /* 0x.0e24 - L2 charge pump fuse override register */
+ u32 lbcdllcr; /* 0x.0e20 - LBC DLL Control Register */
+ u32 cpfor; /* 0x.0e24 - L2 charge pump fuse override
+ * register
+ */
u8 rese28[0xf04 - 0xe28];
- __be32 srds1cr0; /* 0x.0f04 - SerDes1 Control Register 0 */
- __be32 srds1cr1; /* 0x.0f08 - SerDes1 Control Register 0 */
+ u32 srds1cr0; /* 0x.0f04 - SerDes1 Control Register 0 */
+ u32 srds1cr1; /* 0x.0f08 - SerDes1 Control Register 0 */
u8 resf0c[0xf2c - 0xf0c];
- __be32 itcr; /* 0x.0f2c - Internal transaction control register */
+ u32 itcr; /* 0x.0f2c - Internal transaction control
+ * register
+ */
u8 resf30[0xf40 - 0xf30];
- __be32 srds2cr0; /* 0x.0f40 - SerDes2 Control Register 0 */
- __be32 srds2cr1; /* 0x.0f44 - SerDes2 Control Register 0 */
+ u32 srds2cr0; /* 0x.0f40 - SerDes2 Control Register 0 */
+ u32 srds2cr1; /* 0x.0f44 - SerDes2 Control Register 0 */
} __attribute__ ((packed));
+#ifdef CONFIG_FSL_GUTS
+unsigned int fsl_guts_get_svr(void);
+#endif
/* Alternate function signal multiplex control */
#define MPC85xx_PMUXCR_QE(x) (0x8000 >> (x))
--
2.1.0.27.g96db324
Powered by blists - more mailing lists