aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-11-17OMAPFB: prevent buffer underflow in omapfb_parse_vram_param()Dan Carpenter1-1/+1
We cap the upper bound of "fbnum" but we also need to check for negatives or make the type unsigned. Signed-off-by: Dan Carpenter <[email protected]> Cc: Tomi Valkeinen <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-17video: fbdev: sm501fb: fix potential null pointer dereference on fbiColin Ian King1-2/+4
The pointer fbi is dereferenced with par = fbi->par before there is a null check on fbi, hence there is a potential null pointer dereference on a null par. Fix this by moving the dereference after the null pointer check. Detected by CoverityScan, CID#1461301 ("Dereference before null check") Signed-off-by: Colin Ian King <[email protected]> Cc: Sudip Mukherjee <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-13fbcon: Initialize ops->info earlyThierry Reding1-0/+1
During console takeover, which happens for all DRM/KMS setups using the fbdev helpers, fbcon_startup() is called before fbcon_init() and as a result con2fb_acquire_newinfo() will not be called (info->fbcon_par was set to non-NULL in fbcon_startup()) to assign ops->info. This causes the cursor_timer_handler() to unreference a NULL pointer. Avoid this by unconditionally assigning ops->info during fbcon_startup() so that it will be available early, but keep the additional assignment in con2fb_acquire_newinfo() to support console remapping at runtime. Signed-off-by: Thierry Reding <[email protected]> Cc: Kees Cook <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-10video: fbdev: Convert timers to use timer_setup()Kees Cook5-18/+13
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. One tracking pointer was added. Signed-off-by: Kees Cook <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: David Lechner <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Sean Paul <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Hans de Goede <[email protected]> Cc: "Gustavo A. R. Silva" <[email protected]> [b.zolnierkie: ported it over pxa3xx_gcu changes] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-10video: fbdev: pxa3xx_gcu: Convert timers to use timer_setup()Kees Cook1-8/+10
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. This also fixes the use of the "priv" variable in QERROR(), since it was pointing to struct timer_list, not struct pxa3xx_gcu_priv. Signed-off-by: Kees Cook <[email protected]> Cc: "Gustavo A. R. Silva" <[email protected]> Cc: Himanshu Jha <[email protected]> [b.zolnierkie: trivial build fixup] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09fbdev: controlfb: Add missing modes to fix out of bounds accessGeert Uytterhoeven1-0/+2
Dan's static analysis says: drivers/video/fbdev/controlfb.c:560 control_setup() error: buffer overflow 'control_mac_modes' 20 <= 21 Indeed, control_mac_modes[] has only 20 elements, while VMODE_MAX is 22, which may lead to an out of bounds read when parsing vmode commandline options. The bug was introduced in v2.4.5.6, when 2 new modes were added to macmodes.h, but control_mac_modes[] wasn't updated: https://kernel.opensuse.org/cgit/kernel/diff/include/video/macmodes.h?h=v2.5.2&id=29f279c764808560eaceb88fef36cbc35c529aad Augment control_mac_modes[] with the two new video modes to fix this. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Dan Carpenter <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: sis_main: mark expected switch fall-throughsGustavo A. R. Silva1-0/+4
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Addresses-Coverity-ID: 115025 Addresses-Coverity-ID: 115026 Addresses-Coverity-ID: 115027 Addresses-Coverity-ID: 115028 Signed-off-by: Gustavo A. R. Silva <[email protected]> Cc: Thomas Winischhofer <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: cirrusfb: mark expected switch fall-throughsGustavo A. R. Silva1-2/+4
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Notice that in this particular case I placed the "fall through" comment on its own line, which is what GCC is expecting to find. Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: aty: radeon_pm: mark expected switch fall-throughsGustavo A. R. Silva1-0/+3
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Signed-off-by: Gustavo A. R. Silva <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: sm501fb: mark expected switch fall-through in sm501fb_blank_crtGustavo A. R. Silva1-0/+1
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: intelfb: remove redundant variablesColin Ian King1-7/+2
Variables err_max, err_target and f_best are being assigned values but these are never read, hence they are redundant variables and can be removed. Cleans up clang warnings: drivers/video/fbdev/intelfb/intelfbhw.c:946:2: warning: Value stored to 'err_max' is never read drivers/video/fbdev/intelfb/intelfbhw.c:947:2: warning: Value stored to 'err_target' is never read drivers/video/fbdev/intelfb/intelfbhw.c:995:6: warning: Value stored to 'f_best' is never read Signed-off-by: Colin Ian King <[email protected]> Cc: Maik Broemme <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video/fbdev/dnfb: Use common error handling code in dnfb_probe()Markus Elfring1-6/+7
Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09sm501fb: suspend and resume fb if it existsSudip Mukherjee1-0/+6
There are cases when panel and crt both are not defined and only one of them is defined and initialized. In such cases, suspend or resume it only if it is defined. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09sm501fb: unregister framebuffer only if registeredSudip Mukherjee1-2/+4
There are cases when panel and crt both are not defined and only one of them is defined and initialized. In such cases, while removing the device, unregister the framebuffer only if it was registered. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09sm501fb: deallocate colormap only if allocatedSudip Mukherjee1-0/+3
There are cases when panel and crt both are not defined and only one of them is defined and initialized. In such cases, while removing the device deallocate the colormap only if that particular fb is defined. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: goldfishfb: Add support for device tree bindingsAleksandar Markovic1-1/+7
Add ability to the Goldfish FB driver to be recognized by OS via DT. Signed-off-by: Miodrag Dinic <[email protected]> Signed-off-by: Goran Ferenc <[email protected]> Signed-off-by: Aleksandar Markovic <[email protected]> Cc: Douglas Leung <[email protected]> Cc: James Hogan <[email protected]> Cc: Paul Burton <[email protected]> Cc: Petar Jovanovic <[email protected]> Cc: Raghu Gandham <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09Documentation: Add device tree binding for Goldfish FB driverAleksandar Markovic1-0/+17
Add documentation for DT binding of Goldfish FB driver. The compatible string used by OS for binding the driver is "google,goldfish-fb". Signed-off-by: Miodrag Dinic <[email protected]> Signed-off-by: Goran Ferenc <[email protected]> Signed-off-by: Aleksandar Markovic <[email protected]> Acked-by: Rob Herring <[email protected]> Cc: David Airlie <[email protected]> Cc: Douglas Leung <[email protected]> Cc: James Hogan <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Paul Burton <[email protected]> Cc: Petar Jovanovic <[email protected]> Cc: Raghu Gandham <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: udlfb: Fix read EDID timeoutLadislav Michl1-5/+5
While usb_control_msg function expects timeout in miliseconds, a value of HZ is used. Replace it with USB_CTRL_GET_TIMEOUT and also fix error message which looks like: udlfb: Read EDID byte 78 failed err ffffff92 as error is either negative errno or number of bytes transferred use %d format specifier. Returned EDID is in second byte, so return error when less than two bytes are received. Fixes: 18dffdf8913a ("staging: udlfb: enhance EDID and mode handling support") Signed-off-by: Ladislav Michl <[email protected]> Cc: Bernie Thompson <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: remove dead igafb driverBartlomiej Zolnierkiewicz4-614/+0
igafb driver hasn't compiled since at least kernel v2.6.34 as commit 6016a363f6b5 ("of: unify phandle name in struct device_node") missed updating igafb.c to use dp->phandle instead of dp->node. Cc: "David S. Miller" <[email protected]> Cc: Bhumika Goyal <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: mxsfb: fix pixelclock polarityStefan Agner1-2/+11
The PIXDATA flags of the display_flags enum are controller centric, e.g. NEGEDGE means the controller shall drive the data signals on pixelclocks negative edge. However, the drivers flag is display centric: Sample the data on negative (falling) edge. Therefore, change the if statement to check for the POSEDGE flag (which is typically not set): Drive on positive edge => sample on negative edge Signed-off-by: Stefan Agner <[email protected]> Acked-by: Shawn Guo <[email protected]> Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Liu Ying <[email protected]> Cc: Lothar Waßmann <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Max Krummenacher <[email protected]> Cc: Mauro Salvini <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Style clean upChristophe JAILLET1-4/+4
Style clean-up. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Propagate an error codeChristophe JAILLET1-3/+4
We should propagate the error code returned by 'fb_alloc_cmap()' instead of returning -EFAULT. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Remove some dead codeChristophe JAILLET1-6/+0
There is no need to shut gcc up. It should not complain. Axe 'fbdev', it is never used in this function. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Fix error handling pathChristophe JAILLET1-2/+10
Rewrite the exit path based on 'au1200fb_drv_remove()'. We can safely iterate for all already handled planes. Even if not completely initialized, the functions that are called will silently accept the 'fb_info' structure that is passed. As soon as we find a NULL in the '_au1200fb_infos' array, we know that we have released all what we needed to release. So we can 'break'. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Fix incorrect IRQ freeingChristophe JAILLET1-2/+0
'au1200fb_drv_probe()' can not fail after a successful call to 'request_irq()'. So there is no point to call 'free_irq()' in the error handling path. Moreover, the hard coded AU1200_LCD_INT looks boggus since commit 1630d85a8312 ("au1200fb: fix hardcoded IRQ"). So, remove it. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> [b.zolnierkie: patch summary and description fixups] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Release some resources if a memory allocation failsChristophe JAILLET1-1/+2
We should go through the error handling code instead of returning -ENOMEM directly. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Return an error code if a memory allocation failsChristophe JAILLET1-1/+3
'ret' is known to be 0 at this point. In case of memory allocation error in 'framebuffer_alloc()', return -ENOMEM instead. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-11-09video: fbdev: au1200fb: Fix a potential double freeChristophe JAILLET1-1/+0
If 'fb_alloc_cmap()' fails, 'fbi->pseudo_palette' is freed and an error code is returned by 'au1200fb_init_fbinfo()'. The only caller, 'au1200fb_drv_probe()' goes to an error handling path where resources allocated in 'fb_alloc_cmap()' are freed. This leads to a double free of 'fbi->pseudo_palette'. Fix it by letting the caller free all resources in case of failure in 'au1200fb_init_fbinfo()'. Signed-off-by: Christophe JAILLET <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: move pseudo palette into sa1100fb_info structureRussell King2-6/+5
Move the pseudo palette inside the driver private data structure so we don't have to play tricks to cater for it. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: fix video memory allocation leakRussell King1-5/+5
Don't leak the video memory allocation if register_framebuffer() fails. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: clean up failure pathRussell King1-13/+8
We merely return from the failed path, so remove all the gotos and use return statements instead. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: use devm_gpio_request_one()Russell King1-10/+7
Switch to using devm_gpio_request_one() to request the shannon gpio and move the request before the video memory allocation, so we request all device managed resources before this large allocation attempt. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: use devm_request_irq()Russell King1-9/+8
Use devm_request_irq() to request the interrupt (a little earlier too) so we can avoid having to manually clean this up. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: use devm_ioremap_resource()Russell King1-12/+8
Use devm_ioremap_resource() to map the LCD controller memory region, and remove the unnecessary cleanup for this. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: use devm_clk_get()Russell King1-4/+1
Use devm_clk_get() to get the clock for the LCD. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: sa1100fb: use devm_kzalloc()Russell King1-4/+2
Use devm_kzalloc() when allocating the private data for the framebuffer device. Signed-off-by: Russell King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-17video: fbdev: pxa3xx_gcu: Use setup_timer and mod_timerHimanshu Jha1-6/+2
Use setup_timer and mod_timer API instead of structure assignments. This is done using Coccinelle and semantic patch used for this as follows: @@ expression x,y,z,a,b; @@ -init_timer (&x); +setup_timer (&x, y, z); +mod_timer (&a, b); -x.function = y; -x.data = z; -x.expires = b; -add_timer(&a); Signed-off-by: Himanshu Jha <[email protected]> Cc: "Gustavo A. R. Silva" <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12video: fbdev: radeon: make const array post_divs static, reduces object code ↵Colin Ian King1-1/+1
size Don't populate the read-only const array post_divs on the stack, instead make it static. Makes the object code smaller by 90 bytes: Before: text data bss dec hex filename 40231 8584 896 49711 c22f radeon_base.o After: text data bss dec hex filename 39914 8744 960 49618 c1d2 radeon_base.o (gcc version 7.2.0, x86_64) Signed-off-by: Colin Ian King <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12video: fbdev: dnfb: make fb_var_screeninfo static and constBhumika Goyal1-1/+1
Make this structure static as it is not referenced in any other file. Make it const as it is used only during a copy operation. Signed-off-by: Bhumika Goyal <[email protected]> Cc: Julia Lawall <[email protected]> [b.zolnierkie: split from combined patch] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12video: fbdev: sis: make const array specialtv static, reduces object code sizeColin Ian King1-1/+1
Don't populate the const array specialtv on the stack, instead make it static. Makes the object code smaller by over 1100 bytes: Before: text data bss dec hex filename 179899 7504 0 187403 2dc0b drivers/video/fbdev/sis/init301.o After: text data bss dec hex filename 178720 7568 0 186288 2d7b0 drivers/video/fbdev/sis/init301.o (gcc version 7.2.0, x86_64) Signed-off-by: Colin Ian King <[email protected]> Cc: Thomas Winischhofer <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12video: fbdev: aty: make const arrays static, reduces object code sizeColin Ian King1-2/+2
Don't populate the const arrays ragepro_tbl and ragexl_tbl on the stack, instead make them static. Makes the object code smaller by over 380 bytes: Before: text data bss dec hex filename 41089 10592 768 52449 cce1 atyfb_base.o After: text data bss dec hex filename 40544 10752 768 52064 cb60 atyfb_base.o (gcc version 7.2.0, x86_64) Signed-off-by: Colin Ian King <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12video: fbdev: matroxfb: return -ENOMEM on allocation failureAllen Pais1-1/+1
Signed-off-by: Allen Pais <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2017-10-12Merge tag 'v4.14-rc4' of ↵Bartlomiej Zolnierkiewicz12236-357522/+612050
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next Linux 4.14-rc4
2017-10-08Linux 4.14-rc4Linus Torvalds1-1/+1
2017-10-07Merge tag 'scsi-fixes' of ↵Linus Torvalds8-31/+36
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: - a couple of serious fixes: use after free and blacklist for WRITE SAME - one error leg fix: write_pending failure - one user experience problem: do not override max_sectors_kb - one minor unused function removal * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ibmvscsis: Fix write_pending failure path scsi: libiscsi: Remove iscsi_destroy_session scsi: libiscsi: Fix use-after-free race during iscsi_session_teardown scsi: sd: Do not override max_sectors_kb sysfs setting scsi: sd: Implement blacklist option for WRITE SAME w/ UNMAP
2017-10-07Merge branch 'i2c/for-current-4.14' of ↵Linus Torvalds5-10/+14
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "I2C has three driver fixes for the newly introduced drivers and one ID addition for the i801 driver" * 'i2c/for-current-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: i2c-stm32f7: make structure stm32f7_setup static const i2c: ensure termination of *_device_id tables i2c: i801: Add support for Intel Cedar Fork i2c: stm32f7: fix setup structure
2017-10-07Merge tag 'mmc-v4.14-rc3' of ↵Linus Torvalds11-162/+81
git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc Pull MMC fixes from Ulf Hansson: "MMC core: - Fix driver strength selection when selecting hs400es - Delete bounce buffer handling: This change fixes a problem related to how bounce buffers are being allocated. However, instead of trying to fix that, let's just remove the mmc bounce buffer code altogether, as it has practically no use. MMC host: - meson-gx: A couple of fixes related to clock/phase/tuning - sdhci-xenon: Fix clock resource by adding an optional bus clock" * tag 'mmc-v4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: mmc: sdhci-xenon: Fix clock resource by adding an optional bus clock mmc: meson-gx: include tx phase in the tuning process mmc: meson-gx: fix rx phase reset mmc: meson-gx: make sure the clock is rounded down mmc: Delete bounce buffer handling mmc: core: add driver strength selection when selecting hs400es
2017-10-06Merge tag 'hwmon-for-linus-v4.14-rc4' of ↵Linus Torvalds1-8/+11
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fix from Guenter Roeck: "Fix up error path in xgene driver" * tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (xgene) Fix up error handling path mixup in 'xgene_hwmon_probe()'
2017-10-06Merge tag 'clk-fixes-for-linus' of ↵Linus Torvalds3-5/+23
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux Pull clk fixes from Stephen Boyd: - build fix to export the clk_bulk_prepare() symbol - suspend fix for Samsung Exynos SoCs where we need to keep clks on across suspend - two critical clk markings for clks that shouldn't ever turn off on Rockchip SoCs - a fix for a copy-paste mistake on Rockchip rk3128 causing some clks to touch the same bit and trample over one another * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: samsung: exynos4: Enable VPLL and EPLL clocks for suspend/resume cycle clk: Export clk_bulk_prepare() clk: rockchip: add sclk_timer5 as critical clock on rk3128 clk: rockchip: fix up rk3128 pvtm and mipi_24m gate regs error clk: rockchip: add pclk_pmu as critical clock on rk3128
2017-10-06Merge tag 'arc-4.14-rc4' of ↵Linus Torvalds17-28/+130
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc Pull ARC udpates from Vineet Gupta: - updates for various platforms - boot log updates for upcoming HS48 family of cores (dual issue) * tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset ARC: [plat-hsdk]: Temporary fix to set CPU frequency to 1GHz ARC: fix allnoconfig build warning ARCv2: boot log: identify HS48 cores (dual issue) ARC: boot log: decontaminate ARCv2 ISA_CONFIG register arc: remove redundant UTS_MACHINE define in arch/arc/Makefile ARC: [plat-eznps] Update platform maintainer as Noam left ARC: [plat-hsdk] use actual clk driver to manage cpu clk ARC: [*defconfig] Reenable soft lock-up detector ARC: [plat-axs10x] sdio: Temporary fix of sdio ciu frequency ARC: [plat-hsdk] sdio: Temporary fix of sdio ciu frequency ARC: [plat-axs103] Add temporary quirk to reset ethernet IP