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

Commit 01f67502 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  radeonfb/aty128fb: Disable broken early resume hook for PowerBooks
  hvc_console: Remove tty->low_latency on pseries backends
  powerpc: fix linkstation and storcenter compilation breakage
  powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms
parents 932088b1 d801cec7

arch/powerpc/configs/40x/virtex_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -686,7 +686,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_OF_PLATFORM is not set

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set

# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

arch/powerpc/configs/44x/virtex5_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -691,7 +691,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_OF_PLATFORM is not set

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set

# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

arch/powerpc/configs/linkstation_defconfig

+22 −14
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Linux kernel version: 2.6.29-rc6

# Mon Jan 26 15:35:29 2009

# Fri Mar  6 00:07:38 2009

#

#

# CONFIG_PPC64 is not set

# CONFIG_PPC64 is not set
@@ -71,6 +71,15 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_LOG_BUF_SHIFT=14
@@ -88,6 +97,7 @@ CONFIG_NAMESPACES=y 
# CONFIG_IPC_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -153,11 +163,6 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_FREEZER is not set

# CONFIG_FREEZER is not set





#

#
@@ -294,7 +299,6 @@ CONFIG_NET=y 
#

#

# Networking options

# Networking options

#

#

# CONFIG_NET_NS is not set

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_PACKET_MMAP=y
@@ -508,8 +512,8 @@ CONFIG_MTD_CONCAT=y 
CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_OF_PARTS is not set

CONFIG_MTD_OF_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set

# CONFIG_MTD_AR7_PARTS is not set





#

#
@@ -587,7 +591,6 @@ CONFIG_MTD_PHYSMAP=y 
# LPDDR flash memory drivers

# LPDDR flash memory drivers

#

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set





#

#

# UBI - Unsorted block images

# UBI - Unsorted block images
@@ -617,13 +620,19 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
# CONFIG_BLK_DEV_HD is not set

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

CONFIG_MISC_DEVICES=y

# CONFIG_PHANTOM is not set

# CONFIG_PHANTOM is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_HP_ILO is not set

# CONFIG_C2PORT is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_AT24 is not set

CONFIG_EEPROM_LEGACY=m

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set

# CONFIG_IDE is not set
@@ -839,6 +848,7 @@ CONFIG_R8169=y 
# CONFIG_QLA3XXX is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1C is not set

# CONFIG_JME is not set

# CONFIG_JME is not set

CONFIG_NETDEV_10000=y

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T1 is not set
@@ -1037,8 +1047,6 @@ CONFIG_I2C_MPC=y 
# Miscellaneous I2C Chip support

# Miscellaneous I2C Chip support

#

#

# CONFIG_DS1682 is not set

# CONFIG_DS1682 is not set

# CONFIG_EEPROM_AT24 is not set

CONFIG_EEPROM_LEGACY=m

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCA9539 is not set

arch/powerpc/configs/storcenter_defconfig

+22 −13
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Linux kernel version: 2.6.29-rc6

# Mon Jan 26 15:35:46 2009

# Fri Mar  6 00:09:08 2009

#

#

# CONFIG_PPC64 is not set

# CONFIG_PPC64 is not set
@@ -71,6 +71,15 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

CONFIG_GROUP_SCHED=y
@@ -144,11 +153,6 @@ CONFIG_IOSCHED_CFQ=y 
CONFIG_DEFAULT_CFQ=y

CONFIG_DEFAULT_CFQ=y

# CONFIG_DEFAULT_NOOP is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"

CONFIG_DEFAULT_IOSCHED="cfq"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_FREEZER is not set

# CONFIG_FREEZER is not set





#

#
@@ -377,8 +381,8 @@ CONFIG_MTD=y 
CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_OF_PARTS is not set

CONFIG_MTD_OF_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set

# CONFIG_MTD_AR7_PARTS is not set





#

#
@@ -452,7 +456,6 @@ CONFIG_MTD_PHYSMAP=y 
# LPDDR flash memory drivers

# LPDDR flash memory drivers

#

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set





#

#

# UBI - Unsorted block images

# UBI - Unsorted block images
@@ -478,13 +481,19 @@ CONFIG_BLK_DEV=y 
# CONFIG_BLK_DEV_HD is not set

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

CONFIG_MISC_DEVICES=y

# CONFIG_PHANTOM is not set

# CONFIG_PHANTOM is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_HP_ILO is not set

# CONFIG_C2PORT is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

CONFIG_HAVE_IDE=y

CONFIG_IDE=y

CONFIG_IDE=y
@@ -677,6 +686,7 @@ CONFIG_R8169=y 
# CONFIG_QLA3XXX is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1C is not set

# CONFIG_JME is not set

# CONFIG_JME is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_TR is not set

# CONFIG_TR is not set
@@ -818,8 +828,6 @@ CONFIG_I2C_MPC=y 
# Miscellaneous I2C Chip support

# Miscellaneous I2C Chip support

#

#

# CONFIG_DS1682 is not set

# CONFIG_DS1682 is not set

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCA9539 is not set
@@ -1159,6 +1167,7 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_SYSV_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_EXPORTFS=m





#

#

# Partition Types

# Partition Types

arch/powerpc/platforms/embedded6xx/linkstation.c

+0 −38
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 




#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/initrd.h>

#include <linux/initrd.h>

#include <linux/mtd/physmap.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>





#include <asm/time.h>

#include <asm/time.h>
@@ -22,39 +21,6 @@ 




#include "mpc10x.h"

#include "mpc10x.h"





static struct mtd_partition linkstation_physmap_partitions[] = {

	{

		.name   = "mtd_firmimg",

		.offset = 0x000000,

		.size   = 0x300000,

	},

	{

		.name   = "mtd_bootcode",

		.offset = 0x300000,

		.size   = 0x070000,

	},

	{

		.name   = "mtd_status",

		.offset = 0x370000,

		.size   = 0x010000,

	},

	{

		.name   = "mtd_conf",

		.offset = 0x380000,

		.size   = 0x080000,

	},

	{

		.name   = "mtd_allflash",

		.offset = 0x000000,

		.size   = 0x400000,

	},

	{

		.name   = "mtd_data",

		.offset = 0x310000,

		.size   = 0x0f0000,

	},

};



static __initdata struct of_device_id of_bus_ids[] = {

static __initdata struct of_device_id of_bus_ids[] = {

	{ .type = "soc", },

	{ .type = "soc", },

	{ .compatible = "simple-bus", },

	{ .compatible = "simple-bus", },
@@ -99,10 +65,6 @@ static int __init linkstation_add_bridge(struct device_node *dev) 
static void __init linkstation_setup_arch(void)

static void __init linkstation_setup_arch(void)

{

{

	struct device_node *np;

	struct device_node *np;

#ifdef CONFIG_MTD_PHYSMAP

	physmap_set_partitions(linkstation_physmap_partitions,

			       ARRAY_SIZE(linkstation_physmap_partitions));

#endif





	/* Lookup PCI host bridges */

	/* Lookup PCI host bridges */

	for_each_compatible_node(np, "pci", "mpc10x-pci")

	for_each_compatible_node(np, "pci", "mpc10x-pci")