6 files changed, 25 insertions, 17 deletions

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;
 struct pci_sys_data;
 
 void orion5x_pcie_id(u32 *dev, u32 *rev);
+void orion5x_pci_disable(void);
 void orion5x_pci_set_cardbus_mode(void);
 int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
 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 = {
 static struct i2c_board_info __initdata dns323_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("g760a", 0x3e),
-#if 0
-        /* this entry requires the new-style driver model lm75 driver,
-         * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
         }, {
-                I2C_BOARD_INFO("g751", 0x48),
-#endif
+                I2C_BOARD_INFO("lm75", 0x48),
         }, {
                 I2C_BOARD_INFO("m41t80", 0x68),
         },
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 = {
 
 static int __init kurobox_pro_pci_init(void)
 {
-        if (machine_is_kurobox_pro())
+        if (machine_is_kurobox_pro()) {
+                orion5x_pci_disable();
                 pci_common_init(&kurobox_pro_pci);
+        }
 
         return 0;
 }
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)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 
+static int orion5x_pci_disabled __initdata;
+
+void __init orion5x_pci_disable(void)
+{
+        orion5x_pci_disabled = 1;
+}
+
 void __init orion5x_pci_set_cardbus_mode(void)
 {
         orion5x_pci_cardbus_mode = 1;
@@ -553,7 +560,7 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)
         if (nr == 0) {
                 orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr);
                 ret = pcie_setup(sys);
-        } else if (nr == 1) {
+        } else if (nr == 1 && !orion5x_pci_disabled) {
                 orion5x_pci_set_bus_nr(sys->busnr);
                 ret = pci_setup(sys);
         }
@@ -567,7 +574,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys
 
         if (nr == 0) {
                 bus = pci_scan_bus(sys->busnr, &pcie_ops, sys);
-        } else if (nr == 1) {
+        } else if (nr == 1 && !orion5x_pci_disabled) {
                 bus = pci_scan_bus(sys->busnr, &pci_ops, sys);
         } else {
                 bus = NULL;
@@ -584,7 +591,7 @@ int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
         /*
          * PCIe endpoint?
          */
-        if (bus < orion5x_pci_local_bus_nr())
+        if (orion5x_pci_disabled || bus < orion5x_pci_local_bus_nr())
                 return IRQ_ORION5X_PCIE0_INT;
 
         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)
         /*
          * Configure peripherals.
          */
+        orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
+                                   QNAP_TS209_NOR_BOOT_SIZE);
+        platform_device_register(&qnap_ts209_nor_flash);
+
         orion5x_ehci0_init();
         orion5x_ehci1_init();
         qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
@@ -296,12 +300,9 @@ static void __init qnap_ts209_init(void)
         orion5x_i2c_init();
         orion5x_sata_init(&qnap_ts209_sata_data);
         orion5x_uart0_init();
+        orion5x_uart1_init();
         orion5x_xor_init();
 
-        orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
-                                   QNAP_TS209_NOR_BOOT_SIZE);
-        platform_device_register(&qnap_ts209_nor_flash);
-
         platform_device_register(&qnap_ts209_button_device);
 
         /* 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)
         /*
          * Configure peripherals.
          */
+        orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
+                                   QNAP_TS409_NOR_BOOT_SIZE);
+        platform_device_register(&qnap_ts409_nor_flash);
+
         orion5x_ehci0_init();
         qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +
                                  qnap_ts409_partitions[5].offset,
@@ -285,10 +289,7 @@ static void __init qnap_ts409_init(void)
         orion5x_eth_init(&qnap_tsx09_eth_data);
         orion5x_i2c_init();
         orion5x_uart0_init();
-
-        orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
-                                   QNAP_TS409_NOR_BOOT_SIZE);
-        platform_device_register(&qnap_ts409_nor_flash);
+        orion5x_uart1_init();
 
         platform_device_register(&qnap_ts409_button_device);