Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f427a1 authored by Andrew Lunn's avatar Andrew Lunn Committed by Nicolas Pitre
Browse files

ARM: orion: Refactor the MPP code common in the orion platform 



mv78xx0 and kirkwood use identical mpp code.

It should also be possible to rewrite the orion5x mpp to use this
platform code.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 44350061

arch/arm/mach-kirkwood/mpp.c

+3 −55
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/io.h>

#include <asm/gpio.h>

#include <mach/hardware.h>

#include <plat/mpp.h>

#include "common.h"

#include "mpp.h"
@@ -36,61 +37,8 @@ static unsigned int __init kirkwood_variant(void) 
	return 0;

}



#define MPP_CTRL(i)	(DEV_BUS_VIRT_BASE + (i) * 4)

#define MPP_NR_REGS	(1 + MPP_MAX/8)



void __init kirkwood_mpp_conf(unsigned int *mpp_list)

{

	u32 mpp_ctrl[MPP_NR_REGS];

	unsigned int variant_mask;

	int i;



	variant_mask = kirkwood_variant();

	if (!variant_mask)

		return;



	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");



	for ( ; *mpp_list; 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 "kirkwood_mpp_conf: invalid MPP "

					"number (%u)\n", num);

			continue;

		}

		if (!(*mpp_list & variant_mask)) {

			printk(KERN_WARNING

			       "kirkwood_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);

	}



	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");

	orion_mpp_conf(mpp_list, kirkwood_variant(),

		       MPP_MAX, DEV_BUS_VIRT_BASE);

}

arch/arm/mach-kirkwood/mpp.h

+0 −6
Original line number Diff line number Diff line
@@ -22,14 +22,8 @@ 
	/* available on F6281 */	((!!(_F6281)) << 17) | \

	/* available on F6282 */	((!!(_F6282)) << 18))



#define MPP_NUM(x)	((x) & 0xff)

#define MPP_SEL(x)	(((x) >> 8) & 0xf)



				/*   num sel  i  o  6180 6190 6192 6281 6282 */



#define MPP_INPUT_MASK		MPP(  0, 0x0, 1, 0, 0,   0,   0,   0,   0 )

#define MPP_OUTPUT_MASK		MPP(  0, 0x0, 0, 1, 0,   0,   0,   0,   0 )



#define MPP_F6180_MASK		MPP(  0, 0x0, 0, 0, 1,   0,   0,   0,   0 )

#define MPP_F6190_MASK		MPP(  0, 0x0, 0, 0, 0,   1,   0,   0,   0 )

#define MPP_F6192_MASK		MPP(  0, 0x0, 0, 0, 0,   0,   1,   0,   0 )

arch/arm/mach-mv78xx0/mpp.c

+3 −55
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/init.h>

#include <linux/mbus.h>

#include <linux/io.h>

#include <plat/mpp.h>

#include <asm/gpio.h>

#include <mach/hardware.h>

#include "common.h"
@@ -31,61 +32,8 @@ static unsigned int __init mv78xx0_variant(void) 
	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;



	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");



	for ( ; *mpp_list; 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 "mv78xx0_mpp_conf: invalid MPP "

					"number (%u)\n", num);

			continue;

		}

		if (!(*mpp_list & variant_mask)) {

			printk(KERN_WARNING

					"mv78xx0_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);

	}



	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");

	orion_mpp_conf(mpp_list, mv78xx0_variant(),

		       MPP_MAX, DEV_BUS_VIRT_BASE);

}

arch/arm/mach-mv78xx0/mpp.h

+0 −6
Original line number Diff line number Diff line
@@ -19,14 +19,8 @@ 
    /* may be output signal */    ((!!(_out)) << 13) | \

    /* available on A0 */    ((!!(_78100_A0)) << 14))



#define MPP_NUM(x)    ((x) & 0xff)

#define MPP_SEL(x)    (((x) >> 8) & 0xf)



                /*   num sel  i  o  78100_A0  */



#define MPP_INPUT_MASK        MPP(0, 0x0, 1, 0, 0)

#define MPP_OUTPUT_MASK        MPP(0, 0x0, 0, 1, 0)



#define MPP_78100_A0_MASK    MPP(0, 0x0, 0, 0, 1)



#define MPP0_GPIO        MPP(0, 0x0, 1, 1, 1)

arch/arm/plat-orion/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y	:= irq.o pcie.o time.o common.o

obj-y	:= irq.o pcie.o time.o common.o mpp.o

obj-m	:=

obj-n	:=

obj-	:=