diff --git a/msm/dp/dp_catalog.c b/msm/dp/dp_catalog.c index ac1e75a4c0..ec3611034c 100644 --- a/msm/dp/dp_catalog.c +++ b/msm/dp/dp_catalog.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ @@ -2812,18 +2813,12 @@ static int dp_catalog_init(struct device *dev, struct dp_catalog *dp_catalog, struct dp_catalog_private *catalog = container_of(dp_catalog, struct dp_catalog_private, dp_catalog); - switch (parser->hw_cfg.phy_version) { - case DP_PHY_VERSION_4_2_0: - dp_catalog->sub = dp_catalog_get_v420(dev, dp_catalog, - &catalog->io); - break; - case DP_PHY_VERSION_2_0_0: - dp_catalog->sub = dp_catalog_get_v200(dev, dp_catalog, - &catalog->io); - break; - default: + if (parser->hw_cfg.phy_version >= DP_PHY_VERSION_4_2_0) + dp_catalog->sub = dp_catalog_get_v420(dev, dp_catalog, &catalog->io); + else if (parser->hw_cfg.phy_version == DP_PHY_VERSION_2_0_0) + dp_catalog->sub = dp_catalog_get_v200(dev, dp_catalog, &catalog->io); + else goto end; - } if (IS_ERR(dp_catalog->sub)) { rc = PTR_ERR(dp_catalog->sub); diff --git a/msm/dp/dp_parser.h b/msm/dp/dp_parser.h index 5a4e844ad7..1761d4cb65 100644 --- a/msm/dp/dp_parser.h +++ b/msm/dp/dp_parser.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. */ @@ -131,12 +132,14 @@ enum dp_phy_aux_config_type { * enum dp_phy_version - version of the dp phy * @DP_PHY_VERSION_UNKNOWN: Unknown controller version * @DP_PHY_VERSION_4_2_0: DP phy v4.2.0 controller + * @DP_PHY_VERSION_6_0_0: DP phy v6.0.0 controller * @DP_PHY_VERSION_MAX: max version */ enum dp_phy_version { DP_PHY_VERSION_UNKNOWN, DP_PHY_VERSION_2_0_0 = 0x200, DP_PHY_VERSION_4_2_0 = 0x420, + DP_PHY_VERSION_6_0_0 = 0x600, DP_PHY_VERSION_MAX };