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

Commit 13bb340d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-soc-core' into renesas-sh7372 

* renesas-soc-core:
  ARM: shmobile: add common DMAEngine definitions
  ARM: shmobile: add common extra gpio functions
parents 1645b767 5ca1d44f

arch/arm/mach-shmobile/include/mach/dma-register.h

0 → 100644
+84 −0
Original line number Original line Diff line number Diff line 
/*

 * SH-ARM CPU-specific DMA definitions, used by both DMA drivers

 *

 * Copyright (C) 2012 Renesas Solutions Corp

 *

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * Based on arch/sh/include/cpu-sh4/cpu/dma-register.h

 * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>

 *

 * 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.

 */



#ifndef DMA_REGISTER_H

#define DMA_REGISTER_H



/*

 *		Direct Memory Access Controller

 */



/* Transmit sizes and respective CHCR register values */

enum {

	XMIT_SZ_8BIT		= 0,

	XMIT_SZ_16BIT		= 1,

	XMIT_SZ_32BIT		= 2,

	XMIT_SZ_64BIT		= 7,

	XMIT_SZ_128BIT		= 3,

	XMIT_SZ_256BIT		= 4,

	XMIT_SZ_512BIT		= 5,

};



/* log2(size / 8) - used to calculate number of transfers */

static const unsigned int dma_ts_shift[] = {

	[XMIT_SZ_8BIT]		= 0,

	[XMIT_SZ_16BIT]		= 1,

	[XMIT_SZ_32BIT]		= 2,

	[XMIT_SZ_64BIT]		= 3,

	[XMIT_SZ_128BIT]	= 4,

	[XMIT_SZ_256BIT]	= 5,

	[XMIT_SZ_512BIT]	= 6,

};



#define TS_LOW_BIT	0x3 /* --xx */

#define TS_HI_BIT	0xc /* xx-- */



#define TS_LOW_SHIFT	(3)

#define TS_HI_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */



#define TS_INDEX2VAL(i) \

	((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\

	 (((i) & TS_HI_BIT)  << TS_HI_SHIFT))



#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz)))

#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz)))





/*

 *		USB High-Speed DMAC

 */

/* Transmit sizes and respective CHCR register values */

enum {

	USBTS_XMIT_SZ_8BYTE		= 0,

	USBTS_XMIT_SZ_16BYTE		= 1,

	USBTS_XMIT_SZ_32BYTE		= 2,

};



/* log2(size / 8) - used to calculate number of transfers */

static const unsigned int dma_usbts_shift[] = {

	[USBTS_XMIT_SZ_8BYTE]	= 3,

	[USBTS_XMIT_SZ_16BYTE]	= 4,

	[USBTS_XMIT_SZ_32BYTE]	= 5,

};



#define USBTS_LOW_BIT	0x3 /* --xx */

#define USBTS_HI_BIT	0x0 /* ---- */



#define USBTS_LOW_SHIFT	6

#define USBTS_HI_SHIFT	0



#define USBTS_INDEX2VAL(i) (((i) & 3) << 6)



#endif /* DMA_REGISTER_H */

arch/arm/mach-shmobile/include/mach/gpio.h

+32 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/sh_pfc.h>

#include <linux/sh_pfc.h>

#include <linux/io.h>





#ifdef CONFIG_GPIOLIB

#ifdef CONFIG_GPIOLIB
@@ -27,4 +28,35 @@ static inline int irq_to_gpio(unsigned int irq) 




#endif /* CONFIG_GPIOLIB */

#endif /* CONFIG_GPIOLIB */





/*

 * FIXME !!

 *

 * current gpio frame work doesn't have

 * the method to control only pull up/down/free.

 * this function should be replaced by correct gpio function

 */

static inline void __init gpio_direction_none(u32 addr)

{

	__raw_writeb(0x00, addr);

}



static inline void __init gpio_request_pullup(u32 addr)

{

	u8 data = __raw_readb(addr);



	data &= 0x0F;

	data |= 0xC0;

	__raw_writeb(data, addr);

}



static inline void __init gpio_request_pulldown(u32 addr)

{

	u8 data = __raw_readb(addr);



	data &= 0x0F;

	data |= 0xA0;



	__raw_writeb(data, addr);

}



#endif /* __ASM_ARCH_GPIO_H */
 
#endif /* __ASM_ARCH_GPIO_H */