Skip to content

Syncing hikey branch. #3

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 4 commits into from
Feb 5, 2016
Merged

Syncing hikey branch. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d840635
dts: hikey: fix some sd card partition not recognized
william-wfei Dec 18, 2015
ac4a46e
drm/i2c: adv7511: Only 720p reset dsi when detect dsi transfer error
xin3liang Jan 26, 2016
54e6524
Merge pull request #178 from xin3liang/hikey-3.18-720p-boot-issue
docularxu Jan 26, 2016
2dc1b53
Merge pull request #166 from william-wfei/hikey
docularxu Jan 28, 2016
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
3 changes: 0 additions & 3 deletions arch/arm64/boot/dts/hi6220.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,9 +1099,6 @@
card-detect-delay = <200>;
hisilicon,peripheral-syscon = <&ao_ctrl>;
cap-sd-highspeed;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
reg = <0x0 0xf723e000 0x0 0x1000>;
interrupts = <0x0 0x49 0x4>;
clocks = <&clock_sys HI6220_MMC1_CIUCLK>, <&clock_sys HI6220_MMC1_CLK>;
Expand Down
7 changes: 5 additions & 2 deletions drivers/gpu/drm/i2c/adv7511.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511)
{
unsigned int irq0, irq1, state;
struct drm_encoder *encoder = adv7511->encoder;
struct drm_display_mode *mode = &adv7511->curr_mode;
struct hisi_dsi *dsi;
bool powered = adv7511->powered;
int ret;
Expand Down Expand Up @@ -599,8 +600,10 @@ static int adv7511_irq_process(struct adv7511 *adv7511)
regmap_update_bits(adv7511->regmap_cec, 0x38, BIT(1), BIT(1));
regmap_update_bits(adv7511->regmap_cec, 0x38, BIT(1), 0);

dsi = encoder_to_dsi(encoder);
dsi->reset(encoder);
if (mode->hdisplay == 1280 && mode->vdisplay == 720) {
dsi = encoder_to_dsi(encoder);
dsi->reset(encoder);
}
}

return 0;
Expand Down