feat(cn913x): defconfig cleanup, solidrun kernel cfg additions, copper and sfp patch
This commit is contained in:
parent
f262a81a04
commit
6c9137b68a
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,125 @@
|
|||
diff --git a/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts b/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
|
||||
index 42faebf55e28..0eb60884810a 100644
|
||||
--- a/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
|
||||
+++ b/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
|
||||
@@ -96,7 +96,7 @@ cp0_sfp_eth0: sfp-eth@0 {
|
||||
compatible = "sff,sfp";
|
||||
i2c-bus = <&i2c_sfp0>;
|
||||
mod-def0-gpio = <&cp0_gpio1 27 GPIO_ACTIVE_LOW>; //MPP27
|
||||
- //maximum-power-milliwatt = <2000>;
|
||||
+ maximum-power-milliwatt = <2000>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sfp_cp0_eth0_present_pins>;
|
||||
};
|
||||
@@ -173,7 +173,7 @@ rtc: rtc@68 {
|
||||
/*connected to rtc DS1339U-33+*/
|
||||
};
|
||||
i2c-switch@73 {
|
||||
- compatible = "nxp,pca9544";
|
||||
+ compatible = "nxp,pca9543";
|
||||
reg = <0x73>;
|
||||
#address-cells = <1>;
|
||||
#size-cell = <0>;
|
||||
@@ -246,11 +246,7 @@ &cp0_eth0 {
|
||||
managed = "in-band-status";
|
||||
|
||||
/* for SFP direct connectivity */
|
||||
-// sfp = <&cp0_sfp_eth0>;
|
||||
-
|
||||
- /* MBV-A BCM PHY | MBV-B VSC Microchip PHY */
|
||||
-// phy = <&cp0_sfi_phy8>; //address 0x01000
|
||||
-
|
||||
+ sfp = <&cp0_sfp_eth0>;
|
||||
};
|
||||
|
||||
/* SRDS #3 - SGMII 1GE on carrier board */
|
||||
@@ -303,6 +299,13 @@ spi-flash@0 {
|
||||
reg = <0x0>;
|
||||
spi-max-frequency = <10000000>;
|
||||
};
|
||||
+ spi-cpld@1 {
|
||||
+ compatible = "rohm,dh2228fv";
|
||||
+ reg = <0x1>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ spi-max-frequency = <10000000>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&cp0_syscon0 {
|
||||
diff --git a/arch/arm64/boot/dts/marvell/cn9131-bldn-mbv.dts b/arch/arm64/boot/dts/marvell/cn9131-bldn-mbv.dts
|
||||
index b0140000141c..fe93f180e4ac 100644
|
||||
--- a/arch/arm64/boot/dts/marvell/cn9131-bldn-mbv.dts
|
||||
+++ b/arch/arm64/boot/dts/marvell/cn9131-bldn-mbv.dts
|
||||
@@ -42,7 +42,7 @@ cp1_usb3_0_phy1: cp1_usb3_phy@1 {
|
||||
};
|
||||
cp1_sfp_eth0: sfp_eth0{
|
||||
compatible = "sff,sfp";
|
||||
- // i2c-bus = <&i2c_sfp1>;
|
||||
+ i2c-bus = <&i2c_sfp1>;
|
||||
mod-def0-gpio = <&cp1_gpio2 18 GPIO_ACTIVE_LOW>; //MPP50
|
||||
maximum-power-milliwatt = <2000>;
|
||||
pinctrl-0 = <&sfp_cp1_present_pins>;
|
||||
@@ -104,10 +104,7 @@ &cp1_eth0 {
|
||||
managed = "in-band-status";
|
||||
|
||||
/* for SFP direct connectivity */
|
||||
-// sfp = <&cp1_sfp_eth0>;
|
||||
-
|
||||
- /* MBV-A BCM PHY | MBV-B VSC Microchip PHY */
|
||||
- phy = <&cp1_sfi_phy9>; //address 0x01001
|
||||
+ sfp = <&cp1_sfp_eth0>;
|
||||
};
|
||||
|
||||
/* SRDS #3 - NC */
|
||||
@@ -142,25 +139,14 @@ &cp1_gpio2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
-&cp1_xmdio {
|
||||
- status = "okay";
|
||||
- pinctrl-0 = <&cp1_xmdio_pins>;
|
||||
- cp0_sfi_phy8: ethernet-phy@8 {
|
||||
- reg = <8>;
|
||||
- };
|
||||
- cp1_sfi_phy9: ethernet-phy@9 {
|
||||
- reg = <9>;
|
||||
- };
|
||||
-};
|
||||
-
|
||||
&cp1_mdio {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&cp1_mdio_pins>;
|
||||
cp0_vsc_phy18: ethernet-phy@18 {
|
||||
- reg = <18>;
|
||||
+ reg = <0x18>;
|
||||
};
|
||||
cp0_vsc_phy19: ethernet-phy@19 {
|
||||
- reg = <19>;
|
||||
+ reg = <0x19>;
|
||||
};
|
||||
|
||||
};
|
||||
@@ -237,18 +223,15 @@ cp1_uart1_pins: cp1-uart1-pins-1 {
|
||||
|
||||
/*************** definitions of addresses for cp0 eth ports ************/
|
||||
|
||||
-&cp0_eth0 {
|
||||
- status = "okay";
|
||||
- phy = <&cp0_sfi_phy8>; //address 0x01000
|
||||
-};
|
||||
-
|
||||
&cp0_eth1 {
|
||||
status = "okay";
|
||||
phy = <&cp0_vsc_phy18>; //address 0x0011000
|
||||
+ managed = "auto";
|
||||
};
|
||||
|
||||
&cp0_eth2 {
|
||||
status = "okay";
|
||||
phy = <&cp0_vsc_phy19>; //address 0x0011001
|
||||
+ managed = "auto";
|
||||
};
|
||||
-
|
||||
+
|
||||
\ No newline at end of file
|
||||
|
|
@ -0,0 +1,172 @@
|
|||
CONFIG_NET_DSA_MV88E6XXX=m
|
||||
CONFIG_USB_SERIAL=y
|
||||
CONFIG_USB_SERIAL_FTDI_SIO=y
|
||||
CONFIG_USB_SERIAL_WWAN=y
|
||||
CONFIG_USB_SERIAL_OPTION=y
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_SENSORS_PWM_FAN=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_SFP=y
|
||||
CONFIG_MARVELL_PHY=y
|
||||
CONFIG_MARVELL_10G_PHY=y
|
||||
CONFIG_SENSORS_MCP3021=y
|
||||
CONFIG_EEPROM_AT24=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
||||
CONFIG_ACPI_CPPC_CPUFREQ=y
|
||||
CONFIG_ARM_ARMADA_8K_CPUFREQ=y
|
||||
CONFIG_MICROSEMI_PHY=y
|
||||
CONFIG_QRTR_MHI=m
|
||||
CONFIG_MHI_BUS=m
|
||||
CONFIG_ATH11K=m
|
||||
CONFIG_ATH11K_AHB=m
|
||||
CONFIG_ATH11K_PCI=m
|
||||
CONFIG_ATH11K_DEBUG=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_R8169=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_DEBUG=y
|
||||
CONFIG_MTD_CONCAT=y
|
||||
CONFIG_MTD_PARTITIONS=y
|
||||
CONFIG_MTD_REDBOOT_PARTS=y
|
||||
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
CONFIG_MTD_AFS_PARTS=y
|
||||
CONFIG_MTD_CHAR=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_FTL=y
|
||||
CONFIG_GENERIC_IRQ_INJECTION=y
|
||||
CONFIG_TASKS_RUDE_RCU=y
|
||||
CONFIG_BOOT_CONFIG=y
|
||||
CONFIG_TRACEPOINTS=y
|
||||
# CONFIG_ACPI_APEI_PCIEAER is not set
|
||||
CONFIG_UPROBES=y
|
||||
CONFIG_COMPAT_NETLINK_MESSAGES=y
|
||||
# CONFIG_NET_DROP_MONITOR is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
CONFIG_WEXT_CORE=y
|
||||
CONFIG_WEXT_PROC=y
|
||||
CONFIG_WEXT_SPY=y
|
||||
CONFIG_WEXT_PRIV=y
|
||||
CONFIG_CFG80211_DEBUGFS=y
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_CFG80211_WEXT_EXPORT=y
|
||||
CONFIG_LIB80211=m
|
||||
CONFIG_LIB80211_CRYPT_WEP=m
|
||||
CONFIG_LIB80211_CRYPT_CCMP=m
|
||||
CONFIG_LIB80211_CRYPT_TKIP=m
|
||||
CONFIG_LIB80211_DEBUG=y
|
||||
CONFIG_MAC80211_DEBUGFS=y
|
||||
CONFIG_MAC80211_MESSAGE_TRACING=y
|
||||
CONFIG_MAC80211_DEBUG_MENU=y
|
||||
# CONFIG_MAC80211_NOINLINE is not set
|
||||
CONFIG_MAC80211_VERBOSE_DEBUG=y
|
||||
# CONFIG_MAC80211_MLME_DEBUG is not set
|
||||
CONFIG_MAC80211_STA_DEBUG=y
|
||||
# CONFIG_MAC80211_HT_DEBUG is not set
|
||||
# CONFIG_MAC80211_OCB_DEBUG is not set
|
||||
# CONFIG_MAC80211_IBSS_DEBUG is not set
|
||||
CONFIG_MAC80211_PS_DEBUG=y
|
||||
# CONFIG_MAC80211_TDLS_DEBUG is not set
|
||||
# CONFIG_MAC80211_DEBUG_COUNTERS is not set
|
||||
CONFIG_HOTPLUG_PCI_PCIE=y
|
||||
CONFIG_PCIEAER=y
|
||||
CONFIG_PCIEAER_INJECT=m
|
||||
CONFIG_PCIE_ECRC=y
|
||||
# CONFIG_PCIE_DPC is not set
|
||||
CONFIG_PCI_DEBUG=y
|
||||
# CONFIG_ATH10K_TRACING is not set
|
||||
# CONFIG_ATH11K_DEBUGFS is not set
|
||||
# CONFIG_ATH11K_TRACING is not set
|
||||
CONFIG_IPW2100=m
|
||||
CONFIG_IPW2100_MONITOR=y
|
||||
CONFIG_IPW2100_DEBUG=y
|
||||
CONFIG_IPW2200=m
|
||||
CONFIG_IPW2200_MONITOR=y
|
||||
CONFIG_IPW2200_RADIOTAP=y
|
||||
CONFIG_IPW2200_PROMISCUOUS=y
|
||||
CONFIG_IPW2200_QOS=y
|
||||
CONFIG_IPW2200_DEBUG=y
|
||||
CONFIG_LIBIPW=m
|
||||
CONFIG_LIBIPW_DEBUG=y
|
||||
CONFIG_IWLEGACY=m
|
||||
CONFIG_IWL4965=m
|
||||
CONFIG_IWL3945=m
|
||||
#
|
||||
# iwl3945 / iwl4965 Debugging Options
|
||||
#
|
||||
CONFIG_IWLEGACY_DEBUG=y
|
||||
# CONFIG_IWLEGACY_DEBUGFS is not set
|
||||
# end of iwl3945 / iwl4965 Debugging Options
|
||||
CONFIG_IWLWIFI=m
|
||||
CONFIG_IWLWIFI_LEDS=y
|
||||
CONFIG_IWLDVM=m
|
||||
CONFIG_IWLMVM=m
|
||||
CONFIG_IWLWIFI_OPMODE_MODULAR=y
|
||||
CONFIG_IWLWIFI_BCAST_FILTERING=y
|
||||
#
|
||||
# Debugging Options
|
||||
#
|
||||
CONFIG_IWLWIFI_DEBUG=y
|
||||
# CONFIG_IWLWIFI_DEBUGFS is not set
|
||||
CONFIG_IWLWIFI_DEVICE_TRACING=y
|
||||
# end of Debugging Options
|
||||
# CONFIG_WLAN_VENDOR_INTERSIL is not set
|
||||
# CONFIG_WLAN_VENDOR_RALINK is not set
|
||||
# CONFIG_PSTORE_FTRACE is not set
|
||||
CONFIG_BINARY_PRINTF=y
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
CONFIG_TRACE_IRQFLAGS=y
|
||||
CONFIG_STACKTRACE=y
|
||||
CONFIG_NOP_TRACER=y
|
||||
CONFIG_TRACER_MAX_TRACE=y
|
||||
CONFIG_RING_BUFFER=y
|
||||
CONFIG_EVENT_TRACING=y
|
||||
CONFIG_CONTEXT_SWITCH_TRACER=y
|
||||
CONFIG_RING_BUFFER_ALLOW_SWAP=y
|
||||
CONFIG_PREEMPTIRQ_TRACEPOINTS=y
|
||||
CONFIG_TRACING=y
|
||||
CONFIG_GENERIC_TRACER=y
|
||||
CONFIG_FTRACE=y
|
||||
CONFIG_BOOTTIME_TRACING=y
|
||||
CONFIG_FUNCTION_TRACER=y
|
||||
CONFIG_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_DYNAMIC_FTRACE=y
|
||||
# CONFIG_FUNCTION_PROFILER is not set
|
||||
# CONFIG_STACK_TRACER is not set
|
||||
CONFIG_TRACE_PREEMPT_TOGGLE=y
|
||||
CONFIG_IRQSOFF_TRACER=y
|
||||
CONFIG_PREEMPT_TRACER=y
|
||||
CONFIG_SCHED_TRACER=y
|
||||
# CONFIG_HWLAT_TRACER is not set
|
||||
# CONFIG_OSNOISE_TRACER is not set
|
||||
# CONFIG_TIMERLAT_TRACER is not set
|
||||
# CONFIG_FTRACE_SYSCALLS is not set
|
||||
CONFIG_TRACER_SNAPSHOT=y
|
||||
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
|
||||
CONFIG_BRANCH_PROFILE_NONE=y
|
||||
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
|
||||
# CONFIG_PROFILE_ALL_BRANCHES is not set
|
||||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
CONFIG_UPROBE_EVENTS=y
|
||||
CONFIG_DYNAMIC_EVENTS=y
|
||||
CONFIG_PROBE_EVENTS=y
|
||||
CONFIG_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
|
||||
# CONFIG_SYNTH_EVENTS is not set
|
||||
# CONFIG_HIST_TRIGGERS is not set
|
||||
# CONFIG_TRACE_EVENT_INJECT is not set
|
||||
# CONFIG_TRACEPOINT_BENCHMARK is not set
|
||||
# CONFIG_RING_BUFFER_BENCHMARK is not set
|
||||
# CONFIG_TRACE_EVAL_MAP_FILE is not set
|
||||
# CONFIG_FTRACE_RECORD_RECURSION is not set
|
||||
# CONFIG_FTRACE_STARTUP_TEST is not set
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
|
||||
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
|
||||
CONFIG_CMA_SIZE_MBYTES=128
|
||||
CONFIG_FUNCTION_TRACER
|
||||
CONFIG_FUNCTION_GRAPH_TRACER
|
||||
CONFIG_STACK_TRACER
|
||||
CONFIG_DYNAMIC_FTRACE
|
||||
|
|
@ -8,6 +8,8 @@ SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;us
|
|||
file://netfilter.cfg \
|
||||
file://0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch \
|
||||
file://0001-fix-phy-support-for-falcon-board.patch \
|
||||
file://0001-refactor-cn913x-defconfig-cleanup.patch \
|
||||
file://cn913x_additions.cfg \
|
||||
"
|
||||
SRCREV ?= "be2f2f0c96e85ecec9d807397194e46bb8bea4a5"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue