MIPS: ath79: make ath79_ddr_ctrl_init() compatible for newer SoCs
authorFelix Fietkau <nbd@nbd.name>
Mon, 16 May 2016 17:51:54 +0000 (19:51 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 17 May 2016 09:12:38 +0000 (11:12 +0200)
AR913x, AR724x and AR933x are the only SoCs where the
ath79_ddr_wb_flush_base starts at 0x7c, all newer SoCs use 0x9c
Invert the logic to make the code compatible with AR95xx

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Cc: albeu@free.fr
Cc: sergei.shtylyov@cogentembedded.com
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13257/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/ath79/common.c

index 3cedd1f95e0f0897cf3c1d47b6c27cb9182c4003..84d4502755fc8a66e2b07ee879f7018d10f60d5a 100644 (file)
@@ -46,12 +46,12 @@ void ath79_ddr_ctrl_init(void)
 {
        ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,
                                         AR71XX_DDR_CTRL_SIZE);
-       if (soc_is_ar71xx() || soc_is_ar934x()) {
-               ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
-               ath79_ddr_pci_win_base = ath79_ddr_base + 0x7c;
-       } else {
+       if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
                ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;
                ath79_ddr_pci_win_base = 0;
+       } else {
+               ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
+               ath79_ddr_pci_win_base = ath79_ddr_base + 0x7c;
        }
 }
 EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init);