Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f3a57a60d3e107d17aebb9e52b61c503e5bc14f9

Authored by Andres Salomon
Committed by Linus Torvalds
1 parent f060f27007
Exists in master and in 41 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb-lf-6.6.52-2.2.0-rc0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

cs5535: define lxfb/gxfb MSRs in linux/cs5535.h 

..and include them in the lxfb/gxfb drivers rather than asm/geode.h (where
possible).

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 9 changed files with 20 additions and 20 deletions Side-by-side Diff

arch/x86/include/asm/geode.h
Diff comments   View file @ f3a57a6
... ... @@ -31,24 +31,11 @@
31 31  
32 32 /* MSRS */
33 33  
34   -#define MSR_GLIU_P2D_RO0 0x10000029
35   -
36   -#define MSR_LX_GLD_MSR_CONFIG 0x48002001
37   -#define MSR_LX_MSR_PADSEL 0x48002011 /* NOT 0x48000011; the data
38   - * sheet has the wrong value */
39   -#define MSR_GLCP_SYS_RSTPLL 0x4C000014
40   -#define MSR_GLCP_DOTPLL 0x4C000015
41   -
42 34 #define MSR_LBAR_SMB 0x5140000B
43 35 #define MSR_LBAR_GPIO 0x5140000C
44 36 #define MSR_LBAR_MFGPT 0x5140000D
45 37 #define MSR_LBAR_ACPI 0x5140000E
46 38 #define MSR_LBAR_PMS 0x5140000F
47   -
48   -#define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */
49   -
50   -#define MSR_GX_GLD_MSR_CONFIG 0xC0002001
51   -#define MSR_GX_MSR_PADSEL 0xC0002011
52 39  
53 40 /* Resource Sizes */
54 41  
drivers/video/geode/display_gx.c
Diff comments   View file @ f3a57a6
... ... @@ -17,7 +17,7 @@
17 17 #include <asm/io.h>
18 18 #include <asm/div64.h>
19 19 #include <asm/delay.h>
20   -#include <asm/geode.h>
  20 +#include <linux/cs5535.h>
21 21  
22 22 #include "gxfb.h"
23 23  
drivers/video/geode/gxfb.h
Diff comments   View file @ f3a57a6
... ... @@ -340,7 +340,7 @@
340 340 }
341 341  
342 342  
343   -/* MSRs are defined in asm/geode.h; their bitfields are here */
  343 +/* MSRs are defined in linux/cs5535.h; their bitfields are here */
344 344  
345 345 #define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3)
346 346 #define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2)
drivers/video/geode/gxfb_core.c
Diff comments   View file @ f3a57a6
... ... @@ -32,7 +32,7 @@
32 32 #include <linux/suspend.h>
33 33 #include <linux/init.h>
34 34 #include <linux/pci.h>
35   -#include <asm/geode.h>
  35 +#include <linux/cs5535.h>
36 36  
37 37 #include "gxfb.h"
38 38  
drivers/video/geode/lxfb.h
Diff comments   View file @ f3a57a6
... ... @@ -409,7 +409,7 @@
409 409 }
410 410  
411 411  
412   -/* MSRs are defined in asm/geode.h; their bitfields are here */
  412 +/* MSRs are defined in linux/cs5535.h; their bitfields are here */
413 413  
414 414 #define MSR_GLCP_DOTPLL_LOCK (1 << 25) /* r/o */
415 415 #define MSR_GLCP_DOTPLL_HALFPIX (1 << 24)
drivers/video/geode/lxfb_ops.c
Diff comments   View file @ f3a57a6
... ... @@ -13,7 +13,7 @@
13 13 #include <linux/fb.h>
14 14 #include <linux/uaccess.h>
15 15 #include <linux/delay.h>
16   -#include <asm/geode.h>
  16 +#include <linux/cs5535.h>
17 17  
18 18 #include "lxfb.h"
19 19  
drivers/video/geode/suspend_gx.c
Diff comments   View file @ f3a57a6
... ... @@ -10,7 +10,7 @@
10 10 #include <linux/fb.h>
11 11 #include <asm/io.h>
12 12 #include <asm/msr.h>
13   -#include <asm/geode.h>
  13 +#include <linux/cs5535.h>
14 14 #include <asm/delay.h>
15 15  
16 16 #include "gxfb.h"
drivers/video/geode/video_gx.c
Diff comments   View file @ f3a57a6
... ... @@ -16,7 +16,7 @@
16 16 #include <asm/io.h>
17 17 #include <asm/delay.h>
18 18 #include <asm/msr.h>
19   -#include <asm/geode.h>
  19 +#include <linux/cs5535.h>
20 20  
21 21 #include "gxfb.h"
22 22  
include/linux/cs5535.h
Diff comments   View file @ f3a57a6
... ... @@ -12,6 +12,14 @@
12 12 #define _CS5535_H
13 13  
14 14 /* MSRs */
  15 +#define MSR_GLIU_P2D_RO0 0x10000029
  16 +
  17 +#define MSR_LX_GLD_MSR_CONFIG 0x48002001
  18 +#define MSR_LX_MSR_PADSEL 0x48002011 /* NOT 0x48000011; the data
  19 + * sheet has the wrong value */
  20 +#define MSR_GLCP_SYS_RSTPLL 0x4C000014
  21 +#define MSR_GLCP_DOTPLL 0x4C000015
  22 +
15 23 #define MSR_LBAR_SMB 0x5140000B
16 24 #define MSR_LBAR_GPIO 0x5140000C
17 25 #define MSR_LBAR_MFGPT 0x5140000D
... ... @@ -29,6 +37,11 @@
29 37 #define MSR_MFGPT_IRQ 0x51400028
30 38 #define MSR_MFGPT_NR 0x51400029
31 39 #define MSR_MFGPT_SETUP 0x5140002B
  40 +
  41 +#define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */
  42 +
  43 +#define MSR_GX_GLD_MSR_CONFIG 0xC0002001
  44 +#define MSR_GX_MSR_PADSEL 0xC0002011
32 45  
33 46 /* resource sizes */
34 47 #define LBAR_GPIO_SIZE 0xFF