diff mbox series

arm64: defconfig: Enable drivers for the Odroid-M1 board

Message ID 20221205125928.27806-1-m.szyprowski@samsung.com (mailing list archive)
State New, archived
Headers show
Series arm64: defconfig: Enable drivers for the Odroid-M1 board | expand

Commit Message

Marek Szyprowski Dec. 5, 2022, 12:59 p.m. UTC 
Hardkernel Odroid-M1 board is supported since commit fd3583267703
("arm64: dts: rockchip: Add Hardkernel ODROID-M1 board"). Enable all
drivers needed by that board in the defconfig to let the automated
test systems to check them on the real hardware.

The drivers were configured to be compiled as modules if that was
supported.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm64/configs/defconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Aurelien Jarno Dec. 5, 2022, 9:35 p.m. UTC | #1 
Hi,

On 2022-12-05 13:59, Marek Szyprowski wrote:
> Hardkernel Odroid-M1 board is supported since commit fd3583267703
> ("arm64: dts: rockchip: Add Hardkernel ODROID-M1 board"). Enable all
> drivers needed by that board in the defconfig to let the automated
> test systems to check them on the real hardware.
> 
> The drivers were configured to be compiled as modules if that was
> supported.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  arch/arm64/configs/defconfig | 12 ++++++++++++
>  1 file changed, 12 insertions(+)

Thanks a lot for working on that. I have built my kernels with my own
local config, so I forgot to update this.

> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 851e8f9be06d..01014451ba8e 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -237,6 +237,7 @@ CONFIG_PCI_LAYERSCAPE=y
>  CONFIG_PCI_HISI=y
>  CONFIG_PCIE_QCOM=y
>  CONFIG_PCIE_ARMADA_8K=y
> +CONFIG_PCIE_ROCKCHIP_DW_HOST=y
>  CONFIG_PCIE_KIRIN=y
>  CONFIG_PCIE_HISI_STB=y
>  CONFIG_PCIE_TEGRA194_HOST=m
> @@ -300,6 +301,7 @@ CONFIG_ATA=y
>  CONFIG_SATA_AHCI=y
>  CONFIG_SATA_AHCI_PLATFORM=y
>  CONFIG_AHCI_BRCM=m
> +CONFIG_AHCI_DWC=m
>  CONFIG_AHCI_CEVA=y
>  CONFIG_AHCI_MVEBU=y
>  CONFIG_AHCI_XGENE=y
> @@ -421,6 +423,7 @@ CONFIG_INPUT_PM8941_PWRKEY=y
>  CONFIG_INPUT_PM8XXX_VIBRATOR=m
>  CONFIG_INPUT_PWM_BEEPER=m
>  CONFIG_INPUT_PWM_VIBRA=m
> +CONFIG_INPUT_RK805_PWRKEY=m
>  CONFIG_INPUT_HISI_POWERKEY=y
>  # CONFIG_SERIO_SERPORT is not set
>  CONFIG_SERIO_AMBAKMI=y
> @@ -516,6 +519,7 @@ CONFIG_SPI_MT65XX=y
>  CONFIG_SPI_ORION=y
>  CONFIG_SPI_PL022=y
>  CONFIG_SPI_ROCKCHIP=y
> +CONFIG_SPI_ROCKCHIP_SFC=m
>  CONFIG_SPI_RPCIF=m
>  CONFIG_SPI_RSPI=m
>  CONFIG_SPI_QCOM_QSPI=m
> @@ -529,6 +533,7 @@ CONFIG_SPI_TEGRA114=m
>  CONFIG_SPI_SPIDEV=m
>  CONFIG_SPMI=y
>  CONFIG_PINCTRL_MAX77620=y
> +CONFIG_PINCTRL_RK805=m
>  CONFIG_PINCTRL_SINGLE=y
>  CONFIG_PINCTRL_OWL=y
>  CONFIG_PINCTRL_S700=y
> @@ -596,6 +601,7 @@ CONFIG_BATTERY_MAX17042=m
>  CONFIG_CHARGER_MT6360=m
>  CONFIG_CHARGER_BQ25890=m
>  CONFIG_CHARGER_BQ25980=m
> +CONFIG_CHARGER_RK817=m
>  CONFIG_SENSORS_ARM_SCMI=y
>  CONFIG_SENSORS_ARM_SCPI=y
>  CONFIG_SENSORS_GPIO_FAN=m

Technically the ODROID-M1 uses the RK808 PMIC, so this is not needed.
The corresponding options are already enabled in the arm64 default
config.

That said other RK356x devices (like the Quartz 64) use this PMIC so I
think it makes sense to enable that option.

> @@ -697,6 +703,7 @@ CONFIG_REGULATOR_VCTRL=m
>  CONFIG_RC_CORE=m
>  CONFIG_RC_DECODERS=y
>  CONFIG_RC_DEVICES=y
> +CONFIG_IR_GPIO_CIR=m
>  CONFIG_IR_MESON=m
>  CONFIG_IR_SUNXI=m
>  CONFIG_MEDIA_SUPPORT=m
> @@ -742,6 +749,7 @@ CONFIG_DRM_EXYNOS_DSI=y
>  CONFIG_DRM_EXYNOS_HDMI=y
>  CONFIG_DRM_EXYNOS_MIC=y
>  CONFIG_DRM_ROCKCHIP=m
> +CONFIG_ROCKCHIP_VOP2=y
>  CONFIG_ROCKCHIP_ANALOGIX_DP=y
>  CONFIG_ROCKCHIP_CDN_DP=y
>  CONFIG_ROCKCHIP_DW_HDMI=y
> @@ -831,6 +839,7 @@ CONFIG_SND_SOC_SM8250=m
>  CONFIG_SND_SOC_SC7180=m
>  CONFIG_SND_SOC_SC7280=m
>  CONFIG_SND_SOC_ROCKCHIP=m
> +CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
>  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
>  CONFIG_SND_SOC_ROCKCHIP_RT5645=m
>  CONFIG_SND_SOC_RK3399_GRU_SOUND=m
> @@ -863,6 +872,7 @@ CONFIG_SND_SOC_GTM601=m
>  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
>  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
>  CONFIG_SND_SOC_PCM3168A_I2C=m
> +CONFIG_SND_SOC_RK817=m

This is correct, the ODROID M1 uses the RK809 codec, which is supported
by the RK817 driver.

>  CONFIG_SND_SOC_RT5640=m
>  CONFIG_SND_SOC_RT5659=m
>  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
> @@ -1277,7 +1287,9 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
>  CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
>  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>  CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
> +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
>  CONFIG_PHY_ROCKCHIP_PCIE=m
> +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
>  CONFIG_PHY_ROCKCHIP_TYPEC=y
>  CONFIG_PHY_SAMSUNG_UFS=y
>  CONFIG_PHY_UNIPHIER_USB2=y

With the minor comment above:

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

Regards
Aurelien
Anand Moon Dec. 6, 2022, 8:10 a.m. UTC | #2 
Hi Marek,

On Mon, 5 Dec 2022 at 18:30, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>
> Hardkernel Odroid-M1 board is supported since commit fd3583267703
> ("arm64: dts: rockchip: Add Hardkernel ODROID-M1 board"). Enable all
> drivers needed by that board in the defconfig to let the automated
> test systems to check them on the real hardware.
>
> The drivers were configured to be compiled as modules if that was
> supported.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  arch/arm64/configs/defconfig | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 851e8f9be06d..01014451ba8e 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -237,6 +237,7 @@ CONFIG_PCI_LAYERSCAPE=y
>  CONFIG_PCI_HISI=y
>  CONFIG_PCIE_QCOM=y
>  CONFIG_PCIE_ARMADA_8K=y
> +CONFIG_PCIE_ROCKCHIP_DW_HOST=y
>  CONFIG_PCIE_KIRIN=y
>  CONFIG_PCIE_HISI_STB=y
>  CONFIG_PCIE_TEGRA194_HOST=m
> @@ -300,6 +301,7 @@ CONFIG_ATA=y
>  CONFIG_SATA_AHCI=y
>  CONFIG_SATA_AHCI_PLATFORM=y
>  CONFIG_AHCI_BRCM=m
> +CONFIG_AHCI_DWC=m
>  CONFIG_AHCI_CEVA=y
>  CONFIG_AHCI_MVEBU=y
>  CONFIG_AHCI_XGENE=y
> @@ -421,6 +423,7 @@ CONFIG_INPUT_PM8941_PWRKEY=y
>  CONFIG_INPUT_PM8XXX_VIBRATOR=m
>  CONFIG_INPUT_PWM_BEEPER=m
>  CONFIG_INPUT_PWM_VIBRA=m
> +CONFIG_INPUT_RK805_PWRKEY=m
>  CONFIG_INPUT_HISI_POWERKEY=y
>  # CONFIG_SERIO_SERPORT is not set
>  CONFIG_SERIO_AMBAKMI=y
> @@ -516,6 +519,7 @@ CONFIG_SPI_MT65XX=y
>  CONFIG_SPI_ORION=y
>  CONFIG_SPI_PL022=y
>  CONFIG_SPI_ROCKCHIP=y
> +CONFIG_SPI_ROCKCHIP_SFC=m
>  CONFIG_SPI_RPCIF=m
>  CONFIG_SPI_RSPI=m
>  CONFIG_SPI_QCOM_QSPI=m
> @@ -529,6 +533,7 @@ CONFIG_SPI_TEGRA114=m
>  CONFIG_SPI_SPIDEV=m
>  CONFIG_SPMI=y
>  CONFIG_PINCTRL_MAX77620=y
> +CONFIG_PINCTRL_RK805=m
>  CONFIG_PINCTRL_SINGLE=y
>  CONFIG_PINCTRL_OWL=y
>  CONFIG_PINCTRL_S700=y
> @@ -596,6 +601,7 @@ CONFIG_BATTERY_MAX17042=m
>  CONFIG_CHARGER_MT6360=m
>  CONFIG_CHARGER_BQ25890=m
>  CONFIG_CHARGER_BQ25980=m
> +CONFIG_CHARGER_RK817=m
>  CONFIG_SENSORS_ARM_SCMI=y
>  CONFIG_SENSORS_ARM_SCPI=y
>  CONFIG_SENSORS_GPIO_FAN=m
> @@ -697,6 +703,7 @@ CONFIG_REGULATOR_VCTRL=m
>  CONFIG_RC_CORE=m
>  CONFIG_RC_DECODERS=y
>  CONFIG_RC_DEVICES=y
> +CONFIG_IR_GPIO_CIR=m
>  CONFIG_IR_MESON=m
>  CONFIG_IR_SUNXI=m
>  CONFIG_MEDIA_SUPPORT=m
> @@ -742,6 +749,7 @@ CONFIG_DRM_EXYNOS_DSI=y
>  CONFIG_DRM_EXYNOS_HDMI=y
>  CONFIG_DRM_EXYNOS_MIC=y
>  CONFIG_DRM_ROCKCHIP=m
> +CONFIG_ROCKCHIP_VOP2=y
>  CONFIG_ROCKCHIP_ANALOGIX_DP=y
>  CONFIG_ROCKCHIP_CDN_DP=y
>  CONFIG_ROCKCHIP_DW_HDMI=y
> @@ -831,6 +839,7 @@ CONFIG_SND_SOC_SM8250=m
>  CONFIG_SND_SOC_SC7180=m
>  CONFIG_SND_SOC_SC7280=m
>  CONFIG_SND_SOC_ROCKCHIP=m
> +CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
>  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
>  CONFIG_SND_SOC_ROCKCHIP_RT5645=m
>  CONFIG_SND_SOC_RK3399_GRU_SOUND=m
> @@ -863,6 +872,7 @@ CONFIG_SND_SOC_GTM601=m
>  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
>  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
>  CONFIG_SND_SOC_PCM3168A_I2C=m
> +CONFIG_SND_SOC_RK817=m
>  CONFIG_SND_SOC_RT5640=m
>  CONFIG_SND_SOC_RT5659=m
>  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
> @@ -1277,7 +1287,9 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
>  CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
>  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>  CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
> +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m

The following should be set to CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y

If not it fails to enable PCIe on Radxa 3a
[    0.735048] mmc1: SDHCI controller on fe310000.mmc [fe310000.mmc] using ADMA
[    0.759924] phy phy-fe8c0000.phy.4: lane number 0, val 1
[    0.760915] phy phy-fe8c0000.phy.4: rockchip_p3phy_rk3568_init:
lock failed 0x6890000, check input refclk and power supply
[    0.761881] phy phy-fe8c0000.phy.4: phy init failed --> -110
[    0.762477] rockchip-dw-pcie: probe of 3c0800000.pcie failed with error -110

Reviewed-by: Anand Moon <linux.amoon@gmail.com>

Thanks

-Anand

>  CONFIG_PHY_ROCKCHIP_PCIE=m
> +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
>  CONFIG_PHY_ROCKCHIP_TYPEC=y
>  CONFIG_PHY_SAMSUNG_UFS=y
>  CONFIG_PHY_UNIPHIER_USB2=y
> --
> 2.38.1
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff mbox series

Patch

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 851e8f9be06d..01014451ba8e 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -237,6 +237,7 @@  CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
 CONFIG_PCIE_KIRIN=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCIE_TEGRA194_HOST=m
@@ -300,6 +301,7 @@  CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_BRCM=m
+CONFIG_AHCI_DWC=m
 CONFIG_AHCI_CEVA=y
 CONFIG_AHCI_MVEBU=y
 CONFIG_AHCI_XGENE=y
@@ -421,6 +423,7 @@  CONFIG_INPUT_PM8941_PWRKEY=y
 CONFIG_INPUT_PM8XXX_VIBRATOR=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_HISI_POWERKEY=y
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_SERIO_AMBAKMI=y
@@ -516,6 +519,7 @@  CONFIG_SPI_MT65XX=y
 CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_ROCKCHIP=y
+CONFIG_SPI_ROCKCHIP_SFC=m
 CONFIG_SPI_RPCIF=m
 CONFIG_SPI_RSPI=m
 CONFIG_SPI_QCOM_QSPI=m
@@ -529,6 +533,7 @@  CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPMI=y
 CONFIG_PINCTRL_MAX77620=y
+CONFIG_PINCTRL_RK805=m
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_OWL=y
 CONFIG_PINCTRL_S700=y
@@ -596,6 +601,7 @@  CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_MT6360=m
 CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_RK817=m
 CONFIG_SENSORS_ARM_SCMI=y
 CONFIG_SENSORS_ARM_SCPI=y
 CONFIG_SENSORS_GPIO_FAN=m
@@ -697,6 +703,7 @@  CONFIG_REGULATOR_VCTRL=m
 CONFIG_RC_CORE=m
 CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_MESON=m
 CONFIG_IR_SUNXI=m
 CONFIG_MEDIA_SUPPORT=m
@@ -742,6 +749,7 @@  CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
@@ -831,6 +839,7 @@  CONFIG_SND_SOC_SM8250=m
 CONFIG_SND_SOC_SC7180=m
 CONFIG_SND_SOC_SC7280=m
 CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
@@ -863,6 +872,7 @@  CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_RK817=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5659=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -1277,7 +1287,9 @@  CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PHY_SAMSUNG_UFS=y
 CONFIG_PHY_UNIPHIER_USB2=y