diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:59:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:59:27 +0000 |
| commit | f458d11655228237e890b87f62f9a1cc61b6ab61 (patch) | |
| tree | 9838c23daa76943fc67e46b624823ace2a6cfc69 /target/linux/atheros/patches-3.18/105-ar2315_pci.patch | |
| parent | cdabe30755db20740cb383617a1c739da6b2a300 (diff) | |
| download | upstream-f458d11655228237e890b87f62f9a1cc61b6ab61.tar.gz upstream-f458d11655228237e890b87f62f9a1cc61b6ab61.tar.bz2 upstream-f458d11655228237e890b87f62f9a1cc61b6ab61.zip | |
atheros: v3.18: rework early initialization
Do not use prom_init() callback, do memory initialization in
plat_mem_setup() callback and move serial port configuration to
arch_initcall stage.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 44715
Diffstat (limited to 'target/linux/atheros/patches-3.18/105-ar2315_pci.patch')
| -rw-r--r-- | target/linux/atheros/patches-3.18/105-ar2315_pci.patch | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch index 6a370f4701..2a4d7abd30 100644 --- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch +++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch @@ -382,22 +382,14 @@ else if (pending & CAUSEF_IP2) do_IRQ(AR2315_IRQ_MISC_INTRS); else if (pending & CAUSEF_IP7) -@@ -428,3 +432,18 @@ void __init ar2315_plat_mem_setup(void) +@@ -427,4 +431,10 @@ void __init ar2315_arch_init(void) + { ath25_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0, ar2315_apb_frequency()); - } + +#ifdef CONFIG_PCI_AR2315 -+static int __init ar2315_pci_init(void) -+{ -+ struct platform_device *pdev; -+ -+ if (!is_ar2315() || ath25_soc != ATH25_SOC_AR2315) -+ return -ENODEV; -+ -+ pdev = platform_device_register_simple("ar2315-pci", -1, NULL, 0); -+ -+ return pdev ? 0 : -ENODEV; -+} -+arch_initcall(ar2315_pci_init); ++ if (ath25_soc == ATH25_SOC_AR2315) { ++ platform_device_register_simple("ar2315-pci", -1, NULL, 0); ++ } +#endif + } |