Commit 5a475ce4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: LCDC dcache flush for deferred io
  sh: Fix compiler error and include the definition of IS_ERR_VALUE
  sh: re-add LCDC fbdev support to the Migo-R defconfig
  sh: fix se7724 ceu names
  sh: ms7724se: Enable sh_eth in defconfig.
  arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons
  sh: ms7724se: Add sh_eth support
  nommu: provide follow_pfn().
  sh: Kill off unused DEBUG_BOOTMEM symbol.
  perf_counter tools: add cpu_relax()/rmb() definitions for sh.
  sh64: Hook up page fault events for software perf counters.
  sh: Hook up page fault events for software perf counters.
  sh: make set_perf_counter_pending() static inline.
  clocksource: sh_tmu: Make undefined TCOR behaviour less undefined.
parents d960eea9 1c6a307a

arch/sh/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ config EARLY_PRINTK 
	  select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using

	  the kernel command line option to toggle back and forth.



config DEBUG_BOOTMEM

	depends on DEBUG_KERNEL

	bool "Debug BOOTMEM initialization"



config DEBUG_STACKOVERFLOW

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL && SUPERH32

arch/sh/boards/mach-se/7206/io.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ unsigned char se7206_inb_p(unsigned long port) 


unsigned short se7206_inw(unsigned long port)

{

	return *port2adr(port);;

	return *port2adr(port);

}



void se7206_outb(unsigned char value, unsigned long port)

arch/sh/boards/mach-se/7724/setup.c

+106 −4
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <media/sh_mobile_ceu.h>

#include <asm/io.h>

#include <asm/heartbeat.h>

#include <asm/sh_eth.h>

#include <asm/clock.h>

#include <asm/sh_keysc.h>

#include <cpu/sh7724.h>

#include <mach-se/mach/se7724.h>
@@ -272,6 +274,34 @@ static struct platform_device keysc_device = { 
	},

};



/* SH Eth */

static struct resource sh_eth_resources[] = {

	[0] = {

		.start = SH_ETH_ADDR,

		.end   = SH_ETH_ADDR + 0x1FC,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = 91,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};



struct sh_eth_plat_data sh_eth_plat = {

	.phy = 0x1f, /* SMSC LAN8187 */

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

};



static struct platform_device sh_eth_device = {

	.name = "sh-eth",

	.id	= 0,

	.dev = {

		.platform_data = &sh_eth_plat,

	},

	.num_resources = ARRAY_SIZE(sh_eth_resources),

	.resource = sh_eth_resources,

};



static struct platform_device *ms7724se_devices[] __initdata = {

	&heartbeat_device,

	&smc91x_eth_device,
@@ -280,8 +310,57 @@ static struct platform_device *ms7724se_devices[] __initdata = { 
	&ceu0_device,

	&ceu1_device,

	&keysc_device,

	&sh_eth_device,

};



#define EEPROM_OP   0xBA206000

#define EEPROM_ADR  0xBA206004

#define EEPROM_DATA 0xBA20600C

#define EEPROM_STAT 0xBA206010

#define EEPROM_STRT 0xBA206014

static int __init sh_eth_is_eeprom_ready(void)

{

	int t = 10000;



	while (t--) {

		if (!ctrl_inw(EEPROM_STAT))

			return 1;

		cpu_relax();

	}



	printk(KERN_ERR "ms7724se can not access to eeprom\n");

	return 0;

}



static void __init sh_eth_init(void)

{

	int i;

	u16 mac[3];



	/* check EEPROM status */

	if (!sh_eth_is_eeprom_ready())

		return;



	/* read MAC addr from EEPROM */

	for (i = 0 ; i < 3 ; i++) {

		ctrl_outw(0x0, EEPROM_OP); /* read */

		ctrl_outw(i*2, EEPROM_ADR);

		ctrl_outw(0x1, EEPROM_STRT);

		if (!sh_eth_is_eeprom_ready())

			return;



		mac[i] = ctrl_inw(EEPROM_DATA);

		mac[i] = ((mac[i] & 0xFF) << 8) | (mac[i] >> 8); /* swap */

	}



	/* reset sh-eth */

	ctrl_outl(0x1, SH_ETH_ADDR + 0x0);



	/* set MAC addr */

	ctrl_outl(((mac[0] << 16) | (mac[1])), SH_ETH_MAHR);

	ctrl_outl((mac[2]), SH_ETH_MALR);

}



#define SW4140    0xBA201000

#define FPGA_OUT  0xBA200400

#define PORT_HIZA 0xA4050158
@@ -302,7 +381,8 @@ static int __init devices_setup(void) 
	ctrl_outw(ctrl_inw(FPGA_OUT) &

		  ~((1 << 1)  | /* LAN */

		    (1 << 6)  | /* VIDEO DAC */

		    (1 << 12)), /* USB0 */

		    (1 << 12) | /* USB0 */

		    (1 << 14)), /* RMII */

		  FPGA_OUT);



	/* enable IRQ 0,1,2 */
@@ -374,7 +454,7 @@ static int __init devices_setup(void) 
	gpio_request(GPIO_FN_VIO0_CLK, NULL);

	gpio_request(GPIO_FN_VIO0_FLD, NULL);

	gpio_request(GPIO_FN_VIO0_HD,  NULL);

	platform_resource_setup_memory(&ceu0_device, "ceu", 4 << 20);

	platform_resource_setup_memory(&ceu0_device, "ceu0", 4 << 20);



	/* enable CEU1 */

	gpio_request(GPIO_FN_VIO1_D7,  NULL);
@@ -389,7 +469,7 @@ static int __init devices_setup(void) 
	gpio_request(GPIO_FN_VIO1_HD,  NULL);

	gpio_request(GPIO_FN_VIO1_VD,  NULL);

	gpio_request(GPIO_FN_VIO1_CLK, NULL);

	platform_resource_setup_memory(&ceu1_device, "ceu", 4 << 20);

	platform_resource_setup_memory(&ceu1_device, "ceu1", 4 << 20);



	/* KEYSC */

	gpio_request(GPIO_FN_KEYOUT5_IN5, NULL);
@@ -404,6 +484,28 @@ static int __init devices_setup(void) 
	gpio_request(GPIO_FN_KEYOUT1,     NULL);

	gpio_request(GPIO_FN_KEYOUT0,     NULL);



	/*

	 * enable SH-Eth

	 *

	 * please remove J33 pin from your board !!

	 *

	 * ms7724 board should not use GPIO_FN_LNKSTA pin

	 * So, This time PTX5 is set to input pin

	 */

	gpio_request(GPIO_FN_RMII_RXD0,    NULL);

	gpio_request(GPIO_FN_RMII_RXD1,    NULL);

	gpio_request(GPIO_FN_RMII_TXD0,    NULL);

	gpio_request(GPIO_FN_RMII_TXD1,    NULL);

	gpio_request(GPIO_FN_RMII_REF_CLK, NULL);

	gpio_request(GPIO_FN_RMII_TX_EN,   NULL);

	gpio_request(GPIO_FN_RMII_RX_ER,   NULL);

	gpio_request(GPIO_FN_RMII_CRS_DV,  NULL);

	gpio_request(GPIO_FN_MDIO,         NULL);

	gpio_request(GPIO_FN_MDC,          NULL);

	gpio_request(GPIO_PTX5, NULL);

	gpio_direction_input(GPIO_PTX5);

	sh_eth_init();



	if (sw & SW41_B) {

		/* SVGA */

		lcdc_info.ch[0].lcd_cfg.xres         = 800;

arch/sh/configs/migor_defconfig

+51 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000 
CONFIG_BOOT_LINK_OFFSET=0x00800000

CONFIG_ENTRY_OFFSET=0x00001000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"

CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"



#

# Bus options
@@ -858,7 +858,35 @@ CONFIG_VIDEO_SH_MOBILE_CEU=y 
#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set

CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB_DDC is not set

# CONFIG_FB_BOOT_VESA_SUPPORT is not set

# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

CONFIG_FB_SYS_FILLRECT=y

CONFIG_FB_SYS_COPYAREA=y

CONFIG_FB_SYS_IMAGEBLIT=y

# CONFIG_FB_FOREIGN_ENDIAN is not set

CONFIG_FB_SYS_FOPS=y

CONFIG_FB_DEFERRED_IO=y

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# CONFIG_FB_S1D13XXX is not set

CONFIG_FB_SH_MOBILE_LCDC=y

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -870,6 +898,27 @@ CONFIG_VIDEO_SH_MOBILE_CEU=y 
# Console display driver support

#

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

CONFIG_FONTS=y

# CONFIG_FONT_8x8 is not set

# CONFIG_FONT_8x16 is not set

# CONFIG_FONT_6x11 is not set

# CONFIG_FONT_7x14 is not set

# CONFIG_FONT_PEARL_8x8 is not set

# CONFIG_FONT_ACORN_8x8 is not set

CONFIG_FONT_MINI_4x6=y

# CONFIG_FONT_SUN8x16 is not set

# CONFIG_FONT_SUN12x22 is not set

# CONFIG_FONT_10x18 is not set

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_LOGO_SUPERH_MONO is not set

CONFIG_LOGO_SUPERH_VGA16=y

# CONFIG_LOGO_SUPERH_CLUT224 is not set

# CONFIG_SOUND is not set

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

arch/sh/configs/se7724_defconfig

+21 −4
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30

# Thu Jun 18 16:09:05 2009

# Mon Jun 29 16:28:43 2009

#

CONFIG_SUPERH=y

CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y 
CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_IRQ_PER_CPU=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_ARCH_NO_VIRT_TO_BUS=y

CONFIG_ARCH_HAS_DEFAULT_IDLE=y

CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -88,10 +91,12 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_COUNTERS=y



#

# Performance Counters

#

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y
@@ -107,6 +112,10 @@ CONFIG_HAVE_KRETPROBES=y 
CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_CLK=y

CONFIG_HAVE_DMA_API_DEBUG=y



#

# GCOV-based kernel profiling

#

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y
@@ -119,7 +128,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -584,7 +593,6 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_BNX2_ISCSI is not set

# CONFIG_LIBFC is not set

# CONFIG_LIBFCOE is not set

# CONFIG_SCSI_DEBUG is not set
@@ -624,7 +632,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=y

# CONFIG_AX88796 is not set

# CONFIG_STNIC is not set

# CONFIG_SH_ETH is not set

CONFIG_SH_ETH=y

CONFIG_SMC91X=y

# CONFIG_ENC28J60 is not set

# CONFIG_ETHOC is not set
@@ -801,6 +809,11 @@ CONFIG_SPI_BITBANG=y 
#

# CONFIG_SPI_SPIDEV is not set

# CONFIG_SPI_TLE62X0 is not set



#

# PPS support

#

# CONFIG_PPS is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y

# CONFIG_GPIO_SYSFS is not set
@@ -851,6 +864,8 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_REGULATOR is not set

CONFIG_MEDIA_SUPPORT=y
@@ -1196,6 +1211,7 @@ CONFIG_RTC_DRV_PCF8563=y 
# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

# CONFIG_RTC_DRV_RX8025 is not set



#

# SPI RTC drivers
@@ -1260,6 +1276,7 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE