diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/ts219-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 2830f0fe80e..a5bd7fde04a 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c | |||
| @@ -74,8 +74,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = { | |||
| 74 | MPP3_SPI_MISO, | 74 | MPP3_SPI_MISO, |
| 75 | MPP4_SATA1_ACTn, | 75 | MPP4_SATA1_ACTn, |
| 76 | MPP5_SATA0_ACTn, | 76 | MPP5_SATA0_ACTn, |
| 77 | MPP8_TW_SDA, | 77 | MPP8_TW0_SDA, |
| 78 | MPP9_TW_SCK, | 78 | MPP9_TW0_SCK, |
| 79 | MPP10_UART0_TXD, | 79 | MPP10_UART0_TXD, |
| 80 | MPP11_UART0_RXD, | 80 | MPP11_UART0_RXD, |
| 81 | MPP13_UART1_TXD, /* PIC controller */ | 81 | MPP13_UART1_TXD, /* PIC controller */ |
| @@ -83,6 +83,7 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = { | |||
| 83 | MPP15_GPIO, /* USB Copy button */ | 83 | MPP15_GPIO, /* USB Copy button */ |
| 84 | MPP16_GPIO, /* Reset button */ | 84 | MPP16_GPIO, /* Reset button */ |
| 85 | MPP36_GPIO, /* RAM: 0: 256 MB, 1: 512 MB */ | 85 | MPP36_GPIO, /* RAM: 0: 256 MB, 1: 512 MB */ |
| 86 | MPP44_GPIO, /* Board ID: 0: TS-11x, 1: TS-21x */ | ||
| 86 | 0 | 87 | 0 |
| 87 | }; | 88 | }; |
| 88 | 89 | ||
| @@ -110,10 +111,10 @@ static void __init qnap_ts219_init(void) | |||
| 110 | 111 | ||
| 111 | static int __init ts219_pci_init(void) | 112 | static int __init ts219_pci_init(void) |
| 112 | { | 113 | { |
| 113 | if (machine_is_ts219()) | 114 | if (machine_is_ts219()) |
| 114 | kirkwood_pcie_init(); | 115 | kirkwood_pcie_init(KW_PCIE0); |
| 115 | 116 | ||
| 116 | return 0; | 117 | return 0; |
| 117 | } | 118 | } |
| 118 | subsys_initcall(ts219_pci_init); | 119 | subsys_initcall(ts219_pci_init); |
| 119 | 120 | ||
