Skip to content

Samsung i927 fixes #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 14, 2021
Merged

Samsung i927 fixes #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1652f1
mfd: max8907: Remove IRQF_NO_AUTOEN flag
cerg2010cerg2010 Jun 14, 2021
868e4b8
drm/tegra: Temporary pixel format fix for i927
cerg2010cerg2010 Jun 14, 2021
1e16a65
power: supply: max8903: OTG disable fix
cerg2010cerg2010 Jun 14, 2021
5b518f0
ASoC: tegra_wm8994: Fix codec name
cerg2010cerg2010 Jun 14, 2021
afd9811
ASoC: tegra_wm8994: Set mclk ID value
cerg2010cerg2010 Jun 14, 2021
bb79152
ARM: dts: tegra20-glide: Fix GPIO polarity for max8903
cerg2010cerg2010 Jun 14, 2021
81857cf
ARM: dts: tegra20-glide: Fix wm8994 codec config
cerg2010cerg2010 Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions arch/arm/boot/dts/tegra20-glide.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,8 @@
usb_ta_charger: max8922-charger {
compatible = "maxim,max8903";
chg-gpios = <&stmpegpio 16 GPIO_ACTIVE_LOW>;
cen-gpios = <&gpio TEGRA_GPIO(R, 3) GPIO_ACTIVE_HIGH>;
uok-gpios = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
cen-gpios = <&gpio TEGRA_GPIO(R, 3) GPIO_ACTIVE_LOW>;
uok-gpios = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_LOW>;
/*
* Original sources also use FSA9480 for USB charger
* detection, but it's on extcon and not GPIO,
Expand Down Expand Up @@ -1777,6 +1777,7 @@
gpio = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_HIGH>;
regulator-enable-ramp-delay = <125000>;
regulator-boot-on;
regulator-always-on;
enable-active-high;
};

Expand All @@ -1798,12 +1799,12 @@
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(L, 3) GPIO_ACTIVE_HIGH>;

nvidia,audio-routing =
"Int Spk", "SPKOUTLP",
"Int Spk", "SPKOUTLN",
"Speakers", "SPKOUTLP",
"Speakers", "SPKOUTLN",
"Headphone Jack", "HPOUT1L",
"Headphone Jack", "HPOUT1R",
"Earpiece Spk", "HPOUT2P",
"Earpiece Spk", "HPOUT2N",
"Int Spk", "HPOUT2P",
"Int Spk", "HPOUT2N",
Comment on lines -1801 to +1807
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I overlooked that WM8994 used custom DAPM widgets when converted driver to use new unified machine framework. We can add back the customized widgets if you think that they are more appropriate.

"IN1LP", "Mic Jack",
"IN1LN", "Mic Jack";
/* TODO: routes for modem and, probably, BT SCO */
Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/grate/rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ static void tegra_rgb_encoder_enable(struct drm_encoder *encoder)
tegra_dc_writel(rgb->dc, value, DC_COM_PIN_OUTPUT_POLARITY(1));

/* XXX: parameterize? */
if (of_machine_is_compatible("samsung,i927")) {
/* Set DISP_COLOR_SWAP bit to swap red and blue colors */
tegra_dc_writel(rgb->dc, (1 << 16), DC_DISP_DISP_COLOR_CONTROL);
}
value = DISP_DATA_FORMAT_DF1P1C | DISP_ALIGNMENT_MSB |
DISP_ORDER_RED_BLUE;
tegra_dc_writel(rgb->dc, value, DC_DISP_DISP_INTERFACE_CONTROL);
Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/tegra/rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ static void tegra_rgb_encoder_enable(struct drm_encoder *encoder)
tegra_dc_writel(rgb->dc, value, DC_COM_PIN_OUTPUT_POLARITY(1));

/* XXX: parameterize? */
if (of_machine_is_compatible("samsung,i927")) {
/* Set DISP_COLOR_SWAP bit to swap red and blue colors */
tegra_dc_writel(rgb->dc, (1 << 16), DC_DISP_DISP_COLOR_CONTROL);
}
value = DISP_DATA_FORMAT_DF1P1C | DISP_ALIGNMENT_MSB |
DISP_ORDER_RED_BLUE;
tegra_dc_writel(rgb->dc, value, DC_DISP_DISP_INTERFACE_CONTROL);
Expand Down
4 changes: 1 addition & 3 deletions drivers/mfd/max8907.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int max8907_i2c_probe(struct i2c_client *i2c,
}

ret = regmap_add_irq_chip(max8907->regmap_gen, max8907->i2c_gen->irq,
IRQF_ONESHOT | IRQF_SHARED | IRQF_NO_AUTOEN,
IRQF_ONESHOT | IRQF_SHARED,
-1, &max8907_chg_irq_chip,
&max8907->irqc_chg);
if (ret != 0) {
Comment on lines 229 to 235
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good to send this patch to LKML right now since it fixes a generic bug.

Expand All @@ -253,8 +253,6 @@ static int max8907_i2c_probe(struct i2c_client *i2c,
goto err_irqc_rtc;
}

enable_irq(max8907->i2c_gen->irq);

ret = mfd_add_devices(max8907->dev, -1, max8907_cells,
ARRAY_SIZE(max8907_cells), NULL, 0, NULL);
if (ret != 0) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/supply/max8903_charger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static int max8903_otg_enable(struct regulator_dev *rdev)
/* Disable charging */
data->otg_en = true;
if (data->usb_in)
gpiod_set_value(data->cen, 1);
gpiod_set_value(data->cen, 0);
data->usb_in = false;

if (data->psy_desc.type != POWER_SUPPLY_TYPE_BATTERY)
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/tegra/tegra_wm8994.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static int tegra_wm8994_remove(struct snd_soc_card *card)

SND_SOC_DAILINK_DEFS(wm8994_hifi,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8994-hifi")),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8994-aif1")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));

static struct snd_soc_dai_link tegra_wm8994_dai = {
Expand All @@ -149,6 +149,7 @@ static struct snd_soc_card snd_soc_tegra_wm8994 = {

static const struct tegra_asoc_data tegra_wm8994_data = {
.mclk_rate = tegra_wm8994_mclk_rate,
.mclk_id = WM8994_SYSCLK_MCLK1,
.dapm_event = tegra_wm8994_event,
.card = &snd_soc_tegra_wm8994,
.add_common_dapm_widgets = true,
Expand Down