1 From e43dec70614b55ba1ce24dfcdf8f51e36d800af2 Mon Sep 17 00:00:00 2001
2 From: Yangbo Lu <yangbo.lu@nxp.com>
3 Date: Wed, 17 Jan 2018 15:26:46 +0800
4 Subject: [PATCH 01/30] config: support layerscape
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 This is an integrated patch for layerscape config/makefile support.
11 Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
12 Signed-off-by: Zhang Ying-22455 <ying.zhang22455@nxp.com>
13 Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
14 Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
15 Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
16 Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
17 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
19 arch/arm/mach-imx/Kconfig | 1 +
20 drivers/base/Kconfig | 1 +
21 drivers/crypto/Makefile | 2 +-
22 drivers/net/ethernet/freescale/Kconfig | 4 ++-
23 drivers/net/ethernet/freescale/Makefile | 2 ++
24 drivers/ptp/Kconfig | 29 +++++++++++++++++++
25 drivers/rtc/Kconfig | 8 ++++++
26 drivers/rtc/Makefile | 1 +
27 drivers/soc/Kconfig | 3 +-
28 drivers/soc/fsl/Kconfig | 22 ++++++++++++++
29 drivers/soc/fsl/Kconfig.arm | 16 +++++++++++
30 drivers/soc/fsl/Makefile | 4 +++
31 drivers/soc/fsl/layerscape/Kconfig | 10 +++++++
32 drivers/soc/fsl/layerscape/Makefile | 1 +
33 drivers/staging/Kconfig | 6 ++++
34 drivers/staging/Makefile | 3 ++
35 drivers/staging/fsl-dpaa2/Kconfig | 51 +++++++++++++++++++++++++++++++++
36 drivers/staging/fsl-dpaa2/Makefile | 9 ++++++
37 18 files changed, 169 insertions(+), 4 deletions(-)
38 create mode 100644 drivers/soc/fsl/Kconfig
39 create mode 100644 drivers/soc/fsl/Kconfig.arm
40 create mode 100644 drivers/soc/fsl/layerscape/Kconfig
41 create mode 100644 drivers/soc/fsl/layerscape/Makefile
42 create mode 100644 drivers/staging/fsl-dpaa2/Kconfig
43 create mode 100644 drivers/staging/fsl-dpaa2/Makefile
45 --- a/arch/arm/mach-imx/Kconfig
46 +++ b/arch/arm/mach-imx/Kconfig
49 bool "Freescale i.MX family"
50 depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
51 + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
52 select ARCH_SUPPORTS_BIG_ENDIAN
54 select GENERIC_IRQ_CHIP
55 --- a/drivers/base/Kconfig
56 +++ b/drivers/base/Kconfig
57 @@ -240,6 +240,7 @@ config GENERIC_CPU_VULNERABILITIES
63 source "drivers/base/regmap/Kconfig"
65 --- a/drivers/crypto/Makefile
66 +++ b/drivers/crypto/Makefile
67 @@ -3,7 +3,7 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += at
68 obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o
69 obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o
70 obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/
71 -obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam/
72 +obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON) += caam/
73 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
74 obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
75 obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o
76 --- a/drivers/net/ethernet/freescale/Kconfig
77 +++ b/drivers/net/ethernet/freescale/Kconfig
79 config NET_VENDOR_FREESCALE
80 bool "Freescale devices"
82 - depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
83 + depends on FSL_SOC || (QUICC_ENGINE && PPC32) || CPM1 || CPM2 || PPC_MPC512x || \
84 M523x || M527x || M5272 || M528x || M520x || M532x || \
85 ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \
87 @@ -93,4 +93,6 @@ config GIANFAR
88 and MPC86xx family of chips, the eTSEC on LS1021A and the FEC
91 +source "drivers/net/ethernet/freescale/sdk_fman/Kconfig"
92 +source "drivers/net/ethernet/freescale/sdk_dpaa/Kconfig"
93 endif # NET_VENDOR_FREESCALE
94 --- a/drivers/net/ethernet/freescale/Makefile
95 +++ b/drivers/net/ethernet/freescale/Makefile
96 @@ -21,4 +21,6 @@ gianfar_driver-objs := gianfar.o \
97 obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
98 ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
100 +obj-$(if $(CONFIG_FSL_SDK_FMAN),y) += sdk_fman/
101 +obj-$(if $(CONFIG_FSL_SDK_DPAA_ETH),y) += sdk_dpaa/
102 obj-$(CONFIG_FSL_FMAN) += fman/
103 --- a/drivers/ptp/Kconfig
104 +++ b/drivers/ptp/Kconfig
105 @@ -39,6 +39,35 @@ config PTP_1588_CLOCK_GIANFAR
106 To compile this driver as a module, choose M here: the module
107 will be called gianfar_ptp.
109 +config PTP_1588_CLOCK_DPAA
110 + tristate "Freescale DPAA as PTP clock"
111 + depends on FSL_SDK_DPAA_ETH
112 + select PTP_1588_CLOCK
116 + This driver adds support for using the DPAA 1588 timer module
117 + as a PTP clock. This clock is only useful if your PTP programs are
118 + getting hardware time stamps on the PTP Ethernet packets
119 + using the SO_TIMESTAMPING API.
121 + To compile this driver as a module, choose M here: the module
122 + will be called dpaa_ptp.
124 +config PTP_1588_CLOCK_DPAA2
125 + tristate "Freescale DPAA2 as PTP clock"
126 + depends on FSL_DPAA2_ETH
127 + select PTP_1588_CLOCK
130 + This driver adds support for using the DPAA2 1588 timer module
131 + as a PTP clock. This clock is only useful if your PTP programs are
132 + getting hardware time stamps on the PTP Ethernet packets
133 + using the SO_TIMESTAMPING API.
135 + To compile this driver as a module, choose M here: the module
136 + will be called dpaa2-rtc.
138 config PTP_1588_CLOCK_IXP46X
139 tristate "Intel IXP46x as PTP clock"
140 depends on IXP4XX_ETH
141 --- a/drivers/rtc/Kconfig
142 +++ b/drivers/rtc/Kconfig
143 @@ -414,6 +414,14 @@ config RTC_DRV_PCF85063
144 This driver can also be built as a module. If so, the module
145 will be called rtc-pcf85063.
147 +config RTC_DRV_PCF85263
148 + tristate "NXP PCF85263"
150 + If you say yes here you get support for the PCF85263 RTC chip
152 + This driver can also be built as a module. If so, the module
153 + will be called rtc-pcf85263.
155 config RTC_DRV_PCF8563
156 tristate "Philips PCF8563/Epson RTC8564"
158 --- a/drivers/rtc/Makefile
159 +++ b/drivers/rtc/Makefile
160 @@ -111,6 +111,7 @@ obj-$(CONFIG_RTC_DRV_PCF2127) += rtc-pcf
161 obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
162 obj-$(CONFIG_RTC_DRV_PCF85063) += rtc-pcf85063.o
163 obj-$(CONFIG_RTC_DRV_PCF8523) += rtc-pcf8523.o
164 +obj-$(CONFIG_RTC_DRV_PCF85263) += rtc-pcf85263.o
165 obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o
166 obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o
167 obj-$(CONFIG_RTC_DRV_PIC32) += rtc-pic32.o
168 --- a/drivers/soc/Kconfig
169 +++ b/drivers/soc/Kconfig
171 menu "SOC (System On Chip) specific Drivers"
173 source "drivers/soc/bcm/Kconfig"
174 -source "drivers/soc/fsl/qbman/Kconfig"
175 -source "drivers/soc/fsl/qe/Kconfig"
176 +source "drivers/soc/fsl/Kconfig"
177 source "drivers/soc/mediatek/Kconfig"
178 source "drivers/soc/qcom/Kconfig"
179 source "drivers/soc/rockchip/Kconfig"
181 +++ b/drivers/soc/fsl/Kconfig
184 +# Freescale SOC drivers
187 +source "drivers/soc/fsl/qbman/Kconfig"
188 +source "drivers/soc/fsl/qe/Kconfig"
189 +source "drivers/soc/fsl/ls2-console/Kconfig"
195 + The global utilities block controls power management, I/O device
196 + enabling, power-onreset(POR) configuration monitoring, alternate
197 + function selection for multiplexed signals,and clock control.
198 + This driver is to manage and access global utilities block.
199 + Initially only reading SVR and registering soc device are supported.
200 + Other guts accesses, such as reading RCW, should eventually be moved
201 + into this driver as well.
203 +source "drivers/soc/fsl/Kconfig.arm"
206 +++ b/drivers/soc/fsl/Kconfig.arm
209 +# Freescale ARM SOC Drivers
212 +config LS_SOC_DRIVERS
213 + bool "Layerscape Soc Drivers"
214 + depends on ARCH_LAYERSCAPE || SOC_LS1021A
217 + Say y here to enable Freescale Layerscape Soc Device Drivers support.
218 + The Soc Drivers provides the device driver that is a specific block
219 + or feature on Layerscape platform.
222 + source "drivers/soc/fsl/layerscape/Kconfig"
224 --- a/drivers/soc/fsl/Makefile
225 +++ b/drivers/soc/fsl/Makefile
227 obj-$(CONFIG_FSL_DPAA) += qbman/
228 obj-$(CONFIG_QUICC_ENGINE) += qe/
229 obj-$(CONFIG_CPM) += qe/
230 +obj-$(CONFIG_FSL_GUTS) += guts.o
231 +obj-$(CONFIG_FSL_LS2_CONSOLE) += ls2-console/
232 +obj-$(CONFIG_SUSPEND) += rcpm.o
233 +obj-$(CONFIG_LS_SOC_DRIVERS) += layerscape/
235 +++ b/drivers/soc/fsl/layerscape/Kconfig
238 +# Layerscape Soc drivers
241 + bool "FTM alarm driver"
244 + Say y here to enable FTM alarm support. The FTM alarm provides
245 + alarm functions for wakeup system from deep sleep. There is only
246 + one FTM can be used in ALARM(FTM 0).
248 +++ b/drivers/soc/fsl/layerscape/Makefile
250 +obj-$(CONFIG_FTM_ALARM) += ftm_alarm.o
251 --- a/drivers/staging/Kconfig
252 +++ b/drivers/staging/Kconfig
253 @@ -94,6 +94,8 @@ source "drivers/staging/fbtft/Kconfig"
255 source "drivers/staging/fsl-mc/Kconfig"
257 +source "drivers/staging/fsl-dpaa2/Kconfig"
259 source "drivers/staging/wilc1000/Kconfig"
261 source "drivers/staging/most/Kconfig"
262 @@ -106,4 +108,8 @@ source "drivers/staging/greybus/Kconfig"
264 source "drivers/staging/vc04_services/Kconfig"
266 +source "drivers/staging/fsl_qbman/Kconfig"
268 +source "drivers/staging/fsl_ppfe/Kconfig"
271 --- a/drivers/staging/Makefile
272 +++ b/drivers/staging/Makefile
273 @@ -36,9 +36,12 @@ obj-$(CONFIG_UNISYSSPAR) += unisys/
274 obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
275 obj-$(CONFIG_FB_TFT) += fbtft/
276 obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
277 +obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
278 obj-$(CONFIG_WILC1000) += wilc1000/
279 obj-$(CONFIG_MOST) += most/
280 obj-$(CONFIG_ISDN_I4L) += i4l/
281 obj-$(CONFIG_KS7010) += ks7010/
282 obj-$(CONFIG_GREYBUS) += greybus/
283 obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
284 +obj-$(CONFIG_FSL_SDK_DPA) += fsl_qbman/
285 +obj-$(CONFIG_FSL_PPFE) += fsl_ppfe/
287 +++ b/drivers/staging/fsl-dpaa2/Kconfig
290 +# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
294 + bool "Freescale DPAA2 devices"
295 + depends on FSL_MC_BUS
297 + Build drivers for Freescale DataPath Acceleration
298 + Architecture (DPAA2) family of SoCs.
300 +config FSL_DPAA2_ETH
301 + tristate "Freescale DPAA2 Ethernet"
302 + depends on FSL_DPAA2 && FSL_MC_DPIO
304 + Ethernet driver for Freescale DPAA2 SoCs, using the
305 + Freescale MC bus driver
308 +config FSL_DPAA2_ETH_USE_ERR_QUEUE
309 + bool "Enable Rx error queue"
312 + Allow Rx error frames to be enqueued on an error queue
313 + and processed by the driver (by default they are dropped
315 + This may impact performance, recommended for debugging
318 +# QBMAN_DEBUG requires some additional DPIO APIs
319 +config FSL_DPAA2_ETH_DEBUGFS
320 + depends on DEBUG_FS && FSL_QBMAN_DEBUG
321 + bool "Enable debugfs support"
324 + Enable advanced statistics through debugfs interface.
326 +config FSL_DPAA2_ETH_DCB
327 + bool "Data Center Bridging (DCB) Support"
331 + Say Y here if you want to use Data Center Bridging (DCB) features
332 + (PFC) in the driver.
337 +source "drivers/staging/fsl-dpaa2/mac/Kconfig"
338 +source "drivers/staging/fsl-dpaa2/evb/Kconfig"
339 +source "drivers/staging/fsl-dpaa2/ethsw/Kconfig"
341 +++ b/drivers/staging/fsl-dpaa2/Makefile
344 +# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
347 +obj-$(CONFIG_FSL_DPAA2_ETH) += ethernet/
348 +obj-$(CONFIG_FSL_DPAA2_MAC) += mac/
349 +obj-$(CONFIG_FSL_DPAA2_EVB) += evb/
350 +obj-$(CONFIG_FSL_DPAA2_ETHSW) += ethsw/
351 +obj-$(CONFIG_PTP_1588_CLOCK_DPAA2) += rtc/