Skip to contentSkip to conversation

MPP routines and definitions for MV78XX0 arch

PATCH In review Sebastien Requiem 2 participants 2 messages Feb 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MPP routines and definitions for MV78XX0 arch

Hi everyone,

I have recently created the routines to configure the MPP lines on specific plateform for the architecture MV78XX0.

Patch description :
============
This patch is composed of two new files :
- mpp.c which is mainly inspired by the same file as in mach-kirkwood
- mpp.h that is written from the documentation provided by Marvell

http://www.marvell.com/products/processors/embedded/discovery_innovation/HW_MV78100_OpenSource.pdf

moreover, due to some implementation problem, I have defined some MPPX_UNUSED that offer the posibility to developers to SET MPP to some unused value (such as Buffalo WXL)

Note: This patch doesn't support MV78200 yet (only 78100 MPP lines have been written)
=============

I would very much appreciate if you could review the patch and give feedback/comments.

The patch validates checkpatch.pl script

regards,

===== PATCH =====

  arch/arm/mach-mv78xx0/mpp.c |   96 ++++++++++++
  arch/arm/mach-mv78xx0/mpp.h |  347 
+++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 443 insertions(+), 0 deletions(-)

create mode 100644 arch/arm/mach-mv78xx0/mpp.c
create mode 100644 arch/arm/mach-mv78xx0/mpp.h

arch/arm/mach-mv78xx0/mpp.c new file +96 -0
new file mode 100644
index 0000000..5c90197
@@ -0,0 +1,96 @@
+/*
+ * arch/arm/mach-mv78x00/mpp.c
+ *
+ * MPP functions for Marvell MV78x00 SoCs
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mbus.h>
+#include <linux/io.h>
+#include <asm/gpio.h>
+#include <mach/hardware.h>
+#include "common.h"
+#include "mpp.h"
+
+static unsigned int __init mv78xx0_variant(void)
+{
+    u32 dev, rev;
+
+    mv78xx0_pcie_id(&dev, &rev);
+
+    if (dev == MV78100_DEV_ID && rev >= MV78100_REV_A0)
+        return MPP_78100_A0_MASK;
+
+    printk(KERN_ERR "MPP setup: unknown mv78x00 variant "
+            "(dev %#x rev %#x)\n", dev, rev);
+    return 0;
+}
+
+#define MPP_CTRL(i)    (DEV_BUS_VIRT_BASE + (i) * 4)
+#define MPP_NR_REGS    (1 + MPP_MAX/8)
+
+void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
+{
+    u32 mpp_ctrl[MPP_NR_REGS];
+    unsigned int variant_mask;
+    int i;
+
+    variant_mask = mv78xx0_variant();
+    if (!variant_mask)
+        return;
+
+    /* Initialize gpiolib. */
+    orion_gpio_init();
+
+    printk(KERN_DEBUG "initial MPP regs:");
+    for (i = 0; i < MPP_NR_REGS; i++) {
+        mpp_ctrl[i] = readl(MPP_CTRL(i));
+        printk(" %08x", mpp_ctrl[i]);
+    }
+    printk("\n");
+
+    while (*mpp_list) {
+        unsigned int num = MPP_NUM(*mpp_list);
+        unsigned int sel = MPP_SEL(*mpp_list);
+        int shift, gpio_mode;
+
+        if (num > MPP_MAX) {
+            printk(KERN_ERR "mv78x00_mpp_conf: invalid MPP "
+                    "number (%u)\n", num);
+            continue;
+        }
+        if (!(*mpp_list & variant_mask)) {
+            printk(KERN_WARNING
+                   "mv78x100_mpp_conf: requested MPP%u config "
+                   "unavailable on this hardware\n", num);
+            continue;
+        }
+
+        shift = (num & 7) << 2;
+        mpp_ctrl[num / 8] &= ~(0xf << shift);
+        mpp_ctrl[num / 8] |= sel << shift;
+
+        gpio_mode = 0;
+        if (*mpp_list & MPP_INPUT_MASK)
+            gpio_mode |= GPIO_INPUT_OK;
+        if (*mpp_list & MPP_OUTPUT_MASK)
+            gpio_mode |= GPIO_OUTPUT_OK;
+        if (sel != 0)
+            gpio_mode = 0;
+        orion_gpio_set_valid(num, gpio_mode);
+
+        mpp_list++;
+    }
+
+    printk(KERN_DEBUG "  final MPP regs:");
+    for (i = 0; i < MPP_NR_REGS; i++) {
+        writel(mpp_ctrl[i], MPP_CTRL(i));
+        printk(" %08x", mpp_ctrl[i]);
+    }
+    printk("\n");
+}
arch/arm/mach-mv78xx0/mpp.h new file +347 -0

347 lines not on this page · raw message

Signature · 7 lines
1.5.6.5


Signed-off-by: Sebastien Requiem <[email protected]>


====== PATCH ======
#1 lore raw
Quoted 22 lines · Sebastien Requiem

Hi everyone,

I have recently created the routines to configure the MPP lines on specific plateform for the architecture MV78XX0.

Patch description :
============
This patch is composed of two new files :
- mpp.c which is mainly inspired by the same file as in mach-kirkwood
- mpp.h that is written from the documentation provided by Marvell

http://www.marvell.com/products/processors/embedded/discovery_innovation/HW_MV78100_OpenSource.pdf

moreover, due to some implementation problem, I have defined some MPPX_UNUSED that offer the posibility to developers to SET MPP to some unused value (such as Buffalo WXL)

Quoted 7 lines

Note: This patch doesn't support MV78200 yet (only 78100 MPP lines have been written)
=============

I would very much appreciate if you could review the patch and give feedback/comments.

You should put the Signed-off-by tag along with your patch description, not after the patch.

The coding style requires hard tabs for code indentation, and those must be 8 space width. More details in Documentation/CodingStyle.

You forgot to include the change to Makefile for the new file.

I've fixed those up and committed the patch to the orion git tree.

Nicolas