Skip to content

Commit 062887b

Browse files
geertuhorms
geertu
authored and
horms
committed
ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/
For consistency with arm64, where vendors have a single Kconfig symbol in arch/arm64/Kconfig.platforms. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
1 parent fa43948 commit 062887b

File tree

2 files changed

+139
-135
lines changed

2 files changed

+139
-135
lines changed

‎arch/arm/mach-shmobile/Kconfig

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,6 @@ config PM_RMOBILE
44
select PM
55
select PM_GENERIC_DOMAINS
66

7-
config ARCH_RCAR_GEN1
8-
bool
9-
select PM
10-
select PM_GENERIC_DOMAINS
11-
select RENESAS_INTC_IRQPIN
12-
select SYS_SUPPORTS_SH_TMU
13-
14-
config ARCH_RCAR_GEN2
15-
bool
16-
select HAVE_ARM_ARCH_TIMER
17-
select PM
18-
select PM_GENERIC_DOMAINS
19-
select RENESAS_IRQC
20-
select SYS_SUPPORTS_SH_CMT
21-
22-
config ARCH_RMOBILE
23-
bool
24-
select PM_RMOBILE
25-
select SYS_SUPPORTS_SH_CMT
26-
select SYS_SUPPORTS_SH_TMU
27-
28-
config ARCH_RZN1
29-
bool
30-
select ARM_AMBA
31-
327
menuconfig ARCH_RENESAS
338
bool "Renesas ARM SoCs"
349
depends on ARCH_MULTI_V7 && MMU
@@ -38,104 +13,3 @@ menuconfig ARCH_RENESAS
3813
select PINCTRL
3914
select SOC_BUS
4015
select ZONE_DMA if ARM_LPAE
41-
42-
if ARCH_RENESAS
43-
44-
#comment "Renesas ARM SoCs System Type"
45-
46-
config ARCH_EMEV2
47-
bool "Emma Mobile EV2"
48-
select HAVE_ARM_SCU if SMP
49-
select SYS_SUPPORTS_EM_STI
50-
51-
config ARCH_R7S72100
52-
bool "RZ/A1H (R7S72100)"
53-
select PM
54-
select PM_GENERIC_DOMAINS
55-
select SYS_SUPPORTS_SH_MTU2
56-
select RENESAS_OSTM
57-
58-
config ARCH_R7S9210
59-
bool "RZ/A2 (R7S9210)"
60-
select PM
61-
select PM_GENERIC_DOMAINS
62-
select RENESAS_OSTM
63-
64-
config ARCH_R8A73A4
65-
bool "R-Mobile APE6 (R8A73A40)"
66-
select ARCH_RMOBILE
67-
select ARM_ERRATA_798181 if SMP
68-
select HAVE_ARM_ARCH_TIMER
69-
select RENESAS_IRQC
70-
71-
config ARCH_R8A7740
72-
bool "R-Mobile A1 (R8A77400)"
73-
select ARCH_RMOBILE
74-
select RENESAS_INTC_IRQPIN
75-
76-
config ARCH_R8A7743
77-
bool "RZ/G1M (R8A77430)"
78-
select ARCH_RCAR_GEN2
79-
select ARM_ERRATA_798181 if SMP
80-
81-
config ARCH_R8A7744
82-
bool "RZ/G1N (R8A77440)"
83-
select ARCH_RCAR_GEN2
84-
select ARM_ERRATA_798181 if SMP
85-
86-
config ARCH_R8A7745
87-
bool "RZ/G1E (R8A77450)"
88-
select ARCH_RCAR_GEN2
89-
90-
config ARCH_R8A77470
91-
bool "RZ/G1C (R8A77470)"
92-
select ARCH_RCAR_GEN2
93-
94-
config ARCH_R8A7778
95-
bool "R-Car M1A (R8A77781)"
96-
select ARCH_RCAR_GEN1
97-
98-
config ARCH_R8A7779
99-
bool "R-Car H1 (R8A77790)"
100-
select HAVE_ARM_SCU if SMP
101-
select HAVE_ARM_TWD if SMP
102-
select ARCH_RCAR_GEN1
103-
104-
config ARCH_R8A7790
105-
bool "R-Car H2 (R8A77900)"
106-
select ARCH_RCAR_GEN2
107-
select ARM_ERRATA_798181 if SMP
108-
select I2C
109-
110-
config ARCH_R8A7791
111-
bool "R-Car M2-W (R8A77910)"
112-
select ARCH_RCAR_GEN2
113-
select ARM_ERRATA_798181 if SMP
114-
select I2C
115-
116-
config ARCH_R8A7792
117-
bool "R-Car V2H (R8A77920)"
118-
select ARCH_RCAR_GEN2
119-
select ARM_ERRATA_798181 if SMP
120-
121-
config ARCH_R8A7793
122-
bool "R-Car M2-N (R8A7793)"
123-
select ARCH_RCAR_GEN2
124-
select ARM_ERRATA_798181 if SMP
125-
select I2C
126-
127-
config ARCH_R8A7794
128-
bool "R-Car E2 (R8A77940)"
129-
select ARCH_RCAR_GEN2
130-
131-
config ARCH_R9A06G032
132-
bool "RZ/N1D (R9A06G032)"
133-
select ARCH_RZN1
134-
135-
config ARCH_SH73A0
136-
bool "SH-Mobile AG5 (R8A73A00)"
137-
select ARCH_RMOBILE
138-
select HAVE_ARM_SCU if SMP
139-
select HAVE_ARM_TWD if SMP
140-
select RENESAS_INTC_IRQPIN
141-
endif

‎drivers/soc/renesas/Kconfig

Lines changed: 139 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@ config SOC_RENESAS
33
bool "Renesas SoC driver support" if COMPILE_TEST && !ARCH_RENESAS
44
default y if ARCH_RENESAS
55
select SOC_BUS
6-
select RST_RCAR if ARCH_RCAR_GEN1 || ARCH_RCAR_GEN2
7-
select SYSC_R8A7743 if ARCH_R8A7743 || ARCH_R8A7744
8-
select SYSC_R8A7745 if ARCH_R8A7745
9-
select SYSC_R8A77470 if ARCH_R8A77470
10-
select SYSC_R8A7779 if ARCH_R8A7779
11-
select SYSC_R8A7790 if ARCH_R8A7790
12-
select SYSC_R8A7791 if ARCH_R8A7791 || ARCH_R8A7793
13-
select SYSC_R8A7792 if ARCH_R8A7792
14-
select SYSC_R8A7794 if ARCH_R8A7794
156

167
if SOC_RENESAS
178

9+
config ARCH_RCAR_GEN1
10+
bool
11+
select PM
12+
select PM_GENERIC_DOMAINS
13+
select RENESAS_INTC_IRQPIN
14+
select RST_RCAR
15+
select SYS_SUPPORTS_SH_TMU
16+
17+
config ARCH_RCAR_GEN2
18+
bool
19+
select HAVE_ARM_ARCH_TIMER
20+
select PM
21+
select PM_GENERIC_DOMAINS
22+
select RENESAS_IRQC
23+
select RST_RCAR
24+
select SYS_SUPPORTS_SH_CMT
25+
1826
config ARCH_RCAR_GEN3
1927
bool
2028
select PM
@@ -24,6 +32,128 @@ config ARCH_RCAR_GEN3
2432
select SYS_SUPPORTS_SH_CMT
2533
select SYS_SUPPORTS_SH_TMU
2634

35+
config ARCH_RMOBILE
36+
bool
37+
select PM_RMOBILE
38+
select SYS_SUPPORTS_SH_CMT
39+
select SYS_SUPPORTS_SH_TMU
40+
41+
config ARCH_RZN1
42+
bool
43+
select ARM_AMBA
44+
45+
if ARM
46+
47+
#comment "Renesas ARM SoCs System Type"
48+
49+
config ARCH_EMEV2
50+
bool "Emma Mobile EV2"
51+
select HAVE_ARM_SCU if SMP
52+
select SYS_SUPPORTS_EM_STI
53+
54+
config ARCH_R7S72100
55+
bool "RZ/A1H (R7S72100)"
56+
select PM
57+
select PM_GENERIC_DOMAINS
58+
select SYS_SUPPORTS_SH_MTU2
59+
select RENESAS_OSTM
60+
61+
config ARCH_R7S9210
62+
bool "RZ/A2 (R7S9210)"
63+
select PM
64+
select PM_GENERIC_DOMAINS
65+
select RENESAS_OSTM
66+
67+
config ARCH_R8A73A4
68+
bool "R-Mobile APE6 (R8A73A40)"
69+
select ARCH_RMOBILE
70+
select ARM_ERRATA_798181 if SMP
71+
select HAVE_ARM_ARCH_TIMER
72+
select RENESAS_IRQC
73+
74+
config ARCH_R8A7740
75+
bool "R-Mobile A1 (R8A77400)"
76+
select ARCH_RMOBILE
77+
select RENESAS_INTC_IRQPIN
78+
79+
config ARCH_R8A7743
80+
bool "RZ/G1M (R8A77430)"
81+
select ARCH_RCAR_GEN2
82+
select ARM_ERRATA_798181 if SMP
83+
select SYSC_R8A7743
84+
85+
config ARCH_R8A7744
86+
bool "RZ/G1N (R8A77440)"
87+
select ARCH_RCAR_GEN2
88+
select ARM_ERRATA_798181 if SMP
89+
select SYSC_R8A7743
90+
91+
config ARCH_R8A7745
92+
bool "RZ/G1E (R8A77450)"
93+
select ARCH_RCAR_GEN2
94+
select SYSC_R8A7745
95+
96+
config ARCH_R8A77470
97+
bool "RZ/G1C (R8A77470)"
98+
select ARCH_RCAR_GEN2
99+
select SYSC_R8A77470
100+
101+
config ARCH_R8A7778
102+
bool "R-Car M1A (R8A77781)"
103+
select ARCH_RCAR_GEN1
104+
105+
config ARCH_R8A7779
106+
bool "R-Car H1 (R8A77790)"
107+
select ARCH_RCAR_GEN1
108+
select HAVE_ARM_SCU if SMP
109+
select HAVE_ARM_TWD if SMP
110+
select SYSC_R8A7779
111+
112+
config ARCH_R8A7790
113+
bool "R-Car H2 (R8A77900)"
114+
select ARCH_RCAR_GEN2
115+
select ARM_ERRATA_798181 if SMP
116+
select I2C
117+
select SYSC_R8A7790
118+
119+
config ARCH_R8A7791
120+
bool "R-Car M2-W (R8A77910)"
121+
select ARCH_RCAR_GEN2
122+
select ARM_ERRATA_798181 if SMP
123+
select I2C
124+
select SYSC_R8A7791
125+
126+
config ARCH_R8A7792
127+
bool "R-Car V2H (R8A77920)"
128+
select ARCH_RCAR_GEN2
129+
select ARM_ERRATA_798181 if SMP
130+
select SYSC_R8A7792
131+
132+
config ARCH_R8A7793
133+
bool "R-Car M2-N (R8A7793)"
134+
select ARCH_RCAR_GEN2
135+
select ARM_ERRATA_798181 if SMP
136+
select I2C
137+
select SYSC_R8A7791
138+
139+
config ARCH_R8A7794
140+
bool "R-Car E2 (R8A77940)"
141+
select ARCH_RCAR_GEN2
142+
select SYSC_R8A7794
143+
144+
config ARCH_R9A06G032
145+
bool "RZ/N1D (R9A06G032)"
146+
select ARCH_RZN1
147+
148+
config ARCH_SH73A0
149+
bool "SH-Mobile AG5 (R8A73A00)"
150+
select ARCH_RMOBILE
151+
select HAVE_ARM_SCU if SMP
152+
select HAVE_ARM_TWD if SMP
153+
select RENESAS_INTC_IRQPIN
154+
155+
endif # ARM
156+
27157
if ARM64
28158

29159
config ARCH_R8A774A1

0 commit comments

Comments
 (0)