Index: linux-2.6.25.at91/arch/arm/mach-at91/Kconfig =================================================================== --- linux-2.6.25.at91/arch/arm/mach-at91/Kconfig (revision 886) +++ linux-2.6.25.at91/arch/arm/mach-at91/Kconfig (working copy) @@ -224,7 +224,7 @@ bool "Revision 2 and above" config SOM_150ES_REV1 - bool "SOM-150ES Revision 1 and 0" + bool "Revision 1 and 0" endchoice @@ -264,14 +264,13 @@ SoM-9260M module. config SOM_9260_1K_TC - bool "Set the normal 200 KHz clock to 1 KHz" + bool "Set the 200 KHz TC output to 1 KHz" depends on MACH_SOM9260M help Select this for the Integrys DENM board to set the normal 200 KHz clock output on the SoM-9260 to about 800 Hz. if MACH_SOM9260M -menu "SOM9260 Memory Options" choice prompt "Flash Size / SDRAM Size" @@ -289,7 +288,6 @@ bool "NAND 32MB / 32MB" endchoice -endmenu endif Index: linux-2.6.25.at91/arch/arm/mach-at91/at91sam9260_devices.c =================================================================== --- linux-2.6.25.at91/arch/arm/mach-at91/at91sam9260_devices.c (revision 886) +++ linux-2.6.25.at91/arch/arm/mach-at91/at91sam9260_devices.c (working copy) @@ -493,7 +493,7 @@ }; #ifdef CONFIG_SOM_150ES_REV2 -static const unsigned spi0_standard_cs[3] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5 }; +static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PC11 }; #else static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PC11, AT91_PIN_PC16, AT91_PIN_PC17 }; #endif Index: linux-2.6.25.at91/arch/arm/mach-at91/board-som9260m.c =================================================================== --- linux-2.6.25.at91/arch/arm/mach-at91/board-som9260m.c (revision 886) +++ linux-2.6.25.at91/arch/arm/mach-at91/board-som9260m.c (working copy) @@ -148,8 +148,7 @@ /************************************************************ * mcp3208 atod interface over EMAC SPI class */ - -#ifdef CONFIG_LSI2ESC_MCP3208 +#if defined(CONFIG_SOM150ES_REV2) && defined(CONFIG_LSI2ESC_MCP3208) static struct spi_s mcp3208_spi = { .name = "mcp3208", @@ -177,22 +176,6 @@ static struct spi_board_info ek_spi_devices[] = { -#if !defined(CONFIG_MMC_AT91) -// { /* DataFlash chip */ -// .modalias = "mtd_dataflash", -// .chip_select = 1, -// .max_speed_hz = 15 * 1000 * 1000, -// .bus_num = 0, -// }, -#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD) - { /* DataFlash card */ - .modalias = "mtd_dataflash", - .chip_select = 0, - .max_speed_hz = 15 * 1000 * 1000, - .bus_num = 0, - }, -#endif -#endif #if defined(CONFIG_SND_CS4271) || defined(CONFIG_SND_CS4271_MODULE) { /* CS4271 codec */ .modalias = "cs4271", @@ -207,23 +190,22 @@ .platform_data = &cs4271_data, }, #endif -#ifdef CONFIG_LSI2ESC_MCP3208 +#if defined(CONFIG_SOM150ES_REV2) && defined(CONFIG_LSI2ESC_MCP3208) { /* mcp3208 ADC */ .modalias = "lsi2esc", /* use the SPI class interface */ -#ifdef CONFIG_SOM_150ES_REV2 .chip_select = 0, .bus_num = 0, -#else - .chip_select = 0, - .bus_num = 1, -#endif .max_speed_hz = 1e6, .platform_data = &mcp3208_spi, }, #endif { /* SEEPROM Interface */ .modalias = "lsi2esc", /* use the SPI class interface */ +#ifdef CONFIG_SOM150ES_REV2 + .chip_select = 3, +#else .chip_select = 1, +#endif .max_speed_hz = 50 * 1000 * 1000, .bus_num = 0, .platform_data = &at25fs010_spi, @@ -664,7 +646,9 @@ som9260m_led_init(); som9260m_led_class_create("indexed_led"); +#if defined(CONFIG_SOM150ES_REV2) && defined(CONFIG_LSI2ESC_MCP3208) mcp3208_gpio_class_create(&mcp3208_spi, "mcp3208-gpio"); +#endif som9260m_rtscls(); Index: linux-2.6.25.at91/arch/arm/configs/som9260m_defconfig =================================================================== --- linux-2.6.25.at91/arch/arm/configs/som9260m_defconfig (revision 886) +++ linux-2.6.25.at91/arch/arm/configs/som9260m_defconfig (working copy) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Thu Sep 18 12:58:43 2008 +# Wed Feb 18 15:35:40 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -45,11 +45,7 @@ # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_USER_SCHED=y -# CONFIG_CGROUP_SCHED is not set +# CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set @@ -190,10 +186,15 @@ # CONFIG_MACH_USB_A9260 is not set # CONFIG_MACH_QIL_A9260 is not set CONFIG_MACH_SOM9260M=y +CONFIG_SOM_150ES=y +CONFIG_SOM_150ES_REV2=y +# CONFIG_SOM_150ES_REV1 is not set +# CONFIG_DENM_CARRIER is not set # CONFIG_ARMSTRONG_HWMS is not set # CONFIG_DATA_FUSION is not set -CONFIG_SOM_150ES=y +# CONFIG_EVENT_MEDICAL is not set CONFIG_ECOREEX_SOM9260M=y +# CONFIG_SOM_9260_1K_TC is not set # # SOM9260 Memory Options @@ -331,6 +332,11 @@ CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -348,7 +354,7 @@ # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set +CONFIG_INET_TUNNEL=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -359,18 +365,33 @@ CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -508,7 +529,7 @@ # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y # CONFIG_ATMEL_PWM is not set -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m CONFIG_ATMEL_SSC=y # CONFIG_ENCLOSURE_SERVICES is not set @@ -525,6 +546,7 @@ CONFIG_SPICLASS_SYSFS=y CONFIG_SPICLASS_CHAR=y CONFIG_LSI2ESC=y +CONFIG_LSI2ESC_MCP3208=y # CONFIG_HAVE_IDE is not set # @@ -575,8 +597,8 @@ # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_VETH is not set +CONFIG_TUN=m +CONFIG_VETH=m CONFIG_PHYLIB=y # @@ -633,10 +655,13 @@ CONFIG_PPP_DEFLATE=m # CONFIG_PPP_BSDCOMP is not set # CONFIG_PPP_MPPE is not set -# CONFIG_PPPOE is not set +CONFIG_PPPOE=m # CONFIG_PPPOL2TP is not set -# CONFIG_SLIP is not set +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -691,6 +716,8 @@ # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set +CONFIG_LCD447=y +CONFIG_KEYPAD=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set @@ -1174,7 +1201,51 @@ # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_SEQIV is not set +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_HW is not set # # Library routines