diff options
| author | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | 2022-07-22 14:21:17 -0500 |
|---|---|---|
| committer | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | 2022-07-22 14:21:17 -0500 |
| commit | 95b90aa828165df6c45d6bb0e1cce905e83a66a7 (patch) | |
| tree | 29a3cd39787b99fe9ee426fbaf2eb5c2ffb4d851 | |
| parent | 1e555a0d9d4e2667414875c20d041d0621028c2c (diff) | |
| parent | 2fbfb931b000ab8381e799165db206012075a4bf (diff) | |
Merged TI feature connectivity into ti-linux-5.10.y
TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.10.y
* 'connectivity-ti-linux-5.10.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity:
HACK: ti_config_fragments: audio_display: Bump up CMA size support Multimedia
net: ethernet: ti: am65-debugfs: Fix kernel crash if CONFIG_DEBUG_FS is not set in .config
arm64: dts: ti: k3-j7200: Fix MDIO clock
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/am65-cpsw-nuss.h | 16 | ||||
| -rw-r--r-- | ti_config_fragments/audio_display.cfg | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi index 99b747d17105..796d708c3b5a 100644 --- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi @@ -354,7 +354,7 @@ reg = <0x00 0xf00 0x00 0x100>; #address-cells = <1>; #size-cells = <0>; - clocks = <&k3_clks 19 0>; + clocks = <&k3_clks 19 33>; clock-names = "fck"; bus_freq = <1000000>; }; diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile index 58a22d3c4676..24cce9c34a04 100644 --- a/drivers/net/ethernet/ti/Makefile +++ b/drivers/net/ethernet/ti/Makefile @@ -25,7 +25,8 @@ obj-$(CONFIG_TI_KEYSTONE_NETCP_ETHSS) += keystone_netcp_ethss.o keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o cpsw_ale.o obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o -ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o k3-cppi-desc-pool.o am65-cpsw-qos.o am65-debugfs.o +ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o k3-cppi-desc-pool.o am65-cpsw-qos.o +ti-am65-cpsw-nuss-$(CONFIG_DEBUG_FS) += am65-debugfs.o ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h index edb9c1df9d21..1874bbc37b70 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -201,8 +201,24 @@ int am65_cpsw_nuss_update_tx_chns(struct am65_cpsw_common *common, int num_tx); bool am65_cpsw_port_dev_check(const struct net_device *dev); +#if IS_ENABLED(CONFIG_DEBUG_FS) int am65_cpsw_nuss_register_port_debugfs(struct am65_cpsw_port *port); int am65_cpsw_nuss_register_debugfs(struct am65_cpsw_common *common); void am65_cpsw_nuss_unregister_debugfs(struct am65_cpsw_common *common); +#else +static inline int am65_cpsw_nuss_register_port_debugfs(struct am65_cpsw_port *port) +{ + return 0; +} + +static inline int am65_cpsw_nuss_register_debugfs(struct am65_cpsw_common *common) +{ + return 0; +} + +static inline void am65_cpsw_nuss_unregister_debugfs(struct am65_cpsw_common *common) +{ +} +#endif #endif /* AM65_CPSW_NUSS_H_ */ diff --git a/ti_config_fragments/audio_display.cfg b/ti_config_fragments/audio_display.cfg index f0af52621482..1e61c835658e 100644 --- a/ti_config_fragments/audio_display.cfg +++ b/ti_config_fragments/audio_display.cfg @@ -4,7 +4,7 @@ CONFIG_CMA=y CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=144 +CONFIG_CMA_SIZE_MBYTES=512 # backlight |