Skip to content

Commit 26640e5

Browse files
committed
Sunxi64: Update CONFIG_CAN_* and CONFIG_CPU_FREQ_*
#8368 (review) Signed-off-by: Patrick Yavitz <[email protected]>
1 parent 8155cc5 commit 26640e5

File tree

2 files changed

+64
-4
lines changed

2 files changed

+64
-4
lines changed

config/kernel/linux-sunxi64-current.config

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
5656
CONFIG_ARM_PSCI_CPUIDLE=y
5757
CONFIG_CPU_FREQ=y
5858
CONFIG_CPU_FREQ_STAT=y
59-
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
59+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
6060
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
6161
CONFIG_CPU_FREQ_GOV_USERSPACE=y
62-
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
6362
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
6463
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
6564
CONFIG_CPUFREQ_DT=y
@@ -644,6 +643,37 @@ CONFIG_AC200_PHY=y
644643
CONFIG_AC200_PHY_SUNXI=m
645644
CONFIG_REALTEK_PHY=y
646645
CONFIG_SMSC_PHY=y
646+
CONFIG_CAN_VCAN=m
647+
CONFIG_CAN_VXCAN=m
648+
CONFIG_CAN_CAN327=m
649+
CONFIG_CAN_FLEXCAN=m
650+
CONFIG_CAN_GRCAN=m
651+
CONFIG_CAN_KVASER_PCIEFD=m
652+
CONFIG_CAN_SLCAN=m
653+
CONFIG_CAN_XILINXCAN=m
654+
CONFIG_CAN_C_CAN=m
655+
CONFIG_CAN_CC770=m
656+
CONFIG_CAN_CTUCANFD_PCI=m
657+
CONFIG_CAN_CTUCANFD_PLATFORM=m
658+
CONFIG_CAN_ESD_402_PCI=m
659+
CONFIG_CAN_IFI_CANFD=m
660+
CONFIG_CAN_M_CAN=m
661+
CONFIG_CAN_PEAK_PCIEFD=m
662+
CONFIG_CAN_SJA1000=m
663+
CONFIG_CAN_SOFTING=m
664+
CONFIG_CAN_HI311X=m
665+
CONFIG_CAN_MCP251X=m
666+
CONFIG_CAN_MCP251XFD=m
667+
CONFIG_CAN_8DEV_USB=m
668+
CONFIG_CAN_EMS_USB=m
669+
CONFIG_CAN_ESD_USB=m
670+
CONFIG_CAN_ETAS_ES58X=m
671+
CONFIG_CAN_F81604=m
672+
CONFIG_CAN_GS_USB=m
673+
CONFIG_CAN_KVASER_USB=m
674+
CONFIG_CAN_MCBA_USB=m
675+
CONFIG_CAN_PEAK_USB=m
676+
CONFIG_CAN_UCAN=m
647677
CONFIG_MDIO_SUN4I=y
648678
CONFIG_MDIO_BITBANG=m
649679
CONFIG_MDIO_GPIO=m

config/kernel/linux-sunxi64-edge.config

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
5656
CONFIG_ARM_PSCI_CPUIDLE=y
5757
CONFIG_CPU_FREQ=y
5858
CONFIG_CPU_FREQ_STAT=y
59-
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
59+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
6060
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
6161
CONFIG_CPU_FREQ_GOV_USERSPACE=y
62-
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
6362
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
6463
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
6564
CONFIG_CPUFREQ_DT=y
@@ -645,6 +644,37 @@ CONFIG_AC200_PHY=y
645644
CONFIG_AC200_PHY_SUNXI=m
646645
CONFIG_REALTEK_PHY=y
647646
CONFIG_SMSC_PHY=y
647+
CONFIG_CAN_VCAN=m
648+
CONFIG_CAN_VXCAN=m
649+
CONFIG_CAN_CAN327=m
650+
CONFIG_CAN_FLEXCAN=m
651+
CONFIG_CAN_GRCAN=m
652+
CONFIG_CAN_KVASER_PCIEFD=m
653+
CONFIG_CAN_SLCAN=m
654+
CONFIG_CAN_XILINXCAN=m
655+
CONFIG_CAN_C_CAN=m
656+
CONFIG_CAN_CC770=m
657+
CONFIG_CAN_CTUCANFD_PCI=m
658+
CONFIG_CAN_CTUCANFD_PLATFORM=m
659+
CONFIG_CAN_ESD_402_PCI=m
660+
CONFIG_CAN_IFI_CANFD=m
661+
CONFIG_CAN_M_CAN=m
662+
CONFIG_CAN_PEAK_PCIEFD=m
663+
CONFIG_CAN_SJA1000=m
664+
CONFIG_CAN_SOFTING=m
665+
CONFIG_CAN_HI311X=m
666+
CONFIG_CAN_MCP251X=m
667+
CONFIG_CAN_MCP251XFD=m
668+
CONFIG_CAN_8DEV_USB=m
669+
CONFIG_CAN_EMS_USB=m
670+
CONFIG_CAN_ESD_USB=m
671+
CONFIG_CAN_ETAS_ES58X=m
672+
CONFIG_CAN_F81604=m
673+
CONFIG_CAN_GS_USB=m
674+
CONFIG_CAN_KVASER_USB=m
675+
CONFIG_CAN_MCBA_USB=m
676+
CONFIG_CAN_PEAK_USB=m
677+
CONFIG_CAN_UCAN=m
648678
CONFIG_MDIO_SUN4I=y
649679
CONFIG_MDIO_BITBANG=m
650680
CONFIG_MDIO_GPIO=m

0 commit comments

Comments
 (0)