Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3df3ea581
Branches Tags
openwrt_chaos_c...
/
target
/
linux
/
brcm63xx
/
patches-3.18
/
337-MIPS-BCM63XX-widen-cpuid-field.patch

337-MIPS-BCM63XX-widen-cpuid-field.patch 1.7 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. From f1477f6e3551fd6beecfee5368fed1325dcd421f Mon Sep 17 00:00:00 2001
    2. 

  2. From: Jonas Gorski <jogo@openwrt.org>
    3. 

  3. Date: Sat, 7 Dec 2013 14:54:51 +0100
    4. 

  4. Subject: [PATCH 47/53] MIPS: BCM63XX: widen cpuid field
    5. 

  5. 

  6. ---
    7. 

  7.  arch/mips/bcm63xx/cpu.c                          | 2 +-
    8. 

  8.  arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 8 ++++----
    9. 

  9.  2 files changed, 5 insertions(+), 5 deletions(-)
    10. 

  10. 

  11. --- a/arch/mips/bcm63xx/cpu.c
    12. 

  12. +++ b/arch/mips/bcm63xx/cpu.c
    13. 

  13. @@ -24,7 +24,7 @@ EXPORT_SYMBOL(bcm63xx_regs_base);
    14. 

  14.  const int *bcm63xx_irqs;
    15. 

  15.  EXPORT_SYMBOL(bcm63xx_irqs);
    16. 

  16.  
    17. 

  17. -u16 bcm63xx_cpu_id __read_mostly;
    18. 

  18. +u32 bcm63xx_cpu_id __read_mostly;
    19. 

  19.  EXPORT_SYMBOL(bcm63xx_cpu_id);
    20. 

  20.  
    21. 

  21.  static u32 bcm63xx_cpu_variant __read_mostly;
    22. 

  22. @@ -127,7 +127,7 @@ unsigned int bcm63xx_get_memory_size(voi
    23. 

  23.  
    24. 

  24.  static unsigned int detect_cpu_clock(void)
    25. 

  25.  {
    26. 

  26. -	u16 cpu_id = bcm63xx_get_cpu_id();
    27. 

  27. +	u32 cpu_id = bcm63xx_get_cpu_id();
    28. 

  28.  
    29. 

  29.  	switch (cpu_id) {
    30. 

  30.  	case BCM3368_CPU_ID:
    31. 

  31. --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
    32. 

  32. +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
    33. 

  33. @@ -27,7 +27,7 @@ u32 bcm63xx_get_cpu_variant(void);
    34. 

  34.  u8 bcm63xx_get_cpu_rev(void);
    35. 

  35.  unsigned int bcm63xx_get_cpu_freq(void);
    36. 

  36.  
    37. 

  37. -static inline u16 __pure __bcm63xx_get_cpu_id(const u16 cpu_id)
    38. 

  38. +static inline u32 __pure __bcm63xx_get_cpu_id(const u32 cpu_id)
    39. 

  39.  {
    40. 

  40.  	switch (cpu_id) {
    41. 

  41.  #ifdef CONFIG_BCM63XX_CPU_3368
    42. 

  42. @@ -69,11 +69,11 @@ static inline u16 __pure __bcm63xx_get_c
    43. 

  43.  	return cpu_id;
    44. 

  44.  }
    45. 

  45.  
    46. 

  46. -extern u16 bcm63xx_cpu_id;
    47. 

  47. +extern u32 bcm63xx_cpu_id;
    48. 

  48.  
    49. 

  49. -static inline u16 __pure bcm63xx_get_cpu_id(void)
    50. 

  50. +static inline u32 __pure bcm63xx_get_cpu_id(void)
    51. 

  51.  {
    52. 

  52. -	const u16 cpu_id = bcm63xx_cpu_id;
    53. 

  53. +	const u32 cpu_id = bcm63xx_cpu_id;
    54. 

  54.  
    55. 

  55.  	return __bcm63xx_get_cpu_id(cpu_id);
    56. 

  56.  }
    57.