diff options
-rw-r--r-- | arch/arm/configs/orion5x_defconfig | 146 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/pci.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/ts409-setup.c | 9 |
7 files changed, 138 insertions, 50 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 1464ffe71717..4017d83c9d2d 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 2 23:54:48 2008 | 4 | # Fri Aug 22 12:38:51 2008 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -12,6 +12,7 @@ CONFIG_MMU=y | |||
12 | # CONFIG_NO_IOPORT is not set | 12 | # CONFIG_NO_IOPORT is not set |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 14 | CONFIG_STACKTRACE_SUPPORT=y |
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | 16 | CONFIG_LOCKDEP_SUPPORT=y |
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
17 | CONFIG_HARDIRQS_SW_RESEND=y | 18 | CONFIG_HARDIRQS_SW_RESEND=y |
@@ -23,6 +24,7 @@ CONFIG_GENERIC_HWEIGHT=y | |||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | 25 | CONFIG_ARCH_SUPPORTS_AOUT=y |
25 | CONFIG_ZONE_DMA=y | 26 | CONFIG_ZONE_DMA=y |
27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
26 | CONFIG_VECTORS_BASE=0xffff0000 | 28 | CONFIG_VECTORS_BASE=0xffff0000 |
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
28 | 30 | ||
@@ -56,7 +58,6 @@ CONFIG_SYSCTL=y | |||
56 | CONFIG_EMBEDDED=y | 58 | CONFIG_EMBEDDED=y |
57 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
58 | CONFIG_SYSCTL_SYSCALL=y | 60 | CONFIG_SYSCTL_SYSCALL=y |
59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
60 | CONFIG_KALLSYMS=y | 61 | CONFIG_KALLSYMS=y |
61 | CONFIG_KALLSYMS_ALL=y | 62 | CONFIG_KALLSYMS_ALL=y |
62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -83,11 +84,17 @@ CONFIG_PROFILING=y | |||
83 | CONFIG_OPROFILE=y | 84 | CONFIG_OPROFILE=y |
84 | CONFIG_HAVE_OPROFILE=y | 85 | CONFIG_HAVE_OPROFILE=y |
85 | CONFIG_KPROBES=y | 86 | CONFIG_KPROBES=y |
87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
86 | CONFIG_KRETPROBES=y | 88 | CONFIG_KRETPROBES=y |
89 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
87 | CONFIG_HAVE_KPROBES=y | 90 | CONFIG_HAVE_KPROBES=y |
88 | CONFIG_HAVE_KRETPROBES=y | 91 | CONFIG_HAVE_KRETPROBES=y |
92 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
89 | # CONFIG_HAVE_DMA_ATTRS is not set | 93 | # CONFIG_HAVE_DMA_ATTRS is not set |
94 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
95 | # CONFIG_HAVE_CLK is not set | ||
90 | CONFIG_PROC_PAGE_MONITOR=y | 96 | CONFIG_PROC_PAGE_MONITOR=y |
97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
91 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
92 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
93 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
@@ -97,12 +104,13 @@ CONFIG_MODULE_UNLOAD=y | |||
97 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
98 | # CONFIG_MODVERSIONS is not set | 105 | # CONFIG_MODVERSIONS is not set |
99 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 106 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
100 | # CONFIG_KMOD is not set | 107 | CONFIG_KMOD=y |
101 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
102 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
103 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
104 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
105 | # CONFIG_BLK_DEV_BSG is not set | 112 | # CONFIG_BLK_DEV_BSG is not set |
113 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
106 | 114 | ||
107 | # | 115 | # |
108 | # IO Schedulers | 116 | # IO Schedulers |
@@ -128,7 +136,6 @@ CONFIG_CLASSIC_RCU=y | |||
128 | # CONFIG_ARCH_AT91 is not set | 136 | # CONFIG_ARCH_AT91 is not set |
129 | # CONFIG_ARCH_CLPS7500 is not set | 137 | # CONFIG_ARCH_CLPS7500 is not set |
130 | # CONFIG_ARCH_CLPS711X is not set | 138 | # CONFIG_ARCH_CLPS711X is not set |
131 | # CONFIG_ARCH_CO285 is not set | ||
132 | # CONFIG_ARCH_EBSA110 is not set | 139 | # CONFIG_ARCH_EBSA110 is not set |
133 | # CONFIG_ARCH_EP93XX is not set | 140 | # CONFIG_ARCH_EP93XX is not set |
134 | # CONFIG_ARCH_FOOTBRIDGE is not set | 141 | # CONFIG_ARCH_FOOTBRIDGE is not set |
@@ -142,8 +149,11 @@ CONFIG_CLASSIC_RCU=y | |||
142 | # CONFIG_ARCH_IXP2000 is not set | 149 | # CONFIG_ARCH_IXP2000 is not set |
143 | # CONFIG_ARCH_IXP4XX is not set | 150 | # CONFIG_ARCH_IXP4XX is not set |
144 | # CONFIG_ARCH_L7200 is not set | 151 | # CONFIG_ARCH_L7200 is not set |
152 | # CONFIG_ARCH_KIRKWOOD is not set | ||
145 | # CONFIG_ARCH_KS8695 is not set | 153 | # CONFIG_ARCH_KS8695 is not set |
146 | # CONFIG_ARCH_NS9XXX is not set | 154 | # CONFIG_ARCH_NS9XXX is not set |
155 | # CONFIG_ARCH_LOKI is not set | ||
156 | # CONFIG_ARCH_MV78XX0 is not set | ||
147 | # CONFIG_ARCH_MXC is not set | 157 | # CONFIG_ARCH_MXC is not set |
148 | CONFIG_ARCH_ORION5X=y | 158 | CONFIG_ARCH_ORION5X=y |
149 | # CONFIG_ARCH_PNX4008 is not set | 159 | # CONFIG_ARCH_PNX4008 is not set |
@@ -195,7 +205,7 @@ CONFIG_CPU_ABRT_EV5T=y | |||
195 | CONFIG_CPU_PABRT_NOIFAR=y | 205 | CONFIG_CPU_PABRT_NOIFAR=y |
196 | CONFIG_CPU_CACHE_VIVT=y | 206 | CONFIG_CPU_CACHE_VIVT=y |
197 | CONFIG_CPU_COPY_FEROCEON=y | 207 | CONFIG_CPU_COPY_FEROCEON=y |
198 | CONFIG_CPU_TLB_V4WBI=y | 208 | CONFIG_CPU_TLB_FEROCEON=y |
199 | CONFIG_CPU_CP15=y | 209 | CONFIG_CPU_CP15=y |
200 | CONFIG_CPU_CP15_MMU=y | 210 | CONFIG_CPU_CP15_MMU=y |
201 | 211 | ||
@@ -280,10 +290,6 @@ CONFIG_BINFMT_ELF=y | |||
280 | # | 290 | # |
281 | # CONFIG_PM is not set | 291 | # CONFIG_PM is not set |
282 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 292 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
283 | |||
284 | # | ||
285 | # Networking | ||
286 | # | ||
287 | CONFIG_NET=y | 293 | CONFIG_NET=y |
288 | 294 | ||
289 | # | 295 | # |
@@ -361,6 +367,7 @@ CONFIG_NET_PKTGEN=m | |||
361 | # | 367 | # |
362 | # CONFIG_CFG80211 is not set | 368 | # CONFIG_CFG80211 is not set |
363 | CONFIG_WIRELESS_EXT=y | 369 | CONFIG_WIRELESS_EXT=y |
370 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
364 | # CONFIG_MAC80211 is not set | 371 | # CONFIG_MAC80211 is not set |
365 | # CONFIG_IEEE80211 is not set | 372 | # CONFIG_IEEE80211 is not set |
366 | # CONFIG_RFKILL is not set | 373 | # CONFIG_RFKILL is not set |
@@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
377 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
378 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
379 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
387 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
388 | CONFIG_EXTRA_FIRMWARE="" | ||
380 | # CONFIG_DEBUG_DRIVER is not set | 389 | # CONFIG_DEBUG_DRIVER is not set |
381 | # CONFIG_DEBUG_DEVRES is not set | 390 | # CONFIG_DEBUG_DEVRES is not set |
382 | # CONFIG_SYS_HYPERVISOR is not set | 391 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -499,6 +508,7 @@ CONFIG_MISC_DEVICES=y | |||
499 | # CONFIG_SGI_IOC4 is not set | 508 | # CONFIG_SGI_IOC4 is not set |
500 | # CONFIG_TIFM_CORE is not set | 509 | # CONFIG_TIFM_CORE is not set |
501 | # CONFIG_ENCLOSURE_SERVICES is not set | 510 | # CONFIG_ENCLOSURE_SERVICES is not set |
511 | # CONFIG_HP_ILO is not set | ||
502 | CONFIG_HAVE_IDE=y | 512 | CONFIG_HAVE_IDE=y |
503 | # CONFIG_IDE is not set | 513 | # CONFIG_IDE is not set |
504 | 514 | ||
@@ -575,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
575 | # CONFIG_SCSI_NSP32 is not set | 585 | # CONFIG_SCSI_NSP32 is not set |
576 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
577 | # CONFIG_SCSI_SRP is not set | 587 | # CONFIG_SCSI_SRP is not set |
588 | # CONFIG_SCSI_DH is not set | ||
578 | CONFIG_ATA=y | 589 | CONFIG_ATA=y |
579 | # CONFIG_ATA_NONSTANDARD is not set | 590 | # CONFIG_ATA_NONSTANDARD is not set |
580 | CONFIG_SATA_PMP=y | 591 | CONFIG_SATA_PMP=y |
@@ -641,11 +652,14 @@ CONFIG_SATA_MV=y | |||
641 | # | 652 | # |
642 | # IEEE 1394 (FireWire) support | 653 | # IEEE 1394 (FireWire) support |
643 | # | 654 | # |
655 | |||
656 | # | ||
657 | # Enable only one of the two stacks, unless you know what you are doing | ||
658 | # | ||
644 | # CONFIG_FIREWIRE is not set | 659 | # CONFIG_FIREWIRE is not set |
645 | # CONFIG_IEEE1394 is not set | 660 | # CONFIG_IEEE1394 is not set |
646 | # CONFIG_I2O is not set | 661 | # CONFIG_I2O is not set |
647 | CONFIG_NETDEVICES=y | 662 | CONFIG_NETDEVICES=y |
648 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
649 | # CONFIG_DUMMY is not set | 663 | # CONFIG_DUMMY is not set |
650 | # CONFIG_BONDING is not set | 664 | # CONFIG_BONDING is not set |
651 | # CONFIG_MACVLAN is not set | 665 | # CONFIG_MACVLAN is not set |
@@ -694,7 +708,6 @@ CONFIG_NETDEV_1000=y | |||
694 | # CONFIG_DL2K is not set | 708 | # CONFIG_DL2K is not set |
695 | # CONFIG_E1000 is not set | 709 | # CONFIG_E1000 is not set |
696 | # CONFIG_E1000E is not set | 710 | # CONFIG_E1000E is not set |
697 | # CONFIG_E1000E_ENABLED is not set | ||
698 | # CONFIG_IP1000 is not set | 711 | # CONFIG_IP1000 is not set |
699 | # CONFIG_IGB is not set | 712 | # CONFIG_IGB is not set |
700 | # CONFIG_NS83820 is not set | 713 | # CONFIG_NS83820 is not set |
@@ -710,6 +723,7 @@ CONFIG_NETDEV_1000=y | |||
710 | CONFIG_MV643XX_ETH=y | 723 | CONFIG_MV643XX_ETH=y |
711 | # CONFIG_QLA3XXX is not set | 724 | # CONFIG_QLA3XXX is not set |
712 | # CONFIG_ATL1 is not set | 725 | # CONFIG_ATL1 is not set |
726 | # CONFIG_ATL1E is not set | ||
713 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
714 | # CONFIG_TR is not set | 728 | # CONFIG_TR is not set |
715 | 729 | ||
@@ -815,44 +829,65 @@ CONFIG_DEVPORT=y | |||
815 | CONFIG_I2C=y | 829 | CONFIG_I2C=y |
816 | CONFIG_I2C_BOARDINFO=y | 830 | CONFIG_I2C_BOARDINFO=y |
817 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
832 | CONFIG_I2C_HELPER_AUTO=y | ||
818 | 833 | ||
819 | # | 834 | # |
820 | # I2C Hardware Bus support | 835 | # I2C Hardware Bus support |
821 | # | 836 | # |
837 | |||
838 | # | ||
839 | # PC SMBus host controller drivers | ||
840 | # | ||
822 | # CONFIG_I2C_ALI1535 is not set | 841 | # CONFIG_I2C_ALI1535 is not set |
823 | # CONFIG_I2C_ALI1563 is not set | 842 | # CONFIG_I2C_ALI1563 is not set |
824 | # CONFIG_I2C_ALI15X3 is not set | 843 | # CONFIG_I2C_ALI15X3 is not set |
825 | # CONFIG_I2C_AMD756 is not set | 844 | # CONFIG_I2C_AMD756 is not set |
826 | # CONFIG_I2C_AMD8111 is not set | 845 | # CONFIG_I2C_AMD8111 is not set |
827 | # CONFIG_I2C_GPIO is not set | ||
828 | # CONFIG_I2C_I801 is not set | 846 | # CONFIG_I2C_I801 is not set |
829 | # CONFIG_I2C_I810 is not set | 847 | # CONFIG_I2C_ISCH is not set |
830 | # CONFIG_I2C_PIIX4 is not set | 848 | # CONFIG_I2C_PIIX4 is not set |
831 | # CONFIG_I2C_NFORCE2 is not set | 849 | # CONFIG_I2C_NFORCE2 is not set |
832 | # CONFIG_I2C_OCORES is not set | ||
833 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
834 | # CONFIG_I2C_PROSAVAGE is not set | ||
835 | # CONFIG_I2C_SAVAGE4 is not set | ||
836 | # CONFIG_I2C_SIMTEC is not set | ||
837 | # CONFIG_I2C_SIS5595 is not set | 850 | # CONFIG_I2C_SIS5595 is not set |
838 | # CONFIG_I2C_SIS630 is not set | 851 | # CONFIG_I2C_SIS630 is not set |
839 | # CONFIG_I2C_SIS96X is not set | 852 | # CONFIG_I2C_SIS96X is not set |
840 | # CONFIG_I2C_TAOS_EVM is not set | ||
841 | # CONFIG_I2C_STUB is not set | ||
842 | # CONFIG_I2C_TINY_USB is not set | ||
843 | # CONFIG_I2C_VIA is not set | 853 | # CONFIG_I2C_VIA is not set |
844 | # CONFIG_I2C_VIAPRO is not set | 854 | # CONFIG_I2C_VIAPRO is not set |
855 | |||
856 | # | ||
857 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
858 | # | ||
859 | # CONFIG_I2C_GPIO is not set | ||
860 | CONFIG_I2C_MV64XXX=y | ||
861 | # CONFIG_I2C_OCORES is not set | ||
862 | # CONFIG_I2C_SIMTEC is not set | ||
863 | |||
864 | # | ||
865 | # External I2C/SMBus adapter drivers | ||
866 | # | ||
867 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
868 | # CONFIG_I2C_TAOS_EVM is not set | ||
869 | # CONFIG_I2C_TINY_USB is not set | ||
870 | |||
871 | # | ||
872 | # Graphics adapter I2C/DDC channel drivers | ||
873 | # | ||
845 | # CONFIG_I2C_VOODOO3 is not set | 874 | # CONFIG_I2C_VOODOO3 is not set |
875 | |||
876 | # | ||
877 | # Other I2C/SMBus bus drivers | ||
878 | # | ||
846 | # CONFIG_I2C_PCA_PLATFORM is not set | 879 | # CONFIG_I2C_PCA_PLATFORM is not set |
847 | CONFIG_I2C_MV64XXX=y | 880 | # CONFIG_I2C_STUB is not set |
848 | 881 | ||
849 | # | 882 | # |
850 | # Miscellaneous I2C Chip support | 883 | # Miscellaneous I2C Chip support |
851 | # | 884 | # |
852 | # CONFIG_DS1682 is not set | 885 | # CONFIG_DS1682 is not set |
886 | # CONFIG_AT24 is not set | ||
853 | # CONFIG_SENSORS_EEPROM is not set | 887 | # CONFIG_SENSORS_EEPROM is not set |
854 | # CONFIG_SENSORS_PCF8574 is not set | 888 | # CONFIG_SENSORS_PCF8574 is not set |
855 | # CONFIG_PCF8575 is not set | 889 | # CONFIG_PCF8575 is not set |
890 | # CONFIG_SENSORS_PCA9539 is not set | ||
856 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
857 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
858 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -865,6 +900,7 @@ CONFIG_I2C_MV64XXX=y | |||
865 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
866 | CONFIG_HWMON=y | 901 | CONFIG_HWMON=y |
867 | # CONFIG_HWMON_VID is not set | 902 | # CONFIG_HWMON_VID is not set |
903 | # CONFIG_SENSORS_AD7414 is not set | ||
868 | # CONFIG_SENSORS_AD7418 is not set | 904 | # CONFIG_SENSORS_AD7418 is not set |
869 | # CONFIG_SENSORS_ADM1021 is not set | 905 | # CONFIG_SENSORS_ADM1021 is not set |
870 | # CONFIG_SENSORS_ADM1025 is not set | 906 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -884,7 +920,7 @@ CONFIG_HWMON=y | |||
884 | # CONFIG_SENSORS_GL520SM is not set | 920 | # CONFIG_SENSORS_GL520SM is not set |
885 | # CONFIG_SENSORS_IT87 is not set | 921 | # CONFIG_SENSORS_IT87 is not set |
886 | # CONFIG_SENSORS_LM63 is not set | 922 | # CONFIG_SENSORS_LM63 is not set |
887 | # CONFIG_SENSORS_LM75 is not set | 923 | CONFIG_SENSORS_LM75=y |
888 | # CONFIG_SENSORS_LM77 is not set | 924 | # CONFIG_SENSORS_LM77 is not set |
889 | # CONFIG_SENSORS_LM78 is not set | 925 | # CONFIG_SENSORS_LM78 is not set |
890 | # CONFIG_SENSORS_LM80 is not set | 926 | # CONFIG_SENSORS_LM80 is not set |
@@ -928,9 +964,12 @@ CONFIG_SSB_POSSIBLE=y | |||
928 | # | 964 | # |
929 | # Multifunction device drivers | 965 | # Multifunction device drivers |
930 | # | 966 | # |
967 | # CONFIG_MFD_CORE is not set | ||
931 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
932 | # CONFIG_MFD_ASIC3 is not set | ||
933 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
970 | # CONFIG_MFD_TMIO is not set | ||
971 | # CONFIG_MFD_T7L66XB is not set | ||
972 | # CONFIG_MFD_TC6387XB is not set | ||
934 | 973 | ||
935 | # | 974 | # |
936 | # Multimedia devices | 975 | # Multimedia devices |
@@ -961,10 +1000,6 @@ CONFIG_SSB_POSSIBLE=y | |||
961 | # Display device support | 1000 | # Display device support |
962 | # | 1001 | # |
963 | # CONFIG_DISPLAY_SUPPORT is not set | 1002 | # CONFIG_DISPLAY_SUPPORT is not set |
964 | |||
965 | # | ||
966 | # Sound | ||
967 | # | ||
968 | # CONFIG_SOUND is not set | 1003 | # CONFIG_SOUND is not set |
969 | CONFIG_HID_SUPPORT=y | 1004 | CONFIG_HID_SUPPORT=y |
970 | CONFIG_HID=y | 1005 | CONFIG_HID=y |
@@ -995,6 +1030,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
995 | # CONFIG_USB_OTG is not set | 1030 | # CONFIG_USB_OTG is not set |
996 | # CONFIG_USB_OTG_WHITELIST is not set | 1031 | # CONFIG_USB_OTG_WHITELIST is not set |
997 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1032 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1033 | # CONFIG_USB_MON is not set | ||
998 | 1034 | ||
999 | # | 1035 | # |
1000 | # USB Host Controller Drivers | 1036 | # USB Host Controller Drivers |
@@ -1037,6 +1073,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1037 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1073 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1074 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1075 | # CONFIG_USB_STORAGE_KARMA is not set |
1076 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1077 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1041 | # CONFIG_USB_LIBUSUAL is not set | 1078 | # CONFIG_USB_LIBUSUAL is not set |
1042 | 1079 | ||
@@ -1045,7 +1082,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1045 | # | 1082 | # |
1046 | # CONFIG_USB_MDC800 is not set | 1083 | # CONFIG_USB_MDC800 is not set |
1047 | # CONFIG_USB_MICROTEK is not set | 1084 | # CONFIG_USB_MICROTEK is not set |
1048 | # CONFIG_USB_MON is not set | ||
1049 | 1085 | ||
1050 | # | 1086 | # |
1051 | # USB port drivers | 1087 | # USB port drivers |
@@ -1058,7 +1094,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1058 | # CONFIG_USB_EMI62 is not set | 1094 | # CONFIG_USB_EMI62 is not set |
1059 | # CONFIG_USB_EMI26 is not set | 1095 | # CONFIG_USB_EMI26 is not set |
1060 | # CONFIG_USB_ADUTUX is not set | 1096 | # CONFIG_USB_ADUTUX is not set |
1061 | # CONFIG_USB_AUERSWALD is not set | ||
1062 | # CONFIG_USB_RIO500 is not set | 1097 | # CONFIG_USB_RIO500 is not set |
1063 | # CONFIG_USB_LEGOTOWER is not set | 1098 | # CONFIG_USB_LEGOTOWER is not set |
1064 | # CONFIG_USB_LCD is not set | 1099 | # CONFIG_USB_LCD is not set |
@@ -1084,7 +1119,9 @@ CONFIG_LEDS_CLASS=y | |||
1084 | # | 1119 | # |
1085 | # LED drivers | 1120 | # LED drivers |
1086 | # | 1121 | # |
1122 | # CONFIG_LEDS_PCA9532 is not set | ||
1087 | CONFIG_LEDS_GPIO=y | 1123 | CONFIG_LEDS_GPIO=y |
1124 | # CONFIG_LEDS_PCA955X is not set | ||
1088 | 1125 | ||
1089 | # | 1126 | # |
1090 | # LED Triggers | 1127 | # LED Triggers |
@@ -1123,6 +1160,7 @@ CONFIG_RTC_DRV_PCF8563=y | |||
1123 | CONFIG_RTC_DRV_M41T80=y | 1160 | CONFIG_RTC_DRV_M41T80=y |
1124 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1161 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
1125 | CONFIG_RTC_DRV_S35390A=y | 1162 | CONFIG_RTC_DRV_S35390A=y |
1163 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1126 | 1164 | ||
1127 | # | 1165 | # |
1128 | # SPI RTC drivers | 1166 | # SPI RTC drivers |
@@ -1143,6 +1181,27 @@ CONFIG_RTC_DRV_S35390A=y | |||
1143 | # | 1181 | # |
1144 | # on-CPU RTC drivers | 1182 | # on-CPU RTC drivers |
1145 | # | 1183 | # |
1184 | CONFIG_DMADEVICES=y | ||
1185 | |||
1186 | # | ||
1187 | # DMA Devices | ||
1188 | # | ||
1189 | CONFIG_MV_XOR=y | ||
1190 | CONFIG_DMA_ENGINE=y | ||
1191 | |||
1192 | # | ||
1193 | # DMA Clients | ||
1194 | # | ||
1195 | # CONFIG_NET_DMA is not set | ||
1196 | # CONFIG_DMATEST is not set | ||
1197 | |||
1198 | # | ||
1199 | # Voltage and Current regulators | ||
1200 | # | ||
1201 | # CONFIG_REGULATOR is not set | ||
1202 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
1203 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
1204 | # CONFIG_REGULATOR_BQ24022 is not set | ||
1146 | # CONFIG_UIO is not set | 1205 | # CONFIG_UIO is not set |
1147 | 1206 | ||
1148 | # | 1207 | # |
@@ -1222,6 +1281,7 @@ CONFIG_JFFS2_RTIME=y | |||
1222 | CONFIG_CRAMFS=y | 1281 | CONFIG_CRAMFS=y |
1223 | # CONFIG_VXFS_FS is not set | 1282 | # CONFIG_VXFS_FS is not set |
1224 | # CONFIG_MINIX_FS is not set | 1283 | # CONFIG_MINIX_FS is not set |
1284 | # CONFIG_OMFS_FS is not set | ||
1225 | # CONFIG_HPFS_FS is not set | 1285 | # CONFIG_HPFS_FS is not set |
1226 | # CONFIG_QNX4FS_FS is not set | 1286 | # CONFIG_QNX4FS_FS is not set |
1227 | # CONFIG_ROMFS_FS is not set | 1287 | # CONFIG_ROMFS_FS is not set |
@@ -1232,13 +1292,12 @@ CONFIG_NFS_FS=y | |||
1232 | CONFIG_NFS_V3=y | 1292 | CONFIG_NFS_V3=y |
1233 | # CONFIG_NFS_V3_ACL is not set | 1293 | # CONFIG_NFS_V3_ACL is not set |
1234 | # CONFIG_NFS_V4 is not set | 1294 | # CONFIG_NFS_V4 is not set |
1235 | # CONFIG_NFSD is not set | ||
1236 | CONFIG_ROOT_NFS=y | 1295 | CONFIG_ROOT_NFS=y |
1296 | # CONFIG_NFSD is not set | ||
1237 | CONFIG_LOCKD=y | 1297 | CONFIG_LOCKD=y |
1238 | CONFIG_LOCKD_V4=y | 1298 | CONFIG_LOCKD_V4=y |
1239 | CONFIG_NFS_COMMON=y | 1299 | CONFIG_NFS_COMMON=y |
1240 | CONFIG_SUNRPC=y | 1300 | CONFIG_SUNRPC=y |
1241 | # CONFIG_SUNRPC_BIND34 is not set | ||
1242 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1301 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1243 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1302 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1244 | # CONFIG_SMB_FS is not set | 1303 | # CONFIG_SMB_FS is not set |
@@ -1324,6 +1383,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1324 | CONFIG_DEBUG_KERNEL=y | 1383 | CONFIG_DEBUG_KERNEL=y |
1325 | # CONFIG_DEBUG_SHIRQ is not set | 1384 | # CONFIG_DEBUG_SHIRQ is not set |
1326 | CONFIG_DETECT_SOFTLOCKUP=y | 1385 | CONFIG_DETECT_SOFTLOCKUP=y |
1386 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1387 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1327 | CONFIG_SCHED_DEBUG=y | 1388 | CONFIG_SCHED_DEBUG=y |
1328 | CONFIG_SCHEDSTATS=y | 1389 | CONFIG_SCHEDSTATS=y |
1329 | # CONFIG_TIMER_STATS is not set | 1390 | # CONFIG_TIMER_STATS is not set |
@@ -1338,11 +1399,13 @@ CONFIG_DEBUG_PREEMPT=y | |||
1338 | # CONFIG_LOCK_STAT is not set | 1399 | # CONFIG_LOCK_STAT is not set |
1339 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1400 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1340 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1401 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1402 | CONFIG_STACKTRACE=y | ||
1341 | # CONFIG_DEBUG_KOBJECT is not set | 1403 | # CONFIG_DEBUG_KOBJECT is not set |
1342 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1404 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1343 | CONFIG_DEBUG_INFO=y | 1405 | CONFIG_DEBUG_INFO=y |
1344 | # CONFIG_DEBUG_VM is not set | 1406 | # CONFIG_DEBUG_VM is not set |
1345 | # CONFIG_DEBUG_WRITECOUNT is not set | 1407 | # CONFIG_DEBUG_WRITECOUNT is not set |
1408 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1346 | # CONFIG_DEBUG_LIST is not set | 1409 | # CONFIG_DEBUG_LIST is not set |
1347 | # CONFIG_DEBUG_SG is not set | 1410 | # CONFIG_DEBUG_SG is not set |
1348 | CONFIG_FRAME_POINTER=y | 1411 | CONFIG_FRAME_POINTER=y |
@@ -1352,7 +1415,18 @@ CONFIG_FRAME_POINTER=y | |||
1352 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1415 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1353 | # CONFIG_LKDTM is not set | 1416 | # CONFIG_LKDTM is not set |
1354 | # CONFIG_FAULT_INJECTION is not set | 1417 | # CONFIG_FAULT_INJECTION is not set |
1418 | CONFIG_LATENCYTOP=y | ||
1419 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1420 | CONFIG_HAVE_FTRACE=y | ||
1421 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1422 | # CONFIG_FTRACE is not set | ||
1423 | # CONFIG_IRQSOFF_TRACER is not set | ||
1424 | # CONFIG_PREEMPT_TRACER is not set | ||
1425 | # CONFIG_SCHED_TRACER is not set | ||
1426 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1355 | # CONFIG_SAMPLES is not set | 1427 | # CONFIG_SAMPLES is not set |
1428 | CONFIG_HAVE_ARCH_KGDB=y | ||
1429 | # CONFIG_KGDB is not set | ||
1356 | CONFIG_DEBUG_USER=y | 1430 | CONFIG_DEBUG_USER=y |
1357 | CONFIG_DEBUG_ERRORS=y | 1431 | CONFIG_DEBUG_ERRORS=y |
1358 | # CONFIG_DEBUG_STACK_USAGE is not set | 1432 | # CONFIG_DEBUG_STACK_USAGE is not set |
@@ -1365,6 +1439,7 @@ CONFIG_DEBUG_LL=y | |||
1365 | # CONFIG_KEYS is not set | 1439 | # CONFIG_KEYS is not set |
1366 | # CONFIG_SECURITY is not set | 1440 | # CONFIG_SECURITY is not set |
1367 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1441 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1442 | CONFIG_ASYNC_CORE=y | ||
1368 | CONFIG_CRYPTO=y | 1443 | CONFIG_CRYPTO=y |
1369 | 1444 | ||
1370 | # | 1445 | # |
@@ -1410,6 +1485,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1410 | # CONFIG_CRYPTO_MD4 is not set | 1485 | # CONFIG_CRYPTO_MD4 is not set |
1411 | # CONFIG_CRYPTO_MD5 is not set | 1486 | # CONFIG_CRYPTO_MD5 is not set |
1412 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1487 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1488 | # CONFIG_CRYPTO_RMD128 is not set | ||
1489 | # CONFIG_CRYPTO_RMD160 is not set | ||
1490 | # CONFIG_CRYPTO_RMD256 is not set | ||
1491 | # CONFIG_CRYPTO_RMD320 is not set | ||
1413 | # CONFIG_CRYPTO_SHA1 is not set | 1492 | # CONFIG_CRYPTO_SHA1 is not set |
1414 | # CONFIG_CRYPTO_SHA256 is not set | 1493 | # CONFIG_CRYPTO_SHA256 is not set |
1415 | # CONFIG_CRYPTO_SHA512 is not set | 1494 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1451,6 +1530,7 @@ CONFIG_BITREVERSE=y | |||
1451 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1530 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
1452 | # CONFIG_CRC_CCITT is not set | 1531 | # CONFIG_CRC_CCITT is not set |
1453 | # CONFIG_CRC16 is not set | 1532 | # CONFIG_CRC16 is not set |
1533 | CONFIG_CRC_T10DIF=y | ||
1454 | CONFIG_CRC_ITU_T=m | 1534 | CONFIG_CRC_ITU_T=m |
1455 | CONFIG_CRC32=y | 1535 | CONFIG_CRC32=y |
1456 | # CONFIG_CRC7 is not set | 1536 | # CONFIG_CRC7 is not set |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index e75bd7004b94..0bd195551a27 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
@@ -41,6 +41,7 @@ struct pci_bus; | |||
41 | struct pci_sys_data; | 41 | struct pci_sys_data; |
42 | 42 | ||
43 | void orion5x_pcie_id(u32 *dev, u32 *rev); | 43 | void orion5x_pcie_id(u32 *dev, u32 *rev); |
44 | void orion5x_pci_disable(void); | ||
44 | void orion5x_pci_set_cardbus_mode(void); | 45 | void orion5x_pci_set_cardbus_mode(void); |
45 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | 46 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); |
46 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 47 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 1a1d84b80a65..b38c65ccfb15 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | |||
245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { | 245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { |
246 | { | 246 | { |
247 | I2C_BOARD_INFO("g760a", 0x3e), | 247 | I2C_BOARD_INFO("g760a", 0x3e), |
248 | #if 0 | ||
249 | /* this entry requires the new-style driver model lm75 driver, | ||
250 | * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ | ||
251 | }, { | 248 | }, { |
252 | I2C_BOARD_INFO("g751", 0x48), | 249 | I2C_BOARD_INFO("lm75", 0x48), |
253 | #endif | ||
254 | }, { | 250 | }, { |
255 | I2C_BOARD_INFO("m41t80", 0x68), | 251 | I2C_BOARD_INFO("m41t80", 0x68), |
256 | }, | 252 | }, |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index cb72f1bb9cb7..e321ec331839 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
@@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = { | |||
146 | 146 | ||
147 | static int __init kurobox_pro_pci_init(void) | 147 | static int __init kurobox_pro_pci_init(void) |
148 | { | 148 | { |
149 | if (machine_is_kurobox_pro()) | 149 | if (machine_is_kurobox_pro()) { |
150 | orion5x_pci_disable(); | ||
150 | pci_common_init(&kurobox_pro_pci); | 151 | pci_common_init(&kurobox_pro_pci); |
152 | } | ||
151 | 153 | ||
152 | return 0; | 154 | return 0; |
153 | } | 155 | } |
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index fbceecc4b7ec..a7b7d77b1b09 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
@@ -541,6 +541,13 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev) | |||
541 | } | 541 | } |
542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | 542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); |
543 | 543 | ||
544 | static int orion5x_pci_disabled __initdata; | ||
545 | |||
546 | void __init orion5x_pci_disable(void) | ||
547 | { | ||
548 | orion5x_pci_disabled = 1; | ||
549 | } | ||
550 | |||
544 | void __init orion5x_pci_set_cardbus_mode(void) | 551 | void __init orion5x_pci_set_cardbus_mode(void) |
545 | { | 552 | { |
546 | orion5x_pci_cardbus_mode = 1; | 553 | orion5x_pci_cardbus_mode = 1; |
@@ -553,7 +560,7 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) | |||
553 | if (nr == 0) { | 560 | if (nr == 0) { |
554 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); | 561 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); |
555 | ret = pcie_setup(sys); | 562 | ret = pcie_setup(sys); |
556 | } else if (nr == 1) { | 563 | } else if (nr == 1 && !orion5x_pci_disabled) { |
557 | orion5x_pci_set_bus_nr(sys->busnr); | 564 | orion5x_pci_set_bus_nr(sys->busnr); |
558 | ret = pci_setup(sys); | 565 | ret = pci_setup(sys); |
559 | } | 566 | } |
@@ -567,7 +574,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys | |||
567 | 574 | ||
568 | if (nr == 0) { | 575 | if (nr == 0) { |
569 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | 576 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); |
570 | } else if (nr == 1) { | 577 | } else if (nr == 1 && !orion5x_pci_disabled) { |
571 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); | 578 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); |
572 | } else { | 579 | } else { |
573 | bus = NULL; | 580 | bus = NULL; |
@@ -584,7 +591,7 @@ int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
584 | /* | 591 | /* |
585 | * PCIe endpoint? | 592 | * PCIe endpoint? |
586 | */ | 593 | */ |
587 | if (bus < orion5x_pci_local_bus_nr()) | 594 | if (orion5x_pci_disabled || bus < orion5x_pci_local_bus_nr()) |
588 | return IRQ_ORION5X_PCIE0_INT; | 595 | return IRQ_ORION5X_PCIE0_INT; |
589 | 596 | ||
590 | return -1; | 597 | return -1; |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index dd657163cd8d..9d6890514199 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void) | |||
287 | /* | 287 | /* |
288 | * Configure peripherals. | 288 | * Configure peripherals. |
289 | */ | 289 | */ |
290 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
291 | QNAP_TS209_NOR_BOOT_SIZE); | ||
292 | platform_device_register(&qnap_ts209_nor_flash); | ||
293 | |||
290 | orion5x_ehci0_init(); | 294 | orion5x_ehci0_init(); |
291 | orion5x_ehci1_init(); | 295 | orion5x_ehci1_init(); |
292 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + | 296 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + |
@@ -296,12 +300,9 @@ static void __init qnap_ts209_init(void) | |||
296 | orion5x_i2c_init(); | 300 | orion5x_i2c_init(); |
297 | orion5x_sata_init(&qnap_ts209_sata_data); | 301 | orion5x_sata_init(&qnap_ts209_sata_data); |
298 | orion5x_uart0_init(); | 302 | orion5x_uart0_init(); |
303 | orion5x_uart1_init(); | ||
299 | orion5x_xor_init(); | 304 | orion5x_xor_init(); |
300 | 305 | ||
301 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
302 | QNAP_TS209_NOR_BOOT_SIZE); | ||
303 | platform_device_register(&qnap_ts209_nor_flash); | ||
304 | |||
305 | platform_device_register(&qnap_ts209_button_device); | 306 | platform_device_register(&qnap_ts209_button_device); |
306 | 307 | ||
307 | /* Get RTC IRQ and register the chip */ | 308 | /* Get RTC IRQ and register the chip */ |
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index b27d2b762081..d85588ac7ef8 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c | |||
@@ -278,6 +278,10 @@ static void __init qnap_ts409_init(void) | |||
278 | /* | 278 | /* |
279 | * Configure peripherals. | 279 | * Configure peripherals. |
280 | */ | 280 | */ |
281 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
282 | QNAP_TS409_NOR_BOOT_SIZE); | ||
283 | platform_device_register(&qnap_ts409_nor_flash); | ||
284 | |||
281 | orion5x_ehci0_init(); | 285 | orion5x_ehci0_init(); |
282 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + | 286 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + |
283 | qnap_ts409_partitions[5].offset, | 287 | qnap_ts409_partitions[5].offset, |
@@ -285,10 +289,7 @@ static void __init qnap_ts409_init(void) | |||
285 | orion5x_eth_init(&qnap_tsx09_eth_data); | 289 | orion5x_eth_init(&qnap_tsx09_eth_data); |
286 | orion5x_i2c_init(); | 290 | orion5x_i2c_init(); |
287 | orion5x_uart0_init(); | 291 | orion5x_uart0_init(); |
288 | 292 | orion5x_uart1_init(); | |
289 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
290 | QNAP_TS409_NOR_BOOT_SIZE); | ||
291 | platform_device_register(&qnap_ts409_nor_flash); | ||
292 | 293 | ||
293 | platform_device_register(&qnap_ts409_button_device); | 294 | platform_device_register(&qnap_ts409_button_device); |
294 | 295 | ||