diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index c7e68c75e1e8..ed3ca9707db3 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c | |||
@@ -42,11 +42,6 @@ | |||
42 | #include "dss_features.h" | 42 | #include "dss_features.h" |
43 | #include "hdmi.h" | 43 | #include "hdmi.h" |
44 | 44 | ||
45 | static const unsigned int hdmi4_extcon_cable[] = { | ||
46 | EXTCON_DISP_HDMI, | ||
47 | EXTCON_NONE, | ||
48 | }; | ||
49 | |||
50 | static struct omap_hdmi hdmi; | 45 | static struct omap_hdmi hdmi; |
51 | 46 | ||
52 | static int hdmi_runtime_get(void) | 47 | static int hdmi_runtime_get(void) |
@@ -97,10 +92,8 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data) | |||
97 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON); | 92 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON); |
98 | } else if (irqstatus & HDMI_IRQ_LINK_CONNECT) { | 93 | } else if (irqstatus & HDMI_IRQ_LINK_CONNECT) { |
99 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_TXON); | 94 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_TXON); |
100 | extcon_set_state(&hdmi.edev, 1); | ||
101 | } else if (irqstatus & HDMI_IRQ_LINK_DISCONNECT) { | 95 | } else if (irqstatus & HDMI_IRQ_LINK_DISCONNECT) { |
102 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON); | 96 | hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON); |
103 | extcon_set_state(&hdmi.edev, 0); | ||
104 | } | 97 | } |
105 | 98 | ||
106 | return IRQ_HANDLED; | 99 | return IRQ_HANDLED; |
@@ -748,18 +741,6 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) | |||
748 | goto err; | 741 | goto err; |
749 | } | 742 | } |
750 | 743 | ||
751 | hdmi.edev.name = "hdmi"; | ||
752 | hdmi.edev.supported_cable = hdmi4_extcon_cable; | ||
753 | hdmi.edev.dev.parent = &pdev->dev; | ||
754 | r = extcon_dev_register(&hdmi.edev); | ||
755 | if (r) { | ||
756 | DSSERR("Registering HDMI extcon failed %d\n", r); | ||
757 | return r; | ||
758 | } | ||
759 | |||
760 | /* Init extcon state to zero */ | ||
761 | extcon_set_state(&hdmi.edev, 0); | ||
762 | |||
763 | pm_runtime_enable(&pdev->dev); | 744 | pm_runtime_enable(&pdev->dev); |
764 | 745 | ||
765 | hdmi_init_output(pdev); | 746 | hdmi_init_output(pdev); |
@@ -769,7 +750,6 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) | |||
769 | DSSERR("Registering HDMI audio failed\n"); | 750 | DSSERR("Registering HDMI audio failed\n"); |
770 | hdmi_uninit_output(pdev); | 751 | hdmi_uninit_output(pdev); |
771 | pm_runtime_disable(&pdev->dev); | 752 | pm_runtime_disable(&pdev->dev); |
772 | extcon_dev_unregister(&hdmi.edev); | ||
773 | return r; | 753 | return r; |
774 | } | 754 | } |
775 | 755 | ||
@@ -793,8 +773,6 @@ static void hdmi4_unbind(struct device *dev, struct device *master, void *data) | |||
793 | hdmi_pll_uninit(&hdmi.pll); | 773 | hdmi_pll_uninit(&hdmi.pll); |
794 | 774 | ||
795 | pm_runtime_disable(&pdev->dev); | 775 | pm_runtime_disable(&pdev->dev); |
796 | |||
797 | extcon_dev_unregister(&hdmi.edev); | ||
798 | } | 776 | } |
799 | 777 | ||
800 | static const struct component_ops hdmi4_component_ops = { | 778 | static const struct component_ops hdmi4_component_ops = { |