Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (23d5385f) · Commits · e / devices / android_kernel_samsung_universal8895

arch/sparc/include/asm/Kbuild

+0 −16

Original line number	Diff line number	Diff line
		# User exported sparc header files
		include include/asm-generic/Kbuild.asm

		header-y += apc.h
		header-y += asi.h
		header-y += display7seg.h
		header-y += envctrl.h
		header-y += fbio.h
		header-y += jsflash.h
		header-y += openpromio.h
		header-y += perfctr.h
		header-y += psrcompat.h
		header-y += psr.h
		header-y += pstate.h
		header-y += traps.h
		header-y += uctx.h
		header-y += utrap.h
		header-y += watchdog.h

		generic-y += clkdev.h
		generic-y += div64.h

arch/sparc/include/asm/fbio.h

+1 −259

Original line number	Diff line number	Diff line
		#ifndef __LINUX_FBIO_H
		#define __LINUX_FBIO_H

		#include <linux/compiler.h>
		#include <linux/types.h>
		#include <uapi/asm/fbio.h>

		/* Constants used for fbio SunOS compatibility */
		/* (C) 1996 Miguel de Icaza */

		/* Frame buffer types */
		#define FBTYPE_NOTYPE -1
		#define FBTYPE_SUN1BW 0 /* mono */
		#define FBTYPE_SUN1COLOR 1
		#define FBTYPE_SUN2BW 2
		#define FBTYPE_SUN2COLOR 3
		#define FBTYPE_SUN2GP 4
		#define FBTYPE_SUN5COLOR 5
		#define FBTYPE_SUN3COLOR 6
		#define FBTYPE_MEMCOLOR 7
		#define FBTYPE_SUN4COLOR 8

		#define FBTYPE_NOTSUN1 9
		#define FBTYPE_NOTSUN2 10
		#define FBTYPE_NOTSUN3 11

		#define FBTYPE_SUNFAST_COLOR 12 /* cg6 */
		#define FBTYPE_SUNROP_COLOR 13
		#define FBTYPE_SUNFB_VIDEO 14
		#define FBTYPE_SUNGIFB 15
		#define FBTYPE_SUNGPLAS 16
		#define FBTYPE_SUNGP3 17
		#define FBTYPE_SUNGT 18
		#define FBTYPE_SUNLEO 19 /* zx Leo card */
		#define FBTYPE_MDICOLOR 20 /* cg14 */
		#define FBTYPE_TCXCOLOR 21 /* SUNW,tcx card */

		#define FBTYPE_LASTPLUSONE 21 /* This is not last + 1 in fact... */

		/* Does not seem to be listed in the Sun file either */
		#define FBTYPE_CREATOR 22
		#define FBTYPE_PCI_IGA1682 23
		#define FBTYPE_P9100COLOR 24

		#define FBTYPE_PCI_GENERIC 1000
		#define FBTYPE_PCI_MACH64 1001

		/* fbio ioctls */
		/* Returned by FBIOGTYPE */
		struct fbtype {
		int fb_type; /* fb type, see above */
		int fb_height; /* pixels */
		int fb_width; /* pixels */
		int fb_depth;
		int fb_cmsize; /* color map entries */
		int fb_size; /* fb size in bytes */
		};
		#define FBIOGTYPE _IOR('F', 0, struct fbtype)

		struct fbcmap {
		int index; /* first element (0 origin) */
		int count;
		unsigned char __user *red;
		unsigned char __user *green;
		unsigned char __user *blue;
		};

		#ifdef __KERNEL__
		#define FBIOPUTCMAP_SPARC _IOW('F', 3, struct fbcmap)
		#define FBIOGETCMAP_SPARC _IOW('F', 4, struct fbcmap)
		#else
		#define FBIOPUTCMAP _IOW('F', 3, struct fbcmap)
		#define FBIOGETCMAP _IOW('F', 4, struct fbcmap)
		#endif

		/* # of device specific values */
		#define FB_ATTR_NDEVSPECIFIC 8
		/* # of possible emulations */
		#define FB_ATTR_NEMUTYPES 4

		struct fbsattr {
		int flags;
		int emu_type; /* -1 if none */
		int dev_specific[FB_ATTR_NDEVSPECIFIC];
		};

		struct fbgattr {
		int real_type; /* real frame buffer type */
		int owner; /* unknown */
		struct fbtype fbtype; /* real frame buffer fbtype */
		struct fbsattr sattr;
		int emu_types[FB_ATTR_NEMUTYPES]; /* supported emulations */
		};
		#define FBIOSATTR _IOW('F', 5, struct fbgattr) /* Unsupported: */
		#define FBIOGATTR _IOR('F', 6, struct fbgattr) /* supported */

		#define FBIOSVIDEO _IOW('F', 7, int)
		#define FBIOGVIDEO _IOR('F', 8, int)

		struct fbcursor {
		short set; /* what to set, choose from the list above */
		short enable; /* cursor on/off */
		struct fbcurpos pos; /* cursor position */
		struct fbcurpos hot; /* cursor hot spot */
		struct fbcmap cmap; /* color map info */
		struct fbcurpos size; /* cursor bit map size */
		char __user image; / cursor image bits */
		char __user mask; / cursor mask bits */
		};

		/* set/get cursor attributes/shape */
		#define FBIOSCURSOR _IOW('F', 24, struct fbcursor)
		#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor)

		/* set/get cursor position */
		#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos)
		#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos)

		/* get max cursor size */
		#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos)

		/* wid manipulation */
		struct fb_wid_alloc {
		#define FB_WID_SHARED_8 0
		#define FB_WID_SHARED_24 1
		#define FB_WID_DBL_8 2
		#define FB_WID_DBL_24 3
		__u32 wa_type;
		__s32 wa_index; /* Set on return */
		__u32 wa_count;
		};
		struct fb_wid_item {
		__u32 wi_type;
		__s32 wi_index;
		__u32 wi_attrs;
		__u32 wi_values[32];
		};
		struct fb_wid_list {
		__u32 wl_flags;
		__u32 wl_count;
		struct fb_wid_item *wl_list;
		};

		#define FBIO_WID_ALLOC _IOWR('F', 30, struct fb_wid_alloc)
		#define FBIO_WID_FREE _IOW('F', 31, struct fb_wid_alloc)
		#define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list)
		#define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list)

		/* Creator ioctls */
		#define FFB_IOCTL ('F'<<8)
		#define FFB_SYS_INFO (FFB_IOCTL\|80)
		#define FFB_CLUTREAD (FFB_IOCTL\|81)
		#define FFB_CLUTPOST (FFB_IOCTL\|82)
		#define FFB_SETDIAGMODE (FFB_IOCTL\|83)
		#define FFB_GETMONITORID (FFB_IOCTL\|84)
		#define FFB_GETVIDEOMODE (FFB_IOCTL\|85)
		#define FFB_SETVIDEOMODE (FFB_IOCTL\|86)
		#define FFB_SETSERVER (FFB_IOCTL\|87)
		#define FFB_SETOVCTL (FFB_IOCTL\|88)
		#define FFB_GETOVCTL (FFB_IOCTL\|89)
		#define FFB_GETSAXNUM (FFB_IOCTL\|90)
		#define FFB_FBDEBUG (FFB_IOCTL\|91)

		/* Cg14 ioctls */
		#define MDI_IOCTL ('M'<<8)
		#define MDI_RESET (MDI_IOCTL\|1)
		#define MDI_GET_CFGINFO (MDI_IOCTL\|2)
		#define MDI_SET_PIXELMODE (MDI_IOCTL\|3)
		# define MDI_32_PIX 32
		# define MDI_16_PIX 16
		# define MDI_8_PIX 8

		struct mdi_cfginfo {
		int mdi_ncluts; /* Number of implemented CLUTs in this MDI */
		int mdi_type; /* FBTYPE name */
		int mdi_height; /* height */
		int mdi_width; /* width */
		int mdi_size; /* available ram */
		int mdi_mode; /* 8bpp, 16bpp or 32bpp */
		int mdi_pixfreq; /* pixel clock (from PROM) */
		};

		/* SparcLinux specific ioctl for the MDI, should be replaced for
		* the SET_XLUT/SET_CLUTn ioctls instead
		*/
		#define MDI_CLEAR_XLUT (MDI_IOCTL\|9)

		/* leo & ffb ioctls */
		struct fb_clut_alloc {
		__u32 clutid; /* Set on return */
		__u32 flag;
		__u32 index;
		};

		struct fb_clut {
		#define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */
		__u32 flag;
		__u32 clutid;
		__u32 offset;
		__u32 count;
		char * red;
		char * green;
		char * blue;
		};

		struct fb_clut32 {
		__u32 flag;
		__u32 clutid;
		__u32 offset;
		__u32 count;
		__u32 red;
		__u32 green;
		__u32 blue;
		};

		#define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc)
		#define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc)
		#define LEO_CLUTREAD _IOW('L', 55, struct fb_clut)
		#define LEO_CLUTPOST _IOW('L', 56, struct fb_clut)
		#define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */
		#define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */

		#ifdef __KERNEL__
		/* Addresses on the fd of a cgsix that are mappable */
		#define CG6_FBC 0x70000000
		#define CG6_TEC 0x70001000
		@@ -260,47 +45,6 @@ struct fb_clut32 {
		#define CG14_CLUT3 0x6000 /* Color Look Up Table */
		#define CG14_AUTO 0xf000

		#endif /* KERNEL */

		/* These are exported to userland for applications to use */
		/* Mappable offsets for the cg14: control registers */
		#define MDI_DIRECT_MAP 0x10000000
		#define MDI_CTLREG_MAP 0x20000000
		#define MDI_CURSOR_MAP 0x30000000
		#define MDI_SHDW_VRT_MAP 0x40000000

		/* Mappable offsets for the cg14: frame buffer resolutions */
		/* 32 bits */
		#define MDI_CHUNKY_XBGR_MAP 0x50000000
		#define MDI_CHUNKY_BGR_MAP 0x60000000

		/* 16 bits */
		#define MDI_PLANAR_X16_MAP 0x70000000
		#define MDI_PLANAR_C16_MAP 0x80000000

		/* 8 bit is done as CG3 MMAP offset */
		/* 32 bits, planar */
		#define MDI_PLANAR_X32_MAP 0x90000000
		#define MDI_PLANAR_B32_MAP 0xa0000000
		#define MDI_PLANAR_G32_MAP 0xb0000000
		#define MDI_PLANAR_R32_MAP 0xc0000000

		/* Mappable offsets on leo */
		#define LEO_SS0_MAP 0x00000000
		#define LEO_LC_SS0_USR_MAP 0x00800000
		#define LEO_LD_SS0_MAP 0x00801000
		#define LEO_LX_CURSOR_MAP 0x00802000
		#define LEO_SS1_MAP 0x00803000
		#define LEO_LC_SS1_USR_MAP 0x01003000
		#define LEO_LD_SS1_MAP 0x01004000
		#define LEO_UNK_MAP 0x01005000
		#define LEO_LX_KRN_MAP 0x01006000
		#define LEO_LC_SS0_KRN_MAP 0x01007000
		#define LEO_LC_SS1_KRN_MAP 0x01008000
		#define LEO_LD_GBL_MAP 0x01009000
		#define LEO_UNK2_MAP 0x0100a000

		#ifdef __KERNEL__
		struct fbcmap32 {
		int index; /* first element (0 origin) */
		int count;
		@@ -325,6 +69,4 @@ struct fbcursor32 {

		#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
		#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
		#endif

		#endif /* __LINUX_FBIO_H */

arch/sparc/include/asm/ioctls.h

+1 −128

Original line number	Diff line number	Diff line
		#ifndef _ASM_SPARC_IOCTLS_H
		#define _ASM_SPARC_IOCTLS_H

		#include <asm/ioctl.h>
		#include <uapi/asm/ioctls.h>

		/* Big T */
		#define TCGETA _IOR('T', 1, struct termio)
		#define TCSETA _IOW('T', 2, struct termio)
		#define TCSETAW _IOW('T', 3, struct termio)
		#define TCSETAF _IOW('T', 4, struct termio)
		#define TCSBRK _IO('T', 5)
		#define TCXONC _IO('T', 6)
		#define TCFLSH _IO('T', 7)
		#define TCGETS _IOR('T', 8, struct termios)
		#define TCSETS _IOW('T', 9, struct termios)
		#define TCSETSW _IOW('T', 10, struct termios)
		#define TCSETSF _IOW('T', 11, struct termios)
		#define TCGETS2 _IOR('T', 12, struct termios2)
		#define TCSETS2 _IOW('T', 13, struct termios2)
		#define TCSETSW2 _IOW('T', 14, struct termios2)
		#define TCSETSF2 _IOW('T', 15, struct termios2)
		#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get primary device node of /dev/console */
		#define TIOCVHANGUP _IO('T', 0x37)

		/* Note that all the ioctls that are not available in Linux have a
		* double underscore on the front to: a) avoid some programs to
		* think we support some ioctls under Linux (autoconfiguration stuff)
		*/
		/* Little t */
		#define TIOCGETD _IOR('t', 0, int)
		#define TIOCSETD _IOW('t', 1, int)
		#define __TIOCHPCL _IO('t', 2) /* SunOS Specific */
		#define __TIOCMODG _IOR('t', 3, int) /* SunOS Specific */
		#define __TIOCMODS _IOW('t', 4, int) /* SunOS Specific */
		#define __TIOCGETP _IOR('t', 8, struct sgttyb) /* SunOS Specific */
		#define __TIOCSETP _IOW('t', 9, struct sgttyb) /* SunOS Specific */
		#define __TIOCSETN _IOW('t', 10, struct sgttyb) /* SunOS Specific */
		#define TIOCEXCL _IO('t', 13)
		#define TIOCNXCL _IO('t', 14)
		#define __TIOCFLUSH _IOW('t', 16, int) /* SunOS Specific */
		#define __TIOCSETC _IOW('t', 17, struct tchars) /* SunOS Specific */
		#define __TIOCGETC _IOR('t', 18, struct tchars) /* SunOS Specific */
		#define __TIOCTCNTL _IOW('t', 32, int) /* SunOS Specific */
		#define __TIOCSIGNAL _IOW('t', 33, int) /* SunOS Specific */
		#define __TIOCSETX _IOW('t', 34, int) /* SunOS Specific */
		#define __TIOCGETX _IOR('t', 35, int) /* SunOS Specific */
		#define TIOCCONS _IO('t', 36)
		#define TIOCGSOFTCAR _IOR('t', 100, int)
		#define TIOCSSOFTCAR _IOW('t', 101, int)
		#define __TIOCUCNTL _IOW('t', 102, int) /* SunOS Specific */
		#define TIOCSWINSZ _IOW('t', 103, struct winsize)
		#define TIOCGWINSZ _IOR('t', 104, struct winsize)
		#define __TIOCREMOTE _IOW('t', 105, int) /* SunOS Specific */
		#define TIOCMGET _IOR('t', 106, int)
		#define TIOCMBIC _IOW('t', 107, int)
		#define TIOCMBIS _IOW('t', 108, int)
		#define TIOCMSET _IOW('t', 109, int)
		#define TIOCSTART _IO('t', 110)
		#define TIOCSTOP _IO('t', 111)
		#define TIOCPKT _IOW('t', 112, int)
		#define TIOCNOTTY _IO('t', 113)
		#define TIOCSTI _IOW('t', 114, char)
		#define TIOCOUTQ _IOR('t', 115, int)
		#define __TIOCGLTC _IOR('t', 116, struct ltchars) /* SunOS Specific */
		#define __TIOCSLTC _IOW('t', 117, struct ltchars) /* SunOS Specific */
		/* 118 is the non-posix setpgrp tty ioctl */
		/* 119 is the non-posix getpgrp tty ioctl */
		#define __TIOCCDTR _IO('t', 120) /* SunOS Specific */
		#define __TIOCSDTR _IO('t', 121) /* SunOS Specific */
		#define TIOCCBRK _IO('t', 122)
		#define TIOCSBRK _IO('t', 123)
		#define __TIOCLGET _IOW('t', 124, int) /* SunOS Specific */
		#define __TIOCLSET _IOW('t', 125, int) /* SunOS Specific */
		#define __TIOCLBIC _IOW('t', 126, int) /* SunOS Specific */
		#define __TIOCLBIS _IOW('t', 127, int) /* SunOS Specific */
		#define __TIOCISPACE _IOR('t', 128, int) /* SunOS Specific */
		#define __TIOCISIZE _IOR('t', 129, int) /* SunOS Specific */
		#define TIOCSPGRP _IOW('t', 130, int)
		#define TIOCGPGRP _IOR('t', 131, int)
		#define TIOCSCTTY _IO('t', 132)
		#define TIOCGSID _IOR('t', 133, int)
		/* Get minor device of a pty master's FD -- Solaris equiv is ISPTM */
		#define TIOCGPTN _IOR('t', 134, unsigned int) /* Get Pty Number */
		#define TIOCSPTLCK _IOW('t', 135, int) /* Lock/unlock PTY */
		#define TIOCSIG _IOW('t', 136, int) /* Generate signal on Pty slave */

		/* Little f */
		#define FIOCLEX _IO('f', 1)
		#define FIONCLEX _IO('f', 2)
		#define FIOASYNC _IOW('f', 125, int)
		#define FIONBIO _IOW('f', 126, int)
		#define FIONREAD _IOR('f', 127, int)
		#define TIOCINQ FIONREAD
		#define FIOQSIZE _IOR('f', 128, loff_t)

		/* SCARY Rutgers local SunOS kernel hackery, perhaps I will support it
		* someday. This is completely bogus, I know...
		*/
		#define __TCGETSTAT _IO('T', 200) /* Rutgers specific */
		#define __TCSETSTAT _IO('T', 201) /* Rutgers specific */

		/* Linux specific, no SunOS equivalent. */
		#define TIOCLINUX 0x541C
		#define TIOCGSERIAL 0x541E
		#define TIOCSSERIAL 0x541F
		#define TCSBRKP 0x5425
		#define TIOCSERCONFIG 0x5453
		#define TIOCSERGWILD 0x5454
		#define TIOCSERSWILD 0x5455
		#define TIOCGLCKTRMIOS 0x5456
		#define TIOCSLCKTRMIOS 0x5457
		#define TIOCSERGSTRUCT 0x5458 /* For debugging only */
		#define TIOCSERGETLSR 0x5459 /* Get line status register */
		#define TIOCSERGETMULTI 0x545A /* Get multiport config */
		#define TIOCSERSETMULTI 0x545B /* Set multiport config */
		#define TIOCMIWAIT 0x545C /* Wait for change on serial input line(s) */
		#define TIOCGICOUNT 0x545D /* Read serial port inline interrupt counts */

		/* Kernel definitions */
		#ifdef __KERNEL__
		#define TIOCGETC __TIOCGETC
		#define TIOCGETP __TIOCGETP
		#define TIOCGLTC __TIOCGLTC
		@@ -125,16 +10,4 @@
		#define TIOCSETP __TIOCSETP
		#define TIOCSETN __TIOCSETN
		#define TIOCSETC __TIOCSETC
		#endif

		/* Used for packet mode */
		#define TIOCPKT_DATA 0
		#define TIOCPKT_FLUSHREAD 1
		#define TIOCPKT_FLUSHWRITE 2
		#define TIOCPKT_STOP 4
		#define TIOCPKT_START 8
		#define TIOCPKT_NOSTOP 16
		#define TIOCPKT_DOSTOP 32
		#define TIOCPKT_IOCTL 64

		#endif /* !(_ASM_SPARC_IOCTLS_H) */

arch/sparc/include/asm/mman.h

+1 −24

Original line number	Diff line number	Diff line
		#ifndef __SPARC_MMAN_H__
		#define __SPARC_MMAN_H__

		#include <asm-generic/mman-common.h>
		#include <uapi/asm/mman.h>

		/* SunOS'ified... */

		#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */
		#define MAP_NORESERVE 0x40 /* don't reserve swap pages */
		#define MAP_INHERIT 0x80 /* SunOS doesn't do this, but... */
		#define MAP_LOCKED 0x100 /* lock the mapping */
		#define _MAP_NEW 0x80000000 /* Binary compatibility is fun... */

		#define MAP_GROWSDOWN 0x0200 /* stack-like segment */
		#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
		#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */

		#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */
		#define MCL_FUTURE 0x4000 /* lock all additions to address space */

		#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
		#define MAP_NONBLOCK 0x10000 /* do not block on IO */
		#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */
		#define MAP_HUGETLB 0x40000 /* create a huge page mapping */

		#ifdef __KERNEL__
		#ifndef __ASSEMBLY__
		#define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len)
		int sparc_mmap_check(unsigned long addr, unsigned long len);
		#endif
		#endif

		#endif /* __SPARC_MMAN_H__ */

arch/sparc/include/asm/psr.h

+1 −35

Original line number	Diff line number	Diff line
		@@ -7,43 +7,11 @@
		*
		* Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
		*/

		#ifndef __LINUX_SPARC_PSR_H
		#define __LINUX_SPARC_PSR_H

		/* The Sparc PSR fields are laid out as the following:
		*
		* ------------------------------------------------------------------------
		* \| impl \| vers \| icc \| resv \| EC \| EF \| PIL \| S \| PS \| ET \| CWP \|
		* \| 31-28 \| 27-24 \| 23-20 \| 19-14 \| 13 \| 12 \| 11-8 \| 7 \| 6 \| 5 \| 4-0 \|
		* ------------------------------------------------------------------------
		*/
		#define PSR_CWP 0x0000001f /* current window pointer */
		#define PSR_ET 0x00000020 /* enable traps field */
		#define PSR_PS 0x00000040 /* previous privilege level */
		#define PSR_S 0x00000080 /* current privilege level */
		#define PSR_PIL 0x00000f00 /* processor interrupt level */
		#define PSR_EF 0x00001000 /* enable floating point */
		#define PSR_EC 0x00002000 /* enable co-processor */
		#define PSR_SYSCALL 0x00004000 /* inside of a syscall */
		#define PSR_LE 0x00008000 /* SuperSparcII little-endian */
		#define PSR_ICC 0x00f00000 /* integer condition codes */
		#define PSR_C 0x00100000 /* carry bit */
		#define PSR_V 0x00200000 /* overflow bit */
		#define PSR_Z 0x00400000 /* zero bit */
		#define PSR_N 0x00800000 /* negative bit */
		#define PSR_VERS 0x0f000000 /* cpu-version field */
		#define PSR_IMPL 0xf0000000 /* cpu-implementation field */

		#define PSR_VERS_SHIFT 24
		#define PSR_IMPL_SHIFT 28
		#define PSR_VERS_SHIFTED_MASK 0xf
		#define PSR_IMPL_SHIFTED_MASK 0xf

		#define PSR_IMPL_TI 0x4
		#define PSR_IMPL_LEON 0xf
		#include <uapi/asm/psr.h>

		#ifdef __KERNEL__

		#ifndef __ASSEMBLY__
		/* Get the %psr register. */
		@@ -96,6 +64,4 @@ static inline unsigned int get_fsr(void)

		#endif /* !(__ASSEMBLY__) */

		#endif /* (__KERNEL__) */

		#endif /* !(__LINUX_SPARC_PSR_H) */