a83eae385a
This patch is to update linux 4.9 patches to LSDK-18.06 release and to adjust config-4.9 accordingly. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
374 lines
12 KiB
Diff
374 lines
12 KiB
Diff
From 0774b97305507af18f8c43efb69aa00e6c57ae90 Mon Sep 17 00:00:00 2001
|
|
From: Yangbo Lu <yangbo.lu@nxp.com>
|
|
Date: Fri, 6 Jul 2018 15:31:14 +0800
|
|
Subject: [PATCH] config: support layerscape
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is an integrated patch for layerscape config/makefile support.
|
|
|
|
Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
|
|
Signed-off-by: Zhang Ying-22455 <ying.zhang22455@nxp.com>
|
|
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|
Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
|
|
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|
---
|
|
arch/arm/mach-imx/Kconfig | 1 +
|
|
drivers/base/Kconfig | 1 +
|
|
drivers/crypto/Makefile | 2 +-
|
|
drivers/net/ethernet/freescale/Kconfig | 4 +-
|
|
drivers/net/ethernet/freescale/Makefile | 2 +
|
|
drivers/ptp/Kconfig | 29 +++++++++++
|
|
drivers/rtc/Kconfig | 8 +++
|
|
drivers/rtc/Makefile | 1 +
|
|
drivers/soc/Kconfig | 3 +-
|
|
drivers/soc/fsl/Kconfig | 30 ++++++++++++
|
|
drivers/soc/fsl/Kconfig.arm | 16 ++++++
|
|
drivers/soc/fsl/Makefile | 5 ++
|
|
drivers/soc/fsl/layerscape/Kconfig | 10 ++++
|
|
drivers/soc/fsl/layerscape/Makefile | 1 +
|
|
drivers/staging/Kconfig | 6 +++
|
|
drivers/staging/Makefile | 3 ++
|
|
drivers/staging/fsl-dpaa2/Kconfig | 65 +++++++++++++++++++++++++
|
|
drivers/staging/fsl-dpaa2/Makefile | 9 ++++
|
|
18 files changed, 192 insertions(+), 4 deletions(-)
|
|
create mode 100644 drivers/soc/fsl/Kconfig
|
|
create mode 100644 drivers/soc/fsl/Kconfig.arm
|
|
create mode 100644 drivers/soc/fsl/layerscape/Kconfig
|
|
create mode 100644 drivers/soc/fsl/layerscape/Makefile
|
|
create mode 100644 drivers/staging/fsl-dpaa2/Kconfig
|
|
create mode 100644 drivers/staging/fsl-dpaa2/Makefile
|
|
|
|
--- a/arch/arm/mach-imx/Kconfig
|
|
+++ b/arch/arm/mach-imx/Kconfig
|
|
@@ -1,6 +1,7 @@
|
|
menuconfig ARCH_MXC
|
|
bool "Freescale i.MX family"
|
|
depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
|
|
+ select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
select ARCH_SUPPORTS_BIG_ENDIAN
|
|
select CLKSRC_IMX_GPT
|
|
select GENERIC_IRQ_CHIP
|
|
--- a/drivers/base/Kconfig
|
|
+++ b/drivers/base/Kconfig
|
|
@@ -240,6 +240,7 @@ config GENERIC_CPU_VULNERABILITIES
|
|
|
|
config SOC_BUS
|
|
bool
|
|
+ select GLOB
|
|
|
|
source "drivers/base/regmap/Kconfig"
|
|
|
|
--- a/drivers/crypto/Makefile
|
|
+++ b/drivers/crypto/Makefile
|
|
@@ -3,7 +3,7 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += at
|
|
obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o
|
|
obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o
|
|
obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/
|
|
-obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam/
|
|
+obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON) += caam/
|
|
obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
|
|
obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
|
|
obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o
|
|
--- a/drivers/net/ethernet/freescale/Kconfig
|
|
+++ b/drivers/net/ethernet/freescale/Kconfig
|
|
@@ -5,7 +5,7 @@
|
|
config NET_VENDOR_FREESCALE
|
|
bool "Freescale devices"
|
|
default y
|
|
- depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
|
|
+ depends on FSL_SOC || (QUICC_ENGINE && PPC32) || CPM1 || CPM2 || PPC_MPC512x || \
|
|
M523x || M527x || M5272 || M528x || M520x || M532x || \
|
|
ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \
|
|
ARCH_LAYERSCAPE
|
|
@@ -93,4 +93,6 @@ config GIANFAR
|
|
and MPC86xx family of chips, the eTSEC on LS1021A and the FEC
|
|
on the 8540.
|
|
|
|
+source "drivers/net/ethernet/freescale/sdk_fman/Kconfig"
|
|
+source "drivers/net/ethernet/freescale/sdk_dpaa/Kconfig"
|
|
endif # NET_VENDOR_FREESCALE
|
|
--- a/drivers/net/ethernet/freescale/Makefile
|
|
+++ b/drivers/net/ethernet/freescale/Makefile
|
|
@@ -21,4 +21,6 @@ gianfar_driver-objs := gianfar.o \
|
|
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
|
|
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
|
|
|
|
+obj-$(if $(CONFIG_FSL_SDK_FMAN),y) += sdk_fman/
|
|
+obj-$(if $(CONFIG_FSL_SDK_DPAA_ETH),y) += sdk_dpaa/
|
|
obj-$(CONFIG_FSL_FMAN) += fman/
|
|
--- a/drivers/ptp/Kconfig
|
|
+++ b/drivers/ptp/Kconfig
|
|
@@ -39,6 +39,35 @@ config PTP_1588_CLOCK_GIANFAR
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called gianfar_ptp.
|
|
|
|
+config PTP_1588_CLOCK_DPAA
|
|
+ tristate "Freescale DPAA as PTP clock"
|
|
+ depends on FSL_SDK_DPAA_ETH
|
|
+ select PTP_1588_CLOCK
|
|
+ select FSL_DPAA_TS
|
|
+ default n
|
|
+ help
|
|
+ This driver adds support for using the DPAA 1588 timer module
|
|
+ as a PTP clock. This clock is only useful if your PTP programs are
|
|
+ getting hardware time stamps on the PTP Ethernet packets
|
|
+ using the SO_TIMESTAMPING API.
|
|
+
|
|
+ To compile this driver as a module, choose M here: the module
|
|
+ will be called dpaa_ptp.
|
|
+
|
|
+config PTP_1588_CLOCK_DPAA2
|
|
+ tristate "Freescale DPAA2 as PTP clock"
|
|
+ depends on FSL_DPAA2_ETH
|
|
+ select PTP_1588_CLOCK
|
|
+ default y
|
|
+ help
|
|
+ This driver adds support for using the DPAA2 1588 timer module
|
|
+ as a PTP clock. This clock is only useful if your PTP programs are
|
|
+ getting hardware time stamps on the PTP Ethernet packets
|
|
+ using the SO_TIMESTAMPING API.
|
|
+
|
|
+ To compile this driver as a module, choose M here: the module
|
|
+ will be called dpaa2-rtc.
|
|
+
|
|
config PTP_1588_CLOCK_IXP46X
|
|
tristate "Intel IXP46x as PTP clock"
|
|
depends on IXP4XX_ETH
|
|
--- a/drivers/rtc/Kconfig
|
|
+++ b/drivers/rtc/Kconfig
|
|
@@ -414,6 +414,14 @@ config RTC_DRV_PCF85063
|
|
This driver can also be built as a module. If so, the module
|
|
will be called rtc-pcf85063.
|
|
|
|
+config RTC_DRV_PCF85263
|
|
+ tristate "NXP PCF85263"
|
|
+ help
|
|
+ If you say yes here you get support for the PCF85263 RTC chip
|
|
+
|
|
+ This driver can also be built as a module. If so, the module
|
|
+ will be called rtc-pcf85263.
|
|
+
|
|
config RTC_DRV_PCF8563
|
|
tristate "Philips PCF8563/Epson RTC8564"
|
|
help
|
|
--- a/drivers/rtc/Makefile
|
|
+++ b/drivers/rtc/Makefile
|
|
@@ -111,6 +111,7 @@ obj-$(CONFIG_RTC_DRV_PCF2127) += rtc-pcf
|
|
obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
|
|
obj-$(CONFIG_RTC_DRV_PCF85063) += rtc-pcf85063.o
|
|
obj-$(CONFIG_RTC_DRV_PCF8523) += rtc-pcf8523.o
|
|
+obj-$(CONFIG_RTC_DRV_PCF85263) += rtc-pcf85263.o
|
|
obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o
|
|
obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o
|
|
obj-$(CONFIG_RTC_DRV_PIC32) += rtc-pic32.o
|
|
--- a/drivers/soc/Kconfig
|
|
+++ b/drivers/soc/Kconfig
|
|
@@ -1,8 +1,7 @@
|
|
menu "SOC (System On Chip) specific Drivers"
|
|
|
|
source "drivers/soc/bcm/Kconfig"
|
|
-source "drivers/soc/fsl/qbman/Kconfig"
|
|
-source "drivers/soc/fsl/qe/Kconfig"
|
|
+source "drivers/soc/fsl/Kconfig"
|
|
source "drivers/soc/mediatek/Kconfig"
|
|
source "drivers/soc/qcom/Kconfig"
|
|
source "drivers/soc/rockchip/Kconfig"
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/Kconfig
|
|
@@ -0,0 +1,30 @@
|
|
+#
|
|
+# Freescale SOC drivers
|
|
+#
|
|
+
|
|
+source "drivers/soc/fsl/qbman/Kconfig"
|
|
+source "drivers/soc/fsl/qe/Kconfig"
|
|
+source "drivers/soc/fsl/ls2-console/Kconfig"
|
|
+
|
|
+config FSL_GUTS
|
|
+ bool
|
|
+ select SOC_BUS
|
|
+ help
|
|
+ The global utilities block controls power management, I/O device
|
|
+ enabling, power-onreset(POR) configuration monitoring, alternate
|
|
+ function selection for multiplexed signals,and clock control.
|
|
+ This driver is to manage and access global utilities block.
|
|
+ Initially only reading SVR and registering soc device are supported.
|
|
+ Other guts accesses, such as reading RCW, should eventually be moved
|
|
+ into this driver as well.
|
|
+
|
|
+config FSL_SLEEP_FSM
|
|
+ bool
|
|
+ help
|
|
+ This driver configures a hardware FSM (Finite State Machine) for deep sleep.
|
|
+ The FSM is used to finish clean-ups at the last stage of system entering deep
|
|
+ sleep, and also wakes up system when a wake up event happens.
|
|
+
|
|
+if ARM || ARM64
|
|
+source "drivers/soc/fsl/Kconfig.arm"
|
|
+endif
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/Kconfig.arm
|
|
@@ -0,0 +1,16 @@
|
|
+#
|
|
+# Freescale ARM SOC Drivers
|
|
+#
|
|
+
|
|
+config LS_SOC_DRIVERS
|
|
+ bool "Layerscape Soc Drivers"
|
|
+ depends on ARCH_LAYERSCAPE || SOC_LS1021A
|
|
+ default n
|
|
+ help
|
|
+ Say y here to enable Freescale Layerscape Soc Device Drivers support.
|
|
+ The Soc Drivers provides the device driver that is a specific block
|
|
+ or feature on Layerscape platform.
|
|
+
|
|
+if LS_SOC_DRIVERS
|
|
+ source "drivers/soc/fsl/layerscape/Kconfig"
|
|
+endif
|
|
--- a/drivers/soc/fsl/Makefile
|
|
+++ b/drivers/soc/fsl/Makefile
|
|
@@ -5,3 +5,8 @@
|
|
obj-$(CONFIG_FSL_DPAA) += qbman/
|
|
obj-$(CONFIG_QUICC_ENGINE) += qe/
|
|
obj-$(CONFIG_CPM) += qe/
|
|
+obj-$(CONFIG_FSL_GUTS) += guts.o
|
|
+obj-$(CONFIG_FSL_LS2_CONSOLE) += ls2-console/
|
|
+obj-$(CONFIG_SUSPEND) += rcpm.o
|
|
+obj-$(CONFIG_LS_SOC_DRIVERS) += layerscape/
|
|
+obj-$(CONFIG_FSL_SLEEP_FSM) += sleep_fsm.o
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/layerscape/Kconfig
|
|
@@ -0,0 +1,10 @@
|
|
+#
|
|
+# Layerscape Soc drivers
|
|
+#
|
|
+config FTM_ALARM
|
|
+ bool "FTM alarm driver"
|
|
+ default n
|
|
+ help
|
|
+ Say y here to enable FTM alarm support. The FTM alarm provides
|
|
+ alarm functions for wakeup system from deep sleep. There is only
|
|
+ one FTM can be used in ALARM(FTM 0).
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/layerscape/Makefile
|
|
@@ -0,0 +1 @@
|
|
+obj-$(CONFIG_FTM_ALARM) += ftm_alarm.o
|
|
--- a/drivers/staging/Kconfig
|
|
+++ b/drivers/staging/Kconfig
|
|
@@ -94,6 +94,8 @@ source "drivers/staging/fbtft/Kconfig"
|
|
|
|
source "drivers/staging/fsl-mc/Kconfig"
|
|
|
|
+source "drivers/staging/fsl-dpaa2/Kconfig"
|
|
+
|
|
source "drivers/staging/wilc1000/Kconfig"
|
|
|
|
source "drivers/staging/most/Kconfig"
|
|
@@ -106,4 +108,8 @@ source "drivers/staging/greybus/Kconfig"
|
|
|
|
source "drivers/staging/vc04_services/Kconfig"
|
|
|
|
+source "drivers/staging/fsl_qbman/Kconfig"
|
|
+
|
|
+source "drivers/staging/fsl_ppfe/Kconfig"
|
|
+
|
|
endif # STAGING
|
|
--- a/drivers/staging/Makefile
|
|
+++ b/drivers/staging/Makefile
|
|
@@ -36,9 +36,12 @@ obj-$(CONFIG_UNISYSSPAR) += unisys/
|
|
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
|
|
obj-$(CONFIG_FB_TFT) += fbtft/
|
|
obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
|
|
+obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
|
|
obj-$(CONFIG_WILC1000) += wilc1000/
|
|
obj-$(CONFIG_MOST) += most/
|
|
obj-$(CONFIG_ISDN_I4L) += i4l/
|
|
obj-$(CONFIG_KS7010) += ks7010/
|
|
obj-$(CONFIG_GREYBUS) += greybus/
|
|
obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
|
|
+obj-$(CONFIG_FSL_SDK_DPA) += fsl_qbman/
|
|
+obj-$(CONFIG_FSL_PPFE) += fsl_ppfe/
|
|
--- /dev/null
|
|
+++ b/drivers/staging/fsl-dpaa2/Kconfig
|
|
@@ -0,0 +1,65 @@
|
|
+#
|
|
+# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
|
|
+#
|
|
+
|
|
+config FSL_DPAA2
|
|
+ bool "Freescale DPAA2 devices"
|
|
+ depends on FSL_MC_BUS
|
|
+ ---help---
|
|
+ Build drivers for Freescale DataPath Acceleration
|
|
+ Architecture (DPAA2) family of SoCs.
|
|
+
|
|
+config FSL_DPAA2_ETH
|
|
+ tristate "Freescale DPAA2 Ethernet"
|
|
+ depends on FSL_DPAA2 && FSL_MC_DPIO
|
|
+ ---help---
|
|
+ Ethernet driver for Freescale DPAA2 SoCs, using the
|
|
+ Freescale MC bus driver
|
|
+
|
|
+if FSL_DPAA2_ETH
|
|
+config FSL_DPAA2_ETH_USE_ERR_QUEUE
|
|
+ bool "Enable Rx error queue"
|
|
+ default n
|
|
+ ---help---
|
|
+ Allow Rx error frames to be enqueued on an error queue
|
|
+ and processed by the driver (by default they are dropped
|
|
+ in hardware).
|
|
+ This may impact performance, recommended for debugging
|
|
+ purposes only.
|
|
+
|
|
+# QBMAN_DEBUG requires some additional DPIO APIs
|
|
+config FSL_DPAA2_ETH_DEBUGFS
|
|
+ depends on DEBUG_FS
|
|
+ bool "Enable debugfs support"
|
|
+ default n
|
|
+ ---help---
|
|
+ Enable advanced statistics through debugfs interface.
|
|
+
|
|
+config FSL_DPAA2_ETH_DCB
|
|
+ bool "Data Center Bridging (DCB) Support"
|
|
+ default n
|
|
+ depends on DCB
|
|
+ ---help---
|
|
+ Say Y here if you want to use Data Center Bridging (DCB) features
|
|
+ (PFC) in the driver.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
+config FSL_DPAA2_ETH_CEETM
|
|
+ depends on NET_SCHED
|
|
+ bool "DPAA2 Ethernet CEETM QoS"
|
|
+ default n
|
|
+ ---help---
|
|
+ Enable QoS offloading support through the CEETM hardware block.
|
|
+endif
|
|
+
|
|
+source "drivers/staging/fsl-dpaa2/mac/Kconfig"
|
|
+source "drivers/staging/fsl-dpaa2/evb/Kconfig"
|
|
+
|
|
+config FSL_DPAA2_ETHSW
|
|
+ tristate "Freescale DPAA2 Ethernet Switch"
|
|
+ depends on FSL_DPAA2
|
|
+ depends on NET_SWITCHDEV
|
|
+ ---help---
|
|
+ Driver for Freescale DPAA2 Ethernet Switch. Select
|
|
+ BRIDGE to have support for bridge tools.
|
|
--- /dev/null
|
|
+++ b/drivers/staging/fsl-dpaa2/Makefile
|
|
@@ -0,0 +1,9 @@
|
|
+#
|
|
+# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
|
|
+#
|
|
+
|
|
+obj-$(CONFIG_FSL_DPAA2_ETH) += ethernet/
|
|
+obj-$(CONFIG_FSL_DPAA2_MAC) += mac/
|
|
+obj-$(CONFIG_FSL_DPAA2_EVB) += evb/
|
|
+obj-$(CONFIG_PTP_1588_CLOCK_DPAA2) += rtc/
|
|
+obj-$(CONFIG_FSL_DPAA2_ETHSW) += ethsw/
|