diff options
| author | Rob Clark <robdclark@gmail.com> | 2015-07-27 20:52:50 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2015-08-15 18:27:13 -0400 |
| commit | 5cf3a4553fc8395c4ad38077f8cee6c91f832393 (patch) | |
| tree | ab48a6d4b39e9faa0d08976671378dc2e8872031 | |
| parent | 3a84f8469e2687b9fdcf83d615b8001a2443566a (diff) | |
| download | blackbird-op-linux-5cf3a4553fc8395c4ad38077f8cee6c91f832393.tar.gz blackbird-op-linux-5cf3a4553fc8395c4ad38077f8cee6c91f832393.zip | |
drm/msm/hdmi: standardize on lead chip for compatible names
For all of these devices, msm89xy was the lead chip, so standardize the
compatible names to align with convention used by rest of the qcom/msm
drivers.
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | Documentation/devicetree/bindings/drm/msm/hdmi.txt | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/drm/msm/hdmi.txt index 0d31f6f25bfd..e926239e1101 100644 --- a/Documentation/devicetree/bindings/drm/msm/hdmi.txt +++ b/Documentation/devicetree/bindings/drm/msm/hdmi.txt @@ -4,7 +4,7 @@ Required properties: - compatible: one of the following * "qcom,hdmi-tx-8994" * "qcom,hdmi-tx-8084" - * "qcom,hdmi-tx-8074" + * "qcom,hdmi-tx-8974" * "qcom,hdmi-tx-8660" * "qcom,hdmi-tx-8960" - reg: Physical base address and length of the controller's registers diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index a94a46867c84..101b324cdeef 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -347,7 +347,7 @@ static const char *pwr_clk_names_8x74[] = {"extp_clk", "alt_iface_clk"}; static const char *hpd_clk_names_8x74[] = {"iface_clk", "core_clk", "mdp_core_clk"}; static unsigned long hpd_clk_freq_8x74[] = {0, 19200000, 0}; -static struct hdmi_platform_config hdmi_tx_8074_config = { +static struct hdmi_platform_config hdmi_tx_8974_config = { .phy_init = hdmi_phy_8x74_init, HDMI_CFG(pwr_reg, 8x74), HDMI_CFG(hpd_reg, 8x74), @@ -369,7 +369,7 @@ static struct hdmi_platform_config hdmi_tx_8084_config = { static const char *hpd_reg_names_8x94[] = {}; -static struct hdmi_platform_config hdmi_tx_8x94_config = { +static struct hdmi_platform_config hdmi_tx_8994_config = { .phy_init = NULL, /* nothing to do for this HDMI PHY 20nm */ HDMI_CFG(pwr_reg, 8x74), HDMI_CFG(hpd_reg, 8x94), @@ -379,9 +379,9 @@ static struct hdmi_platform_config hdmi_tx_8x94_config = { }; static const struct of_device_id dt_match[] = { - { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8x94_config }, + { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8994_config }, { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8084_config }, - { .compatible = "qcom,hdmi-tx-8074", .data = &hdmi_tx_8074_config }, + { .compatible = "qcom,hdmi-tx-8974", .data = &hdmi_tx_8974_config }, { .compatible = "qcom,hdmi-tx-8960", .data = &hdmi_tx_8960_config }, { .compatible = "qcom,hdmi-tx-8660", .data = &hdmi_tx_8660_config }, {} |
