diff options
author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
tree | e86e692f26d4879ff2210c54722e2b7780210249 /drivers/gpu/drm/i915/intel_cdclk.c | |
parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
parent | d4ed3b9015b5eebc90d629579d9e7944607cbae5 (diff) |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'drivers/gpu/drm/i915/intel_cdclk.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_cdclk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c index dd3ad52b7dfe..f29a226e24d8 100644 --- a/drivers/gpu/drm/i915/intel_cdclk.c +++ b/drivers/gpu/drm/i915/intel_cdclk.c | |||
@@ -1798,13 +1798,11 @@ static int g4x_hrawclk(struct drm_i915_private *dev_priv) | |||
1798 | case CLKCFG_FSB_800: | 1798 | case CLKCFG_FSB_800: |
1799 | return 200000; | 1799 | return 200000; |
1800 | case CLKCFG_FSB_1067: | 1800 | case CLKCFG_FSB_1067: |
1801 | case CLKCFG_FSB_1067_ALT: | ||
1801 | return 266667; | 1802 | return 266667; |
1802 | case CLKCFG_FSB_1333: | 1803 | case CLKCFG_FSB_1333: |
1804 | case CLKCFG_FSB_1333_ALT: | ||
1803 | return 333333; | 1805 | return 333333; |
1804 | /* these two are just a guess; one of them might be right */ | ||
1805 | case CLKCFG_FSB_1600: | ||
1806 | case CLKCFG_FSB_1600_ALT: | ||
1807 | return 400000; | ||
1808 | default: | 1806 | default: |
1809 | return 133333; | 1807 | return 133333; |
1810 | } | 1808 | } |