summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2019-03-11UPSTREAM: usb: gadget: add f_uac1 variant based on a new u_audio apiRuslan Bilovol
This patch adds a new function 'f_uac1' (f_uac1 with virtual "ALSA card") that uses recently created u_audio API. Comparing to legacy f_uac1 function implementation it doesn't require any real Audio codec to be present on the device. In f_uac1 audio streams are simply sinked to and sourced from a virtual ALSA sound card created using u_audio API. Legacy f_uac1 approach is to write audio samples directly to existing ALSA sound card f_uac1 approach is more generic/flexible one - create an ALSA sound card that represents USB Audio function and allows to be used by userspace application that may choose to do whatever it wants with the data received from the USB Host and choose to provide whatever it wants as audio data to the USB Host. f_uac1 also has capture support (gadget->host) thanks to easy implementation via u_audio. By default, capture interface has 48000kHz/2ch configuration, same as playback channel has. f_uac1 descriptors naming convention uses f_uac2 driver naming convention that makes it more common and meaningful. Comparing to f_uac1_legacy, the f_uac1 doesn't have volume/mute functionality. This is because the f_uac1 volume/mute feature unit was dummy implementation since that driver creation (2009) and never had any real volume control or mute functionality, so there is no any difference here. Since f_uac1 functionality, exposed interface to userspace (virtual ALSA card), input parameters are so different comparing to f_uac1_legacy, that there is no any reason to keep them in the same file/module, and separate function was created. g_audio can be built using one of existing UAC functions (f_uac1, f_uac1_legacy or f_uac2) Conflicts: drivers/usb/gadget/Kconfig Change-Id: Ib84198c0fcabccc667ae05e181779f3b984d2141 Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> (cherry picked from commit 0591bc2360152f851e29246884805bb77a2c3b9d)
2019-03-11UPSTREAM: usb: gadget: function: make current f_uac1 implementation legacyRuslan Bilovol
Before introducing new f_uac1 function (with virtual ALSA card) make current implementation legacy. This includes renaming of existing files, some variables, config options and documentation Conflicts: drivers/usb/gadget/Kconfig drivers/usb/gadget/function/f_uac1_legacy.c Change-Id: I034b45205fccaaf12b13032293938640a902160e Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> (cherry picked from commit d355339eecd986648420e05f8c958fbc78dbb382)
2019-03-11UPSTREAM: usb: gadget: uac2: add req_number as parameterPeter Chen
There are only two requests for uac2, it may not be enough at high loading system which usb interrupt handler can't be serviced on time, then the data will be lost since it is isoc transfer for audio. In this patch, we introduce a parameter for the number for usb request, and the user can override it if current number for request is not enough for his/her use case. Besides, update this parameter for legacy audio gadget and documentation. Change-Id: I09c3a048f3ed50b8725e7009e5927800bd2434d6 Signed-off-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: William Wu <william.wu@rock-chips.com> (cherry picked from commit e92b9d449d0490800160bfeb5ee1175a02979f47)
2019-03-05dt-bindings: sound: add compatible for rk1808es vadSugar Zhang
Change-Id: I9eff5ec7ff87f2c26fdd4264cad1169a42889992 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-02-15dt-bindings: Document add imx327Cai YiWei
Change-Id: I4f174e1c6fa49692138035909cef6534fa35fcab Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-02-12dt-bindings: usb: dwc3: add needs-reset-on-resume propertyWilliam Wu
This patch adds a new property "needs-reset-on-resume" for Rockchip DWC3 IP. We can use it if we want to reset the DWC3 controller upon PM resume. Change-Id: I8ae7f8fe46388cdc9e265e758d9edeb82840d284 Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-02-01dt-bindings: sound: rk3308_codec: rename internal-micbias to ↵Xing Zheng
rockchip,micbias1(2) Change-Id: I2302100c4b4ebf1e4a38db8a3949c7dcbfaad711 Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-01-29arm64: dts: rockchip: px30-evb-ddr3-v10: Separate android firmwarewu jingchen
Split DT source files to separate out android firmware for Android Pie & Oreo Change-Id: Ib16858996e236bb292bc380c0fddea2f5213c15b Signed-off-by: wu jingchen <oven.wu@rock-chips.com>
2019-01-24dt-bindings: sound: rk3308_codec: add 'rockchip,internal-micbias' propertyXing Zheng
Change-Id: I3a9f528f07386394e397e3be6701221ce62f31d9 Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-01-23arm64: dts: rockchip: add rk3399pro evb v11 DTS for linuxCaesar Wang
Evb is part of a family of boards called rk3399pro. As best as possible, the properties shared by the rk3399pro family are placed in rk3399pro.dtsi, while Evb-linux specific bits are in rk3399pro-evb-v11-linux.dts. This does not add full support for the base Evb board. Working and tested (to some extent): * cluster cpu/gpu support -- including frequency, performance * UART / console * Thermal * Touchscreen * EDP * Wifi * Bluetooth / Webcam * SD card * eMMC * USB2/USB3 * Backlight * DVFS: included cpu/gpu/ddr * CAMERA: had tested the ov13850 camera * VIDEO: tested the h264 video source * AUDIO: play and mic music * NPU * HDMI * GMAC Not tested: * Pcie * MIPI Not working: * SD CARD: no sure, maybe the board sd card is broken by hardware. Change-Id: I0c17880f69956cae38d1c83467dd946e7b5de058 Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-01-23arm64: dts: rockchip: add rk3399pro evb v10 board support for linuxCaesar Wang
Added this patch to support the v10 board before, as the most people used the rk3399pro v11 board for now. Note: this patch had *not* verified the all functions, it can bringup for v10 board and some basic functions. (included wifi/bt, camera, display, video, usb...and so on.) Change-Id: I6da3edd89e2d85fc75e519ef931727903991c6b7 Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-01-18dt-bindings: media: add rkisp1 for rk3368Cai YiWei
Change-Id: I13e3baa69921c9db6e88e987aff84cbbbdc9974f Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18dt-bindings: media: add mipi rx dphy for rk3368Cai YiWei
Change-Id: I39d531ef96e5abffa6071e4fd40b94d00a7cafc5 Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-16serial: 8250_dw: uart wake upHuibin Hong
Add wakeup-source to uart dts node to enable uart wake up system when it receives data. Change-Id: If4e82a4d3dbaca708209553dc3693089864c782f Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-01-11dt-bindings: nvmem: rockchip-efuse: add description for RK1808 SoCsLiang Chen
Change-Id: I76c56b0c9709d849c87a059d7e67d67ae98ddbb5 Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-01-09drm/bridge: lt8912: Use drm_add_modes_noedid instead of hard-coded modeWyon Bi
Change-Id: I7420a455c3e1928482e27f7ef9e3c996afe0c8a1 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08dt-bindings: display: rockchip: lvds: support "dual-channel" propertyWyon Bi
Change-Id: I21c8f4a727b41eed6be39a10169c41bfd4c0e887 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08dt-bindings: display: rockchip: lvds: support "rockchip,data-swap" propertyWyon Bi
Change-Id: I904bae259c02b445472c278043b4dc33f15f4273 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08dt-bindings: display: rockchip: lvds: remove unused propertyWyon Bi
The bus format is therefore retrieved from the connected panel information. Change-Id: Ie8489f75f828f25d6bdd59e8d1efb7959a3a6a28 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-07UPSTREAM: iio: distance: add dt binding for devantech-srf04Andreas Klinger
This patch adds dt binding for devantech ultrasonic ranger srf04. The vendor "devantech" was already added to the vendor list with "[PATCH v4 1/3] iio: distance: srf08: add trivial DT binding" Change-Id: I31278852798c6688f16902e3cc5222d503857667 Signed-off-by: Andreas Klinger <ak@it-klinger.de> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org> (cherry picked from commit 2fb5904d92d42c88432cb29f567654d28f9d6411) Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-01-07dt-bindings: display: rockchip: lvds: remove unused propertyWyon Bi
Change-Id: I52e547b1fe19f7055ee407a8289807e1dec809e8 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-07dt-bindings: display: rockchip: rgb: add support for rk3288Wyon Bi
Change-Id: I6018ef786191c1e82a6a8181c9b4e026a4da0b7a Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-07dt-bindings: phy: Document INNOSILICON LVDS/TTL video PHY bindingsWyon Bi
Change-Id: I022306b4fe4c283b5196582b1af95c70954656ad Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-04usb: dwc3: add a new xhci trb ent quirk for xHCIWilliam Wu
On some xHCI controllers (e.g. Rockchip RK3399/RK3328/RK1808), which are integrated in DWC3 IP, need to enable the Evaluate Next TRB(ENT) flag in the TRB data structure to force xHC to pre-fetch the next TRB of a TD. It's useful for the stability of xHCI when transfer large data. I have verify this patch on the following three cases: Case 1: On RK3399/RK3399Pro platforms, I found that when USB 3.0 read/write at the same time in the following test case, it may easily fail without this patch. Host transfer: 1024B, 4MB, 4MB, 4MB Device transfer: 1024B, 4MB, 4MB, 4MB Both Host and Device transfer "24B, 4MB, 4MB, 4M" Repeatedly until transfer fail. Case 2: On RK3399 platform, Type-C1 USB 3.0 port connects with HUB and Orbbec USB 3.0 Camera with the enumeration information: usb 5-1: new high-speed USB device number 2 using xhci-hcd usb 5-1: New USB device found, idVendor=05e3, idProduct=0610 usb 5-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0 usb 5-1: Product: USB2.1 Hub usb 5-1: Manufacturer: GenesysLogic hub 5-1:1.0: USB hub found hub 5-1:1.0: 2 ports detected usb 6-1: new SuperSpeed USB device number 2 using xhci-hcd usb 6-1: New USB device found, idVendor=05e3, idProduct=0620 usb 6-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0 usb 6-1: Product: USB3.1 Hub usb 6-1: Manufacturer: GenesysLogic hub 6-1:1.0: USB hub found hub 6-1:1.0: 2 ports detected usb 5-1.2: new high-speed USB device number 3 using xhci-hcd usb 5-1.2: New USB device found, idVendor=2bc5, idProduct=050d usb 5-1.2: New USB device strings: Mfr=2, Product=1, SerialNumber=3 usb 5-1.2: Product: USB usb 5-1.2: Manufacturer: USB usb 5-1.2: SerialNumber: USB uvcvideo: Found UVC 1.00 device USB (2bc5:050d) usb 6-1.2: new SuperSpeed USB device number 3 using xhci-hcd usb 6-1.2: New USB device found, idVendor=2bc5, idProduct=060d usb 6-1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=0 usb 6-1.2: Product: Orbbec(R) Astra(TM) usb 6-1.2: Manufacturer: Orbbec(R) Without this patch, it's possible to fail to open the Orbbec USB 3.0 camera or fail to preview image. Case3: On RK3399Pro platform, transfer the NPU data between the NPU USB 3.0 device and RK3399 USB 3.0 host. Change-Id: I87b1d8b8b6912d77b988362f2f6dcd7766da8b0e Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-04dt-bindings: phy: phy-rockchip-inno-mipi-dphy: Remove support for rk3128Wyon Bi
Change-Id: I3b09d88daa5864a9343a730f5f5ef850d0f168f6 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-04dt-bindings: display: rockchip: rgb: add rk3128 compatible stringWyon Bi
Change-Id: I600ff82678d8de1158071936704a8cff783730c7 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03dt-bindings: display: bridge: Document Chipone ICN6211 MIPI-DSI to RGB ↵Wyon Bi
bridge bindings Change-Id: I2e4cac28a704416858ae8ef3e4b57d48aec84d65 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03dt-bindings: phy: phy-rockchip-inno-mipi-dphy: Remove support for rk3366Wyon Bi
Change-Id: I149c86dd06bfbacdad7c168ffac7707e3ca78e75 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03dt-bindings: display: rockchip: lvds: Remove support for rk3366Wyon Bi
Change-Id: I72c4d335315315d666806eea4eab70d9d7d5a183 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03dt-bindings: phy: phy-rockchip-inno-mipi-dphy: Remove support for rk3368Wyon Bi
Change-Id: I72b4017625c41b15b15d34123f2acdd60a1d7650 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03dt-bindings: display: rockchip: rgb: add rk3368 compatible stringWyon Bi
Change-Id: I105319043f8d67943aa0d8ac70cadc5441065e2f Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29dt-bindings: phy: inno-mipi-dphy: update DT binding to remove support for px30Wyon Bi
Change-Id: I308f90656bfa89e99e19452bce687aaec0e824c2 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29dt-bindings: display: rockchip: lvds: add support for generic phyWyon Bi
This patch adds support for generic phy as an optional. Change-Id: Idcb30be4a88a688be839b45a96d3b78258d63a7d Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29dt-bindings: display: rockchip: rgb: add support for generic phyWyon Bi
This patch adds support for generic phy as an optional. Change-Id: I3274d8f50fb5f06912d1f46cfb70252722b72223 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29dt-bindings: phy: Document INNOSILICON MIPI/LVDS/TTL Video Combo PHY bindingsWyon Bi
Change-Id: Ib9a2f3a4a5fe82b47ad3d85be1b553ad56b13641 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29thermal: rockchip: add pinctrl controlElaine Zhang
Based on the TSADC Tshut mode to select pinctrl, instead of setting pinctrl based on architecture (Not depends on pinctrl setting by "init" or "default"). And it requires setting the tshut polarity before select pinctrl. Change-Id: Iac9ca05073b0181ee13b0048d0c2a54204f82bca Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-27iio: adc: support GPIO-controlled Multiplexers ADCZiyuan Xu
The rockchip saradc controller is too scanty for some products that is requires at least x10 channels ADC. Generally, we can use a CMOS analog switch to extend a multi-channel ADC, eg.sgm3699. It's a quad, bidirectional, single-pole/double-throw (SPDT) CMOS analog siwtch. This patch implements a multiplexer ADC controller using a number of gpio pins and parent ADC channel. It's compatible with most of CMOS analog switch. And it provides a direct mode to get a raw data of each muxadc channel. /sys/bus/iio/devices/iio:device1/ |-- in_voltage_adc_brush_raw |-- in_voltage_adc_mid_brush_raw |-- in_voltage_adc_move_l_raw |-- in_voltage_adc_move_r_raw |-- in_voltage_qyxs_raw |-- in_voltage_qzxs_raw |-- in_voltage_yxs_raw |-- in_voltage_zxs_raw Change-Id: If71636d45543430e616299e6a6b91084f4f315e6 Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-12-26dt-bindings: media: add bindings for Rockchip virtual camera.Wenlong Zhuang
Change-Id: I0933fdb858d7f6fef344279093af8d6f4d41b7e8 Signed-off-by: Wenlong Zhuang <daisen.zhuang@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-19drm/rockchip: rgb: Allow to configure data sync from DTWyon Bi
Change-Id: Id49839dc8885f632287879ec9a86420dc6dcd4de Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-19drm/bridge/analogix: anx6345: Fix active polarity of reset gpioWyon Bi
Change-Id: I44e32c1b477acb57c2937c441305ef1c55326315 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-18FROMLIST: dt-bindings: Add ANX6345 DP/eDP transmitter bindingIcenowy Zheng
The ANX6345 is an ultra-low power DisplayPort/eDP transmitter designed for portable devices. Add a binding document for it. Change-Id: Ie4200b390c6c0b6f19abdcb3eb2aca8a8314e82b Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181018073327.64942-5-icenowy@aosc.io
2018-12-17dt-bindinds: pinctrl: rockchip: add pinctrl for rv1108 socSugar Zhang
This patch adds pinctrl compatible string for rv1108 soc. Change-Id: I5a32f96439f337e77aa4288ca6bceccb49e1c976 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-17dt-bindings: soc: rockchip: add pmugrf compatible for rv1108 socSugar Zhang
This patch adds pmugrf compatible for rv1108 soc. Change-Id: I0b2e6fdcbd565ea324e403cddae8b4d56e8a9b46 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-17clk: rockchip: add clock controller for rv1108Sugar Zhang
This patch add the clock tree definition for rv1108. Change-Id: I9b55cd46c62331057fe8a404c606fe9d08f03388 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-12-13UPSTREAM: drivers: firmware: psci: unify enable-method binding on ARM ↵Sudeep Holla
{64,32}-bit systems Currently ARM CPUs DT bindings allows different enable-method value for PSCI based systems. On ARM 64-bit this property is required and must be "psci" while on ARM 32-bit systems this property is optional and must be "arm,psci" if present. However, "arm,psci" has always been the compatible string for the PSCI node, and was never intended to be the enable-method. So this is a bug in the binding and not a deliberate attempt at specifying 32-bit differently. This is problematic if 32-bit OS is run on 64-bit system which has "psci" as enable-method rather than the expected "arm,psci". So let's unify the value into "psci" and remove support for "arm,psci" before it finds any users. Reported-by: Soby Mathew <Soby.Mathew@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> (cherry picked from commit 978fa436231a834dc686292efc7d944d9013e035) Change-Id: Ie75091185d9236595c564081083ffc202f9ba178
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-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 "fscrypt: add Speck128/256 support"Alistair Strachan
This reverts commit eb13e0b69296ad1d3a9a3fa0cb6570aaf99f9f0c. Resolves conflicts with a later CL, e7724207f71e "fscrypt: log the crypto algorithm implementations". Also leaves the include/uapi/linux/fs.h constants in place to prevent future accidental re-use. Bug: 116008047 Change-Id: I2d64d8d3e384400b7bdfc06a353c3844d4ebb377 Signed-off-by: Alistair Strachan <astrachan@google.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-12-10UPSTREAM: media: rc: add ioctl to get the current timeoutSean Young
Since the kernel now modifies the timeout, make it possible to retrieve the current value. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> (cherry picked from commit 95d1544eb643847e05df06c3de252609593c9073) Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> Conflicts: Documentation/media/uapi/rc/lirc-set-rec-timeout.rst
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:10:48 +0000