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

Commit 504ca43e authored by Josh Boyer's avatar Josh Boyer Committed by Josh Boyer
Browse files

[POWERPC] 4xx: Convert Seqouia flash mappings to new binding 



A new binding for flash devices was recently introduced.  This updates the
Sequoia DTS to use the new binding and enabled MTD in the defconfig.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-by: default avatarStefan Roese <sr@denx.de>
parent bf07f32d

arch/powerpc/boot/dts/sequoia.dts

+27 −11
Original line number Diff line number Diff line
@@ -142,19 +142,35 @@ 
				interrupt-parent = <&UIC1>;



				nor_flash@0,0 {

					device_type = "rom";

					compatible = "direct-mapped";

					probe-type = "CFI";

					compatible = "amd,s29gl256n", "cfi-flash";

					bank-width = <2>;

					partitions = <	0	180000

							180000	200000

							380000	3aa0000

							3e20000	140000

							3f60000	40000

							3fa0000	60000>;

					partition-names = "Kernel", "ramdisk", "file system",

								"kozio", "env", "u-boot";

					reg = <0 000000 4000000>;

					#address-cells = <1>;

					#size-cells = <1>;

					partition@0 {

						label = "Kernel";

						reg = <0 180000>;

					};

					partition@180000 {

						label = "ramdisk";

						reg = <180000 200000>;

					};

					partition@380000 {

						label = "file system";

						reg = <380000 3aa0000>;

					};

					partition@3e20000 {

						label = "kozio";

						reg = <3e20000 140000>;

					};

					partition@3f60000 {

						label = "env";

						reg = <3f60000 40000>;

					};

					partition@3fa0000 {

						label = "u-boot";

						reg = <3fa0000 60000>;

					};

				};



			};

arch/powerpc/configs/sequoia_defconfig

+88 −3
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc3

# Mon Aug 27 20:19:13 2007

# Linux kernel version: 2.6.23-rc6

# Fri Sep 14 13:20:06 2007

#

# CONFIG_PPC64 is not set
@@ -146,6 +146,7 @@ CONFIG_440A=y 
# CONFIG_GENERIC_IOMAP is not set

# CONFIG_CPU_FREQ is not set

# CONFIG_CPM2 is not set

# CONFIG_FSL_ULI1575 is not set



#

# Kernel options
@@ -317,7 +318,81 @@ CONFIG_FW_LOADER=y 
# CONFIG_SYS_HYPERVISOR is not set

CONFIG_CONNECTOR=y

CONFIG_PROC_EVENTS=y

# CONFIG_MTD is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y



#

# User Modules And Translation Layers

#

CONFIG_MTD_CHAR=y

# CONFIG_MTD_BLKDEVS is not set

# CONFIG_MTD_BLOCK is not set

# CONFIG_MTD_BLOCK_RO is not set

# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set



#

# RAM/ROM/Flash chip drivers

#

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_GEN_PROBE=y

# CONFIG_MTD_CFI_ADV_OPTIONS is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y

CONFIG_MTD_MAP_BANK_WIDTH_2=y

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

CONFIG_MTD_CFI_I1=y

CONFIG_MTD_CFI_I2=y

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I8 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PHYSMAP is not set

CONFIG_MTD_PHYSMAP_OF=y

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers

#

# CONFIG_MTD_PMC551 is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLOCK2MTD is not set



#

# Disk-On-Chip Device Drivers

#

# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_MTD_NAND is not set

# CONFIG_MTD_ONENAND is not set



#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_OF_DEVICE=y

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y
@@ -613,6 +688,15 @@ CONFIG_RAMFS=y 
# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_CRAMFS=y

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set
@@ -671,6 +755,7 @@ CONFIG_CRC32=y 
# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y