-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
* 'for_linus' of git://github.com/at91linux/linux-2.6-at91: AT91: rtc: enable built-in RTC in Kconfig for at91sam9g45 family at91/atmel-mci: inclusion of sd/mmc driver in at91sam9g45 chip and board AT91: pm: make sure that r0 is 0 when dealing with cache operations AT91: pm: use plain cpu_do_idle() for "wait for interrupt" AT91: reset: extend alternate reset procedure to several chips AT91: reset routine cleanup, remove not needed icache flush AT91: trivial: align comment of at91sam9g20_reset with one more tab AT91: Fix AT91SAM9G20 reset as per the errata in the data sheet AT91: add board support for Pcontrol_G20
- Loading branch information
Showing
17 changed files
with
778 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| CONFIG_EXPERIMENTAL=y | ||
| CONFIG_CROSS_COMPILE="/opt/arm-2010q1/bin/arm-none-linux-gnueabi-" | ||
| # CONFIG_LOCALVERSION_AUTO is not set | ||
| # CONFIG_SWAP is not set | ||
| CONFIG_SYSVIPC=y | ||
| CONFIG_POSIX_MQUEUE=y | ||
| CONFIG_TREE_PREEMPT_RCU=y | ||
| CONFIG_IKCONFIG=y | ||
| CONFIG_IKCONFIG_PROC=y | ||
| CONFIG_LOG_BUF_SHIFT=14 | ||
| CONFIG_NAMESPACES=y | ||
| CONFIG_BLK_DEV_INITRD=y | ||
| CONFIG_EMBEDDED=y | ||
| # CONFIG_SYSCTL_SYSCALL is not set | ||
| # CONFIG_KALLSYMS is not set | ||
| # CONFIG_VM_EVENT_COUNTERS is not set | ||
| # CONFIG_COMPAT_BRK is not set | ||
| CONFIG_SLAB=y | ||
| CONFIG_MODULES=y | ||
| CONFIG_MODULE_UNLOAD=y | ||
| # CONFIG_LBDAF is not set | ||
| # CONFIG_BLK_DEV_BSG is not set | ||
| CONFIG_DEFAULT_DEADLINE=y | ||
| CONFIG_ARCH_AT91=y | ||
| CONFIG_ARCH_AT91SAM9G20=y | ||
| CONFIG_MACH_PCONTROL_G20=y | ||
| CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | ||
| CONFIG_NO_HZ=y | ||
| CONFIG_HIGH_RES_TIMERS=y | ||
| CONFIG_PREEMPT=y | ||
| CONFIG_AEABI=y | ||
| # CONFIG_OABI_COMPAT is not set | ||
| CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| CONFIG_CMDLINE="console=ttyS0,115200 mem=128M mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) root=/dev/mmcblk0p1 rootwait rw" | ||
| CONFIG_VFP=y | ||
| CONFIG_BINFMT_MISC=y | ||
| CONFIG_NET=y | ||
| CONFIG_PACKET=y | ||
| CONFIG_UNIX=y | ||
| CONFIG_INET=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 | ||
| # CONFIG_INET_LRO is not set | ||
| # CONFIG_IPV6 is not set | ||
| CONFIG_VLAN_8021Q=y | ||
| # CONFIG_WIRELESS is not set | ||
| CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| # CONFIG_FW_LOADER is not set | ||
| CONFIG_MTD=y | ||
| CONFIG_MTD_PARTITIONS=y | ||
| CONFIG_MTD_CMDLINE_PARTS=y | ||
| CONFIG_MTD_CHAR=y | ||
| CONFIG_MTD_BLOCK=y | ||
| CONFIG_MTD_COMPLEX_MAPPINGS=y | ||
| CONFIG_MTD_PHRAM=m | ||
| CONFIG_MTD_NAND=y | ||
| CONFIG_MTD_NAND_ATMEL=y | ||
| CONFIG_BLK_DEV_LOOP=y | ||
| CONFIG_BLK_DEV_RAM=y | ||
| CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| CONFIG_ATMEL_TCLIB=y | ||
| CONFIG_EEPROM_AT24=m | ||
| CONFIG_SCSI=m | ||
| # CONFIG_SCSI_PROC_FS is not set | ||
| CONFIG_BLK_DEV_SD=m | ||
| CONFIG_SCSI_MULTI_LUN=y | ||
| # CONFIG_SCSI_LOWLEVEL is not set | ||
| CONFIG_NETDEVICES=y | ||
| CONFIG_MACVLAN=m | ||
| CONFIG_TUN=m | ||
| CONFIG_SMSC_PHY=m | ||
| CONFIG_BROADCOM_PHY=m | ||
| CONFIG_NET_ETHERNET=y | ||
| CONFIG_MII=y | ||
| CONFIG_MACB=y | ||
| CONFIG_SMSC911X=m | ||
| # CONFIG_NETDEV_1000 is not set | ||
| # CONFIG_NETDEV_10000 is not set | ||
| # CONFIG_WLAN is not set | ||
| CONFIG_PPP=m | ||
| CONFIG_PPP_ASYNC=m | ||
| CONFIG_PPP_DEFLATE=m | ||
| CONFIG_PPP_MPPE=m | ||
| CONFIG_INPUT_POLLDEV=y | ||
| CONFIG_INPUT_SPARSEKMAP=y | ||
| # CONFIG_INPUT_MOUSEDEV is not set | ||
| CONFIG_INPUT_EVDEV=m | ||
| CONFIG_INPUT_EVBUG=m | ||
| # CONFIG_KEYBOARD_ATKBD is not set | ||
| CONFIG_KEYBOARD_GPIO=m | ||
| CONFIG_KEYBOARD_MATRIX=m | ||
| # CONFIG_INPUT_MOUSE is not set | ||
| CONFIG_INPUT_TOUCHSCREEN=y | ||
| CONFIG_INPUT_MISC=y | ||
| CONFIG_INPUT_UINPUT=m | ||
| CONFIG_INPUT_GPIO_ROTARY_ENCODER=m | ||
| # CONFIG_SERIO is not set | ||
| # CONFIG_DEVKMEM is not set | ||
| CONFIG_SERIAL_ATMEL=y | ||
| CONFIG_SERIAL_ATMEL_CONSOLE=y | ||
| CONFIG_SERIAL_MAX3100=m | ||
| # CONFIG_LEGACY_PTYS is not set | ||
| # CONFIG_HW_RANDOM is not set | ||
| CONFIG_R3964=m | ||
| CONFIG_I2C=m | ||
| CONFIG_I2C_CHARDEV=m | ||
| # CONFIG_I2C_HELPER_AUTO is not set | ||
| CONFIG_I2C_GPIO=m | ||
| CONFIG_SPI=y | ||
| CONFIG_SPI_ATMEL=m | ||
| CONFIG_SPI_SPIDEV=m | ||
| CONFIG_GPIO_SYSFS=y | ||
| CONFIG_W1=m | ||
| CONFIG_W1_MASTER_GPIO=m | ||
| CONFIG_W1_SLAVE_DS2431=m | ||
| # CONFIG_HWMON is not set | ||
| CONFIG_WATCHDOG=y | ||
| CONFIG_AT91SAM9X_WATCHDOG=y | ||
| # CONFIG_MFD_SUPPORT is not set | ||
| # CONFIG_HID_SUPPORT is not set | ||
| CONFIG_USB=y | ||
| # CONFIG_USB_DEVICE_CLASS is not set | ||
| CONFIG_USB_OHCI_HCD=y | ||
| CONFIG_USB_STORAGE=m | ||
| CONFIG_USB_LIBUSUAL=y | ||
| CONFIG_USB_SERIAL=m | ||
| CONFIG_USB_SERIAL_GENERIC=y | ||
| CONFIG_USB_SERIAL_FTDI_SIO=m | ||
| CONFIG_USB_SERIAL_PL2303=m | ||
| CONFIG_USB_GADGET=y | ||
| CONFIG_USB_ZERO=m | ||
| CONFIG_USB_ETH=m | ||
| CONFIG_USB_FILE_STORAGE=m | ||
| CONFIG_USB_G_SERIAL=m | ||
| CONFIG_USB_G_HID=m | ||
| CONFIG_MMC=y | ||
| CONFIG_MMC_UNSAFE_RESUME=y | ||
| CONFIG_MMC_ATMELMCI=y | ||
| CONFIG_NEW_LEDS=y | ||
| CONFIG_LEDS_CLASS=y | ||
| CONFIG_LEDS_GPIO=y | ||
| CONFIG_LEDS_TRIGGERS=y | ||
| CONFIG_LEDS_TRIGGER_TIMER=y | ||
| CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
| CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| CONFIG_RTC_CLASS=y | ||
| CONFIG_RTC_DRV_AT91SAM9=y | ||
| CONFIG_AUXDISPLAY=y | ||
| CONFIG_UIO=y | ||
| CONFIG_UIO_PDRV=y | ||
| CONFIG_STAGING=y | ||
| # CONFIG_STAGING_EXCLUDE_BUILD is not set | ||
| CONFIG_IIO=y | ||
| CONFIG_EXT2_FS=y | ||
| CONFIG_EXT3_FS=y | ||
| # CONFIG_EXT3_FS_XATTR is not set | ||
| CONFIG_VFAT_FS=y | ||
| CONFIG_TMPFS=y | ||
| CONFIG_JFFS2_FS=y | ||
| CONFIG_NFS_FS=y | ||
| CONFIG_NFS_V3=y | ||
| CONFIG_NFS_V4=y | ||
| CONFIG_PARTITION_ADVANCED=y | ||
| CONFIG_NLS_CODEPAGE_437=y | ||
| CONFIG_NLS_CODEPAGE_850=y | ||
| CONFIG_NLS_ISO8859_1=y | ||
| CONFIG_NLS_ISO8859_15=y | ||
| CONFIG_NLS_UTF8=y | ||
| # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| CONFIG_CRYPTO=y | ||
| CONFIG_CRYPTO_ANSI_CPRNG=y | ||
| # CONFIG_CRYPTO_HW is not set | ||
| CONFIG_CRC_CCITT=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * reset AT91SAM9G20 as per errata | ||
| * | ||
| * (C) BitBox Ltd 2010 | ||
| * | ||
| * unless the SDRAM is cleanly shutdown before we hit the | ||
| * reset register it can be left driving the data bus and | ||
| * killing the chance of a subsequent boot from NAND | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| */ | ||
|
|
||
| #include <linux/linkage.h> | ||
| #include <asm/system.h> | ||
| #include <mach/hardware.h> | ||
| #include <mach/at91sam9_sdramc.h> | ||
| #include <mach/at91_rstc.h> | ||
|
|
||
| .arm | ||
|
|
||
| .globl at91sam9_alt_reset | ||
|
|
||
| at91sam9_alt_reset: mrc p15, 0, r0, c1, c0, 0 | ||
| orr r0, r0, #CR_I | ||
| mcr p15, 0, r0, c1, c0, 0 @ enable I-cache | ||
|
|
||
| ldr r0, .at91_va_base_sdramc @ preload constants | ||
| ldr r1, .at91_va_base_rstc_cr | ||
|
|
||
| mov r2, #1 | ||
| mov r3, #AT91_SDRAMC_LPCB_POWER_DOWN | ||
| ldr r4, =AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST | ||
|
|
||
| .balign 32 @ align to cache line | ||
|
|
||
| str r2, [r0, #AT91_SDRAMC_TR] @ disable SDRAM access | ||
| str r3, [r0, #AT91_SDRAMC_LPR] @ power down SDRAM | ||
| str r4, [r1] @ reset processor | ||
|
|
||
| b . | ||
|
|
||
| .at91_va_base_sdramc: | ||
| .word AT91_VA_BASE_SYS + AT91_SDRAMC0 | ||
| .at91_va_base_rstc_cr: | ||
| .word AT91_VA_BASE_SYS + AT91_RSTC_CR |
Oops, something went wrong.