3771176c9e
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
28 lines
889 B
Diff
28 lines
889 B
Diff
--- a/arch/mips/ath79/common.c
|
|
+++ b/arch/mips/ath79/common.c
|
|
@@ -34,11 +34,13 @@ EXPORT_SYMBOL_GPL(ath79_ddr_freq);
|
|
|
|
enum ath79_soc_type ath79_soc;
|
|
unsigned int ath79_soc_rev;
|
|
+EXPORT_SYMBOL_GPL(ath79_soc_rev);
|
|
|
|
void __iomem *ath79_pll_base;
|
|
void __iomem *ath79_reset_base;
|
|
EXPORT_SYMBOL_GPL(ath79_reset_base);
|
|
-static void __iomem *ath79_ddr_base;
|
|
+void __iomem *ath79_ddr_base;
|
|
+EXPORT_SYMBOL_GPL(ath79_ddr_base);
|
|
static void __iomem *ath79_ddr_wb_flush_base;
|
|
static void __iomem *ath79_ddr_pci_win_base;
|
|
|
|
--- a/arch/mips/include/asm/mach-ath79/ath79.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
|
|
@@ -152,6 +152,7 @@ void ath79_ddr_wb_flush(unsigned int reg
|
|
void ath79_ddr_set_pci_windows(void);
|
|
|
|
extern void __iomem *ath79_pll_base;
|
|
+extern void __iomem *ath79_ddr_base;
|
|
extern void __iomem *ath79_reset_base;
|
|
|
|
static inline void ath79_pll_wr(unsigned reg, u32 val)
|