Skip to content

Commit 6b31bac

Browse files
committed
configs: Use the downstream RP1 driver
Replace MISC_RP1 with MFD_RP1, rebuilding the defconfigs to match. Signed-off-by: Phil Elwell <[email protected]>
1 parent 47c125a commit 6b31bac

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

arch/arm64/configs/bcm2711_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ CONFIG_PCIEPORTBUS=y
448448
CONFIG_PCIEAER=y
449449
CONFIG_PCIEASPM_POWERSAVE=y
450450
CONFIG_PCIE_DPC=y
451+
CONFIG_PCI_DYNAMIC_OF_NODES=y
451452
CONFIG_UEVENT_HELPER=y
452453
CONFIG_DEVTMPFS=y
453454
CONFIG_DEVTMPFS_MOUNT=y
@@ -482,7 +483,6 @@ CONFIG_WS2812_PIO_RP1=m
482483
CONFIG_SRAM=y
483484
CONFIG_EEPROM_AT24=m
484485
CONFIG_EEPROM_AT25=m
485-
CONFIG_MISC_RP1=y
486486
CONFIG_SCSI=y
487487
# CONFIG_SCSI_PROC_FS is not set
488488
CONFIG_BLK_DEV_SD=y
@@ -771,6 +771,7 @@ CONFIG_SPI_SLAVE=y
771771
CONFIG_PPS_CLIENT_LDISC=m
772772
CONFIG_PPS_CLIENT_GPIO=m
773773
CONFIG_PINCTRL_MCP23S08=m
774+
CONFIG_PINCTRL_RP1=y
774775
CONFIG_PINCTRL_BCM2712=y
775776
CONFIG_GPIO_SYSFS=y
776777
CONFIG_GPIO_BCM_VIRT=y
@@ -1518,6 +1519,7 @@ CONFIG_SND_BCM2835=m
15181519
CONFIG_VIDEO_BCM2835=m
15191520
CONFIG_VIDEO_CODEC_BCM2835=m
15201521
CONFIG_VIDEO_ISP_BCM2835=m
1522+
CONFIG_COMMON_CLK_RP1=y
15211523
CONFIG_COMMON_CLK_RP1_SDIO=y
15221524
CONFIG_CLK_RASPBERRYPI=y
15231525
CONFIG_MAILBOX=y

arch/arm64/configs/bcm2711_rt_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ CONFIG_PCIEPORTBUS=y
448448
CONFIG_PCIEAER=y
449449
CONFIG_PCIEASPM_POWERSAVE=y
450450
CONFIG_PCIE_DPC=y
451+
CONFIG_PCI_DYNAMIC_OF_NODES=y
451452
CONFIG_UEVENT_HELPER=y
452453
CONFIG_DEVTMPFS=y
453454
CONFIG_DEVTMPFS_MOUNT=y
@@ -482,7 +483,6 @@ CONFIG_WS2812_PIO_RP1=m
482483
CONFIG_SRAM=y
483484
CONFIG_EEPROM_AT24=m
484485
CONFIG_EEPROM_AT25=m
485-
CONFIG_MISC_RP1=y
486486
CONFIG_SCSI=y
487487
# CONFIG_SCSI_PROC_FS is not set
488488
CONFIG_BLK_DEV_SD=y
@@ -771,6 +771,7 @@ CONFIG_SPI_SLAVE=y
771771
CONFIG_PPS_CLIENT_LDISC=m
772772
CONFIG_PPS_CLIENT_GPIO=m
773773
CONFIG_PINCTRL_MCP23S08=m
774+
CONFIG_PINCTRL_RP1=y
774775
CONFIG_PINCTRL_BCM2712=y
775776
CONFIG_GPIO_SYSFS=y
776777
CONFIG_GPIO_BCM_VIRT=y
@@ -1516,6 +1517,7 @@ CONFIG_SND_BCM2835=m
15161517
CONFIG_VIDEO_BCM2835=m
15171518
CONFIG_VIDEO_CODEC_BCM2835=m
15181519
CONFIG_VIDEO_ISP_BCM2835=m
1520+
CONFIG_COMMON_CLK_RP1=y
15191521
CONFIG_COMMON_CLK_RP1_SDIO=y
15201522
CONFIG_CLK_RASPBERRYPI=y
15211523
CONFIG_MAILBOX=y

arch/arm64/configs/bcm2712_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ CONFIG_PCIEPORTBUS=y
451451
CONFIG_PCIEAER=y
452452
CONFIG_PCIEASPM_POWERSAVE=y
453453
CONFIG_PCIE_DPC=y
454+
CONFIG_PCI_DYNAMIC_OF_NODES=y
454455
CONFIG_UEVENT_HELPER=y
455456
CONFIG_DEVTMPFS=y
456457
CONFIG_DEVTMPFS_MOUNT=y
@@ -485,7 +486,6 @@ CONFIG_WS2812_PIO_RP1=m
485486
CONFIG_SRAM=y
486487
CONFIG_EEPROM_AT24=m
487488
CONFIG_EEPROM_AT25=m
488-
CONFIG_MISC_RP1=y
489489
CONFIG_SCSI=y
490490
# CONFIG_SCSI_PROC_FS is not set
491491
CONFIG_BLK_DEV_SD=y
@@ -773,6 +773,7 @@ CONFIG_SPI_SLAVE=y
773773
CONFIG_PPS_CLIENT_LDISC=m
774774
CONFIG_PPS_CLIENT_GPIO=m
775775
CONFIG_PINCTRL_MCP23S08=m
776+
CONFIG_PINCTRL_RP1=y
776777
CONFIG_PINCTRL_BCM2712=y
777778
CONFIG_GPIO_SYSFS=y
778779
CONFIG_GPIO_BCM_VIRT=y
@@ -1520,6 +1521,7 @@ CONFIG_SND_BCM2835=m
15201521
CONFIG_VIDEO_BCM2835=m
15211522
CONFIG_VIDEO_CODEC_BCM2835=m
15221523
CONFIG_VIDEO_ISP_BCM2835=m
1524+
CONFIG_COMMON_CLK_RP1=y
15231525
CONFIG_COMMON_CLK_RP1_SDIO=y
15241526
CONFIG_CLK_RASPBERRYPI=y
15251527
CONFIG_MAILBOX=y

0 commit comments

Comments
 (0)