summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2019-04-30spi: Add Flag to Enable Slave Select with GPIO Chip Select.Thor Thayer
Some SPI masters require slave selection before the transfer can begin [1]. The SPI framework currently selects the chip using either 1) the internal CS mechanism or 2) the GPIO CS, but not both. This patch adds a new master->flags define to indicate both the GPIO CS and the internal chip select mechanism should be used. Tested On: Altera CycloneV development kit Compile tested for build errors on x86_64 (allyesconfigs) [1] DesignWare dw_apb_ssi Databook, Version 3.20a (page 39) Signed-off-by: Thor Thayer <tthayer@opensource.altera.com> Signed-off-by: Mark Brown <broonie@kernel.org>
2019-04-30brcmfmac: add support for BCM43455 with modalias sdio:c00v02D0dA9BFJakob Unterwurzacher
BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 got a dedicated SDIO device ID which is currently not supported by brcmfmac. Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 supported because the chip itself is already supported (due to BCM4345 support in the driver). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Tested-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Upstream commit a62a77881b1b6708ffeddd9bf0529494f7b199e3
2019-03-20media: rk-isp10: add control exposure of long and short frame for hdrHu Kejun
modify head file to match the change of camera engine Change-Id: Ia139e733f766cf9cbb02e80ceda81a1817b3acbf Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-19dt-bindings: display: media-bus-format: Sync with ↵Sandy Huang
include/uapi/linux/media-bus-format.h Change-Id: I1da14bc81a8652dcac5f0b85035f8f1bf6e71bfe Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-03-19media-bus: Add SRGB888 media bus formatSandy Huang
The output timing described at [1], focus at s888 mode and s888 dummy mode: [1] https://patchwork.kernel.org/patch/9992241/ Change-Id: I1bcc6d64ede243d89807acc7e842bcc7fd120c26 Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-03-12dt-bindings: add BOOT_PANIC and BOOT_WATCHDOGAndy Yan
Change-Id: I66e3d7caa7b8591bd5af8d481ba773f5e38e9471 Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-03-08clk: rockchip: rk1808: export SCLK_32K_IOE clock idElaine Zhang
Add clk_32k_ioe to select 32k io as input or output. Change-Id: Id1d32b913e9739c4462eab6e565b3fcac370e531 Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08thermal: trace: Add trace for staitc powerFinley Xiao
Change-Id: I65fa7e60c606d414e6f5941c5a73347db9874c27 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-08soc: rockchip: Add support to change static power according to leakageFinley Xiao
Change-Id: Ie25e42ab14a46676819711957afa8aef8dfd0785 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-08cpufreq: dt: Implement rockchip_of_get_leakage()Finley Xiao
Change-Id: I6d1bf9ee6957455c2cb6623aa112d918a9fea4d4 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-08UPSTREAM: drm/edid: Set AVI infoframe Q even when QS=0Ville Syrjälä
HDMI 2.0 recommends that we set the Q bits in the AVI infoframe even when the sink does not support quantization range selection (QS=0). According to CEA-861 we can do that as long as the Q we send matches the default quantization range for the mode. Previously I think I had misread the spec as saying that you can't send a non-zero Q at all when QS=0. But that's not what the spec actually says. v2: Fix typo in commit message (Jani) Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-5-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 779c4c2866150c1e5518d703b747f794f91f044c) Change-Id: Ic006e2a2a9ac2f1ab105c595bc4a62c0918c6dff Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08UPSTREAM: drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range()Ville Syrjälä
Pull the logic to populate the quantization range information in the AVI infoframe into a small helper. We'll be adding a bit more logic to it, and having it in a central place seems like a good idea since it's based on the CEA-861 spec. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-4-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Eric Anholt <eric@anholt.net> (cherry picked from commit a2ce26f815b16500d390fc46381ec770192a5fbe) Change-Id: Ic41983b3298461644658d89c31408b06efc33c69 Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08UPSTREAM: drm/edid: Introduce drm_default_rgb_quant_range()Ville Syrjälä
Make the code selecting the RGB quantization range a little less magicy by wrapping it up in a small helper. v2: s/adjusted_mode/mode in vc4 to make it actually compile v3: Add a comment proposed by Eric Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170111141835.25369-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Eric Anholt <eric@anholt.net> (cherry picked from commit c8127cf08ab9797c3954df463741ac47039d2b55) Change-Id: I33894c6e3a2033b168f78918e4a8dbf167201632 Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-02-26media: camera: add header for otp informationHu Kejun
Change-Id: I903df1fb2ee26b5d771a3cfe2876e7afd837d1de Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-25media: rockchip: isp1: support iesharp/demosaiclp/wdrHu Kejun
Change-Id: Id27d87c15d455d00ff8bfe09b470929c5746d511 Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-19dt-bindings: display: media-bus-format: Sync with ↵Wyon Bi
include/uapi/linux/media-bus-format.h Change-Id: I3f6deb2e264956205da725aa78f79ee7404d13a8 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-02-19media: Add MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA media bus code definitionsWyon Bi
This patch adds a new RGB media bus formats that describe 18-bit samples transferred over an LVDS bus with three differential data pairs, serialized into 7 time slots, using standard JEIDA data ordering. Change-Id: Ia0bedd53e57aa34829a0d61b144aa99a1c98cffd Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-02-14serial: 8250: enable Programmable THRE Interrupt for txHuibin Hong
Programmable THRE Interrupt mode in order to increase system performance. Change-Id: Ic1ef9ecae0c6feb00170ad97ee3c6245ca3bf068 Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-02-01mfd: rk808: restore the OTP value to POWER_EN register of rk817/rk809Shengfei Xu
rk817/rk809 must restore the PMIC_POWER_EN OTP value before the system reboot. Change-Id: I2ccfbb4d47eb41cdcea048111873b6ab85477d64 Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2019-01-31dt-bindings: suspend: rk3308: add pwm regulator voltage state configureJoseph Chen
Change-Id: I7f90cb93c1bd82def832aa930daa0de4983af90e Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-30mfd: rk808: init CLK32KOUT func for rk818Elaine Zhang
Change-Id: I1e5c261233c08dcbae29a543029fe6455044b9a4 Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-28soc: rockchip: opp_select: Add rockchip_cpu_suspend_low_temp_adjust()Finley Xiao
If support wide temperature, it necessary to set voltage to low temperature voltage before system suspend, so that it can resume successfully at low temperature. Change-Id: Ie6787092c9510788054217bd830b5ae1e4dd6bc2 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-24media: rk-isp10: add control for clear exposure listHu Kejun
Change-Id: I57aae7bfcf54d0055b63824fb608e6beb621e974 Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-01-23PM / devfreq: rockchip_dmc: Change readlatency according to plane numberFinley Xiao
Change-Id: Ie0340c80c693c86fed90a155104cf2f8ca6ce16e Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-23PM / devfreq: rockchip_dmc: Implement rk3399_set_msch_readlatency()Finley Xiao
The ATF must contain the following commit: cd61876e275e ("plat: rk3399: ddr: add support adjust noc read latency") Change-Id: I322f8c9d454fb1234b042438c85521275ceda4bc Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-09BACKPORT: drm/bridge: analogix: Do not use device's drvdataJeffy Chen
The driver that instantiates the bridge should own the drvdata, as all driver model callbacks (probe, remove, shutdown, PM ops, etc.) are also owned by its driver struct. Moreover, storing two different pointer types in driver data depending on driver initialization status is barely a good practice and in fact has led to many bugs in this driver. Let's clean up this mess and change Analogix entry points to simply accept some opaque struct pointer, adjusting their users at the same time to avoid breaking the compilation. Change-Id: Ie06ce63a5daae532df69d2447b0673b91032d61c Signed-off-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> Acked-by: Jingoo Han <jingoohan1@gmail.com> Acked-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patchwork.freedesktop.org/patch/msgid/20180110162348.22765-2-thierry.escande@collabora.com Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com> (cherry-picked from 6b2d8fd98d051f8697c45f96249dca73842a2362)
2019-01-04usb: xhci: set xhci trb ent quirk based on platform dataWilliam Wu
If an xhci platform needs to enable the ENT flag in the TRB to force the xHC to pre-fetch the next TRB of a TD, then add the XHCI_TRB_ENT_QUIRK flag. Change-Id: Ib7cc095a848f0846ad995529ad703ae4e4ee4d44 Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-02UPSTREAM: kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bitSean Young
If you try to store u64 in a kfifo (or a struct with u64 members), then the buf member of __STRUCT_KFIFO_PTR will cause 4 bytes padding due to alignment (note that struct __kfifo is 20 bytes on 32 bit). That in turn causes the __is_kfifo_ptr() to fail, which is caught by kfifo_alloc(), which now returns EINVAL. So, ensure that __is_kfifo_ptr() compares to the right structure. Change-Id: I7b5c8415a6bb8f54bbc8ec50fa98e1803cda3ce8 Signed-off-by: Sean Young <sean@mess.org> Acked-by: Stefani Seibold <stefani@seibold.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> (cherry picked from commit 8a866fee3909c49738e1c4429a8d2b9bf27e015d) Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-12-29phy: add MIPI/LVDS/TTL modes to the phy_mode enumWyon Bi
This patch adds more generic PHY modes to the phy_mode enum, to allow configuring generic PHYs to the MIPI/LVDS/TTL mode by using the set_mode callback. Change-Id: Ib6966828011aa52f1f133449f69df46c2001a57b Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-28rockchip: sip: add static inline for sip_smc_lastlog_request()Kever Yang
Add static inline for sip_smc_lastlog_request() when CONFIG_ROCKCHIP_SIP is not enabled. Change-Id: I8fe46c36b115b4aa8a71a4101a7829e64aa08103 Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-12-26power: cw201x: add POWER_SUPPLY_PROP_CHARGE_FULL for CTSShunqing Chen
Change-Id: I6697fdc5615705a32a4eeb411fc92b737be73d9e Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-25thermal: power_allocator: Add support to get PID constant from dtFinley Xiao
Change-Id: Ibabdad4ba2df6df26d75483dd35b6c51572befe8 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-19Merge branch 'linux-linaro-lsk-v4.4-android' of ↵Tao Huang
git://git.linaro.org/kernel/linux-linaro-stable.git * linux-linaro-lsk-v4.4-android: (812 commits) Linux 4.4.167 mac80211: ignore NullFunc frames in the duplicate detection mac80211: fix reordering of buffered broadcast packets mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext mac80211: Clear beacon_int in ieee80211_do_stop mac80211_hwsim: Timer should be initialized before device registered kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var() tty: serial: 8250_mtk: always resume the device in probe. cifs: Fix separator when building path from dentry Staging: lustre: remove two build warnings xhci: Prevent U1/U2 link pm states if exit latency is too long SUNRPC: Fix leak of krb5p encode pages virtio/s390: fix race in ccw_io_helper() virtio/s390: avoid race on vcdev->config ALSA: pcm: Fix interval evaluation with openmin/max ALSA: pcm: Call snd_pcm_unlink() conditionally at closing ALSA: pcm: Fix starvation on down_write_nonblock() ALSA: hda: Add support for AMD Stoney Ridge ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c USB: check usb_get_extra_descriptor for proper size ... Conflicts: drivers/gpu/drm/rockchip/rockchip_drm_drv.c drivers/usb/host/xhci-ring.c Change-Id: I4304b0875908403a7d88a0d77da52cea04563c11
2018-12-18UPSTREAM: drm/dp: Add define to set 0.5% down-spread in MAX_DOWNSPREAD registerEnric Balletbo i Serra
Support of 0.5% down-spread is required for DisplayPort Specification Version 1.1 Sink. Change-Id: Ia1a3036e36a95638e90da3e76fece7897a0883be Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> [treding@nvidia.com: rename to DP_MAX_DOWNSPREAD_0_5] Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com> (cherry-picked from 56c5da00271e656466d34b853d6c2b5f3ce3ee5a)
2018-12-17clk: rockchip: add dt-binding header for rv1108Sugar Zhang
Change-Id: I15f39d705c2ab7a19c2f0f7c9c804073ee23631d Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-14Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidMark Brown
2018-12-14Merge tag 'v4.4.167' into linux-linaro-lsk-v4.4Mark Brown
This is the 4.4.167 stable release
2018-12-13ALSA: pcm: Fix interval evaluation with openmin/maxTakashi Iwai
commit 5363857b916c1f48027e9b96ee8be8376bf20811 upstream. As addressed in alsa-lib (commit b420056604f0), we need to fix the case where the evaluation of PCM interval "(x x+1]" leading to -EINVAL. After applying rules, such an interval may be translated as "(x x+1)". Fixes: ff2d6acdf6f1 ("ALSA: pcm: Fix snd_interval_refine first/last with open min/max") Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-13USB: check usb_get_extra_descriptor for proper sizeMathias Payer
commit 704620afc70cf47abb9d6a1a57f3825d2bca49cf upstream. When reading an extra descriptor, we need to properly check the minimum and maximum size allowed, to prevent from invalid data being sent by a device. Reported-by: Hui Peng <benquike@gmail.com> Reported-by: Mathias Payer <mathias.payer@nebelwelt.net> Co-developed-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Hui Peng <benquike@gmail.com> Signed-off-by: Mathias Payer <mathias.payer@nebelwelt.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-13exec: avoid gcc-8 warning for get_task_commArnd Bergmann
commit 3756f6401c302617c5e091081ca4d26ab604bec5 upstream. gcc-8 warns about using strncpy() with the source size as the limit: fs/exec.c:1223:32: error: argument to 'sizeof' in 'strncpy' call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess] This is indeed slightly suspicious, as it protects us from source arguments without NUL-termination, but does not guarantee that the destination is terminated. This keeps the strncpy() to ensure we have properly padded target buffer, but ensures that we use the correct length, by passing the actual length of the destination buffer as well as adding a build-time check to ensure it is exactly TASK_COMM_LEN. There are only 23 callsites which I all reviewed to ensure this is currently the case. We could get away with doing only the check or passing the right length, but it doesn't hurt to do both. Link: http://lkml.kernel.org/r/20171205151724.1764896-1-arnd@arndb.de Signed-off-by: Arnd Bergmann <arnd@arndb.de> Suggested-by: Kees Cook <keescook@chromium.org> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Serge Hallyn <serge@hallyn.com> Cc: James Morris <james.l.morris@oracle.com> Cc: Aleksa Sarai <asarai@suse.de> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Frederic Weisbecker <frederic@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-12media: spi: add driver for rk1608Hu Kejun
Change-Id: I8508668fcd1e35c49fe581875fcf9045e004ae9c Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-12-12clk: rockchip: rk3399: export SCLK_I2SOUT_SRC clk ID for i2sElaine Zhang
Change-Id: Ifbcea830e5f49946c1feea3f51d125e6ed566d5f Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-11PCI: rockchip: Add support for PCIe dma transfer functionSimon Xue
Change-Id: Ie577d9816205c1e6d04ba666d68a6c7e57efa12d Signed-off-by: Simon Xue <xxm@rock-chips.com>
2018-12-11Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAmit Pundir
* linux-linaro-lsk-v4.4: (622 commits) Linux 4.4.166 drm/ast: Remove existing framebuffers before loading driver s390/mm: Check for valid vma before zapping in gmap_discard namei: allow restricted O_CREAT of FIFOs and regular files sched/core: Allow __sched_setscheduler() in interrupts when PI is not used btrfs: Ensure btrfs_trim_fs can trim the whole filesystem usb: xhci: fix uninitialized completion when USB3 port got wrong status tty: wipe buffer if not echoing data tty: wipe buffer. iwlwifi: mvm: fix regulatory domain update when the firmware starts scsi: qla2xxx: do not queue commands when unloading scsi: ufshcd: release resources if probe fails scsi: ufs: fix race between clock gating and devfreq scaling work scsi: ufshcd: Fix race between clk scaling and ungate work scsi: ufs: fix bugs related to null pointer access and array size netfilter: nf_tables: fix oops when inserting an element into a verdict map mwifiex: fix p2p device doesn't find in scan problem mwifiex: Fix NULL pointer dereference in skb_dequeue() cw1200: Don't leak memory if krealloc failes Input: xpad - add support for Xbox1 PDP Camo series gamepad ... Conflicts: Makefile arch/x86/Makefile drivers/base/power/main.c drivers/block/zram/zram_drv.c kernel/debug/kdb/kdb_io.c net/ipv6/route.c scripts/Kbuild.include Conflicts in above files are fixed as done in AOSP Change-Id: I5bd20327e0c1139c46f74e8d5916fa0530a307d3 ("Merge 4.4.165 into android-4.4"). arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c Conflicts in above files is due to AOSP Change-Id: I11cb874d12a7d0921f452c62b0752e0028a8e0a7 ("FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0"), which needed a minor rebasing. Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10UPSTREAM: seccomp: remove 2-phase APIKees Cook
Since nothing is using the 2-phase API, and it adds more complexity than benefit, remove it. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Andy Lutomirski <luto@kernel.org> (cherry picked from commit 8112c4f140fa03f9ee68aad2cc79afa7df5418d3) Bug: 119769499 Change-Id: Iff6246c1e6e9dd0161b80b666a5e796f78a5c785 Signed-off-by: Greg Hackmann <ghackmann@google.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10BACKPORT: seccomp: Add a seccomp_data parameter secure_computing()Andy Lutomirski
Currently, if arch code wants to supply seccomp_data directly to seccomp (which is generally much faster than having seccomp do it using the syscall_get_xyz() API), it has to use the two-phase seccomp hooks. Add it to the easy hooks, too. Cc: linux-arch@vger.kernel.org Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org> (cherry picked from commit 2f275de5d1ed7269913ef9b4c64a13952c0a38e8) Bug: 119769499 Change-Id: I96876ecd8d1743c289ecef6d2deb65361d1f5baa [ghackmann@google.com: drop changes to parisc, tile, and um, which didn't implement seccomp support in this kernel version] Signed-off-by: Greg Hackmann <ghackmann@google.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10Merge 4.20-rc1-4.4 into android-4.4Amit Pundir
* origin/upstream-f2fs-stable-linux-4.4.y: f2fs: guarantee journalled quota data by checkpoint f2fs: cleanup dirty pages if recover failed f2fs: fix data corruption issue with hardware encryption f2fs: fix to recover inode->i_flags of inode block during POR f2fs: spread f2fs_set_inode_flags() f2fs: fix to spread clear_cold_data() Revert "f2fs: fix to clear PG_checked flag in set_page_dirty()" f2fs: account read IOs and use IO counts for is_idle f2fs: fix to account IO correctly for cgroup writeback f2fs: fix to account IO correctly f2fs: remove request_list check in is_idle() f2fs: allow to mount, if quota is failed f2fs: update REQ_TIME in f2fs_cross_rename() f2fs: do not update REQ_TIME in case of error conditions f2fs: remove unneeded disable_nat_bits() f2fs: remove unused sbi->trigger_ssr_threshold f2fs: shrink sbi->sb_lock coverage in set_file_temperature() f2fs: fix to recover cold bit of inode block during POR f2fs: submit cached bio to avoid endless PageWriteback f2fs: checkpoint disabling ... Conflicts: fs/f2fs/data.c Change-Id: I95097a969bbd23c2009106b07be8a1eeec675b1c Signed-off-by: Jaegeuk Kim <jaegeuk@google.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10Revert "FROMGIT: crypto: speck - export common helpers"Alistair Strachan
This reverts commit bc84402781ae0a4863983c22cdfabccb2de24761. Bug: 116008047 Change-Id: I9d0a8357be1ab090a793646716771015299fb7fe Signed-off-by: Alistair Strachan <astrachan@google.com> [AmitP: Updated commit message for correct SHA1 hash] Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10UPSTREAM: loop: add ioctl for changing logical block sizeOmar Sandoval
This is a different approach from the first attempt in f2c6df7dbf9a ("loop: support 4k physical blocksize"). Rather than extending LOOP_{GET,SET}_STATUS, add a separate ioctl just for setting the block size. Bug: 117823094 Change-Id: I8e69b8839d7fee3be564cbfce1797ce108e1aa1e Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> (cherry picked from commit 89e4fdecb51cf5535867026274bc97de9480ade5) Signed-off-by: Martijn Coenen <maco@android.com> (cherry picked from commit 6edf1ad773206e5e1ec76b6b8492c83eecae031d) Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10UPSTREAM: media: rc: Remove init_ir_raw_event and DEFINE_IR_RAW_EVENT macrosSean Young
This can be done with c99 initializers, which makes the code cleaner and more transparent. It does require gcc 4.6, because of this bug in earlier versions: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676 Since commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6"), this is the case. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> (cherry picked from commit 183e19f5b9ee18fc7bc4b3983a91b5d0dd6c7871) Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> Conflicts: drivers/media/pci/cx88/cx88-input.c drivers/media/rc/imon_raw.c drivers/media/rc/mceusb.c drivers/media/rc/meson-ir.c drivers/media/rc/mtk-cir.c drivers/media/rc/redrat3.c drivers/media/rc/sir_ir.c drivers/media/rc/st_rc.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:34:04 +0000