Changeset 44724


Ignore:
Timestamp:
2015-03-13T04:01:11+01:00 (3 years ago)
Author:
nbd
Message:

atheros: v3.18: make registers headers local

There are no external users (last one was PCI driver) for these headers,
so move them to arch directory. Few macroses from ar231x.h header moved
to devices.h and file was removed.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@…>

Location:
trunk/target/linux/atheros/patches-3.18
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-3.18/100-board.patch

    r44723 r44724  
    629629+#endif /* __ASM_MACH_ATH25_WAR_H */ 
    630630--- /dev/null 
    631 +++ b/arch/mips/include/asm/mach-ath25/ar2315_regs.h 
     631+++ b/arch/mips/ath25/ar2315_regs.h 
    632632@@ -0,0 +1,480 @@ 
    633633+/* 
     
    11121112+#endif /* __ASM_MACH_ATH25_AR2315_REGS_H */ 
    11131113--- /dev/null 
    1114 +++ b/arch/mips/include/asm/mach-ath25/ar5312_regs.h 
     1114+++ b/arch/mips/ath25/ar5312_regs.h 
    11151115@@ -0,0 +1,227 @@ 
    11161116+/* 
     
    13781378+ 
    13791379+#include <ath25_platform.h> 
    1380 +#include <ar5312_regs.h> 
    1381 +#include <ar231x.h> 
     1380+ 
    13821381+#include "devices.h" 
    13831382+#include "ar5312.h" 
     1383+#include "ar5312_regs.h" 
    13841384+ 
    13851385+static void __iomem *ar5312_rst_base; 
     
    18641864+ 
    18651865+#include <ath25_platform.h> 
    1866 +#include <ar2315_regs.h> 
    1867 +#include <ar231x.h> 
     1866+ 
    18681867+#include "devices.h" 
    18691868+#include "ar2315.h" 
     1869+#include "ar2315_regs.h" 
    18701870+ 
    18711871+static void __iomem *ar2315_rst_base; 
     
    23372337+#endif 
    23382338--- /dev/null 
    2339 +++ b/arch/mips/include/asm/mach-ath25/ar231x.h 
    2340 @@ -0,0 +1,13 @@ 
    2341 +#ifndef __ASM_MACH_ATH25_AR231X_H 
    2342 +#define __ASM_MACH_ATH25_AR231X_H 
    2343 + 
    2344 +#include <linux/types.h> 
    2345 +#include <linux/io.h> 
     2339+++ b/arch/mips/ath25/devices.h 
     2340@@ -0,0 +1,44 @@ 
     2341+#ifndef __ATH25_DEVICES_H 
     2342+#define __ATH25_DEVICES_H 
    23462343+ 
    23472344+#define AR231X_MISC_IRQ_BASE           0x20 
    23482345+#define AR231X_GPIO_IRQ_BASE           0x30 
    23492346+ 
    2350 +/* Software's idea of interrupts handled by "CPU Interrupt Controller" */ 
    2351 +#define AR231X_IRQ_CPU_CLOCK   (MIPS_CPU_IRQ_BASE+7) /* C0_CAUSE: 0x8000 */ 
    2352 + 
    2353 +#endif /* __ASM_MACH_ATH25_AR231X_H */ 
    2354 --- /dev/null 
    2355 +++ b/arch/mips/ath25/devices.h 
    2356 @@ -0,0 +1,39 @@ 
    2357 +#ifndef __ATH25_DEVICES_H 
    2358 +#define __ATH25_DEVICES_H 
     2347+#define AR231X_IRQ_CPU_CLOCK   (MIPS_CPU_IRQ_BASE + 7) /* C0_CAUSE: 0x8000 */ 
    23592348+ 
    23602349+enum ath25_soc_type { 
     
    23962385--- /dev/null 
    23972386+++ b/arch/mips/ath25/devices.c 
    2398 @@ -0,0 +1,192 @@ 
     2387@@ -0,0 +1,191 @@ 
    23992388+#include <linux/kernel.h> 
    24002389+#include <linux/init.h> 
     
    24062395+ 
    24072396+#include <ath25_platform.h> 
    2408 +#include <ar231x.h> 
    24092397+#include "devices.h" 
    24102398+#include "ar5312.h" 
  • trunk/target/linux/atheros/patches-3.18/101-early-printk-support.patch

    r44712 r44724  
    1515+#include <asm/addrspace.h> 
    1616+ 
    17 +#include <asm/mach-ath25/ar2315_regs.h> 
    18 +#include <asm/mach-ath25/ar5312_regs.h> 
    1917+#include "devices.h" 
     18+#include "ar2315_regs.h" 
     19+#include "ar5312_regs.h" 
    2020+ 
    2121+static inline void prom_uart_wr(void __iomem *base, unsigned reg, 
  • trunk/target/linux/atheros/patches-3.18/210-reset_button.patch

    r44712 r44724  
    1212--- /dev/null 
    1313+++ b/arch/mips/ath25/reset.c 
    14 @@ -0,0 +1,58 @@ 
     14@@ -0,0 +1,57 @@ 
    1515+#include <linux/init.h> 
    1616+#include <linux/slab.h> 
     
    1919+#include <linux/input.h> 
    2020+#include <ath25_platform.h> 
    21 +#include <ar231x.h> 
    2221+#include "devices.h" 
    2322+ 
Note: See TracChangeset for help on using the changeset viewer.