Skip to content

Commit 7315350

Browse files
committed
ASoC: es8336: get rid of inverted jack detection
This is already detected from _DSM, so no need to have a quirk inside the driver anymore. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent e5f1b7a commit 7315350

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

sound/soc/intel/boards/sof_es8336.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
(((quirk) << SOF_HDMI_CAPTURE_2_SSP_SHIFT) & SOF_HDMI_CAPTURE_2_SSP_MASK)
4949

5050
#define SOF_ES8336_ENABLE_DMIC BIT(5)
51-
#define SOF_ES8336_JD_INVERTED BIT(6)
5251
#define SOC_ES8336_HEADSET_MIC1 BIT(8)
5352

5453
static unsigned long quirk;
@@ -83,8 +82,6 @@ static void log_quirks(struct device *dev)
8382
dev_info(dev, "quirk DMIC enabled\n");
8483
if (quirk & SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK)
8584
dev_info(dev, "Speakers GPIO1 quirk enabled\n");
86-
if (quirk & SOF_ES8336_JD_INVERTED)
87-
dev_info(dev, "quirk JD inverted enabled\n");
8885
if (quirk & SOC_ES8336_HEADSET_MIC1)
8986
dev_info(dev, "quirk headset at mic1 port enabled\n");
9087
}
@@ -683,9 +680,6 @@ static int sof_es8336_probe(struct platform_device *pdev)
683680
return -EPROBE_DEFER;
684681
priv->codec_dev = get_device(codec_dev);
685682

686-
if (quirk & SOF_ES8336_JD_INVERTED)
687-
props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");
688-
689683
if (cnt) {
690684
fwnode = fwnode_create_software_node(props, NULL);
691685
if (IS_ERR(fwnode)) {
@@ -817,8 +811,7 @@ static const struct platform_device_id board_ids[] = {
817811
SOF_HDMI_CAPTURE_1_SSP(0) |
818812
SOF_HDMI_CAPTURE_2_SSP(2) |
819813
SOF_SSP_HDMI_CAPTURE_PRESENT |
820-
SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK |
821-
SOF_ES8336_JD_INVERTED),
814+
SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK),
822815
},
823816
{ }
824817
};

0 commit comments

Comments
 (0)