summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-05Reduce SD IO Voltage to 3.0Vpuma-release-4.4-2018-01-11-gopherKlaus Goger
The SD-Card IO rail on the RK3399 should not be operated higher than 3.15V. We reduce it to 3.0V. Note that the I/Os on the Qseven edge connector will still be 3.3V as expected. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
2018-01-29puma-rk3399_defconfig: enable BRCM driver for AP6255 WifiJakob Unterwurzacher
The AP6255 module contains a Broadcom 43455 chip. Enable the driver and build the neccessary firmware into the kernel. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-29puma: workarounds for AP6255 wifi moduleJakob Unterwurzacher
Sleep must be disabled as the module does not seem to wake up again when plugged into the MicroSD slot. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-23can: ucan: update Kconfig help textJakob Unterwurzacher
UCAN is now included on several compute modules made by Theobroma Systems. Update the help text accordingly. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-23gpio: start gpio numbers at zero againJakob Unterwurzacher
Commit 3b7424f33273 pinctrl: rockchip: Make the gpio base started from 1000 let the gpio numbers start at 1000 instead of zero. This is an ABI change and breaks all existing gpio users. Undo the user-visible change by defining ARCH_GPIO_BASE to zero. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12arm64: dts: rockchip: add DTS for RK3399-Q7 (Puma) SoMJakob Unterwurzacher
The RK3399-Q7 (Puma) is a system-on-module featuring the Rockchip RK3399 in a Qseven-compatible form-factor. RK3399-Q7 features: * CPU: ARMv8 64bit Big-Little architecture, * Big: dual-core Cortex-A72 * Little: quad-core Cortex-A53 * IRAM: 200KB * DRAM: 4GB-128MB dual-channel * eMMC: onboard eMMC * SD/MMC * GbE (onboard Micrel KSZ9031) Gigabit ethernet PHY * USB: * USB3.0 dual role port * 2x USB3.0 host, 1x USB2.0 host via onboard USB3.0 hub * Display: HDMI/eDP/MIPI * Camera: 2x CSI (one on the edge connector, one on the Q7 specified CSI ZIF) * NOR Flash: onboard SPI NOR * Companion Controller: onboard additional Cortex-M0 microcontroller * RTC * fan controller * CAN This dts describes includes all required peripherals for booting and basic functionality including eMMC, NOR, USB, Ethernet, HDMI output (with audio), I2C buses (including the RTC and fan controller features provided by the default companion controller firmware) and LED definitions. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12arm64: defconfig: add puma-rk3399 defconfigJakob Unterwurzacher
Create a board-specific defconfig for the RK3399-Q7 SoM. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12drm/rockchip: increase vop selection message priorityJakob Unterwurzacher
As the VOPs have different capabilities, which vop was selected is usually interesting to the user. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12drm/rockchip: dw-hdmi: downgrade "failed to set" message to infoJakob Unterwurzacher
hdmi works fine, and looking at what properties are actually failing (see below) indicates that they are not essential. Downgrade the message level from "error" to "info". [ 10.545924] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property hdmi_color_depth_capacity [ 10.557993] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property hdmi_output_mode_capacity [ 10.570473] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property brightness [ 10.581221] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property contrast [ 10.591810] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property saturation [ 10.602415] [drm:dw_hdmi_rockchip_set_property] failed to set rockchip hdmi connector property hue [ 10.708193] rockchip-dp ff970000.edp: Link Training Clock Recovery success [ 10.717607] rockchip-dp ff970000.edp: Link Training success!
2018-01-12brcmfmac: 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
2018-01-12ASoC: sgtl5000: Use normal VAG ramp to reduce pop noiseKlaus Goger
The slow downed ramp causes a higher voltage level at the turn off time generating an audible pop noise. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
2018-01-12Input: add driver for Silead touchscreensRobert Dolca
This driver adds support for Silead touchscreens. It has been tested with GSL1680 and GSL3680 touch panels. It supports ACPI and device tree enumeration. Screen resolution, the maximum number of fingers supported and firmware name are configurable. Signed-off-by: Robert Dolca <robert.dolca@intel.com> Signed-off-by: Daniel Jansen <djaniboe@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: drivers/input/touchscreen/Kconfig Input: silead - remove some dead code buf[0] is an unsigned char. touch_nr is an int. The test for negative here doesn't make sense so I have removed it. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Input: silead - use devm_gpiod_get The silead code is using devm_foo for everything (and does not free any resources). Except that it is using gpiod_get instead of devm_gpiod_get (but is not freeing the gpio_desc), change this to use devm_gpiod_get so that the gpio will be properly released. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Input: silead_gsl1680 - document firmware-name, fix implementation The driver has supported touchscreen-fw-name to specify the firmware to load since it has been merged, but this was omitted from the dt-binding documentation. During review of adding touchscreen-fw-name to the binding documentation it was brought up that there is a standard property name called "firmware-name" for this, which should be used. Since there are no users of touchscreen-fw-name yet, this commit adds documentation of "firmware-name" to the dt-binding documentation and switches the driver over to use this. This commit also makes the driver add a "silead/" prefix to the firmware name from dt before calling request_firmware. That the firmware files are stored under /lib/firmware/silead under Linux is an implementation detail and does not belong in devicetree. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Input: silead_gsl1680 - use "silead/" prefix for firmware loading The silead touch-controller ICs use a different firmware per digitizer / tablet model. So there are going to be quite a few of then and they really should be under a separate subdir. This commit prefixes the default firmware names with "silead/" just like we are already doing for devicetree specified firmware names. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Input: silead - add OF device ID table The driver doesn't have a struct of_device_id table but supported devices are registered via Device Trees. This is working on the assumption that a I2C device registered via OF will always match a legacy I2C device ID and that the MODALIAS reported will always be of the form i2c:<device>. But this could change in the future so the correct approach is to have an OF device ID table if the devices are registered via OF. As pointed by Hans de Goede, there's no mssl1680 and this is just used in some ACPI systems to identify the gsl1680 chip. So isn't included in the OF device ID table since a DT should use the proper device name instead. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Input: back-port silead.c: pos[i] handling/assignment Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Input: back-port silead.c: invert_x/y & swap_xy Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Input: silead: retry firmware load If we get ENOENT when trying to load the firmware, this can just mean that the rootfs is not mounted yet. Return EPROBE_DEFER so the probe is retried later. To prevent an infinite probe loop when the firmware does not exist at all, the retries are capped to 10. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12can: ucan: add minimal support for Theobroma Systems UCAN devicesJakob Unterwurzacher
Driver for UCAN based USB CAN devices. This patch does not include HWFILTER support. Signed-off-by: Martin Elshuber <martin.elshuber@theobroma-systems.com> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
2018-01-12remove .scmversion fileKlaus Goger
The empty .scmvesion file breaks the setlocalversion script. As we want to use CONFIG_LOCALVERSION_AUTO we delete the file Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
2018-01-11ARM: dts: rk3288-miniarm: enable rkisp1 and add imx219/ov5647Jacob Chen
Change-Id: Ifb9c18be4cc7fc3d663101c41e3c0be9eff513d4 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11arm64: dts: rockchip: add some peripheral configuration for px30/rk3326Zhou weixin
devicelist: backlight\key\wifi\bt\sdmmc\touchpad\gsensor\fiq Change-Id: I303c91ebca0b6d2ec9d452395e470fdd574e6fef Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-11drm/rockchip: rk618: vif: Convert to drm_bridgeWyon Bi
Change-Id: I124bfabf7fe67854f55aef5fec0cad00cd5e2eac Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11mfd: rk618: add vif subdevWyon Bi
Change-Id: Ib2516da15406e232d5836f7476db935e7343d7d8 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11arm64: dts: rockchip: Add dsi node for PX30Wyon Bi
Change-Id: Idf22f326c457c6b658269070b4fd2d5e71a9f62f Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11arm64: dts: rockchip: Add mipi_dphy node for PX30Wyon Bi
Change-Id: I92c6bfe60dfe0c89befddad528c8d41a2318567a Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11phy/rockchip: dphy: Add support for PX30Wyon Bi
Change-Id: Ia7e29691f66fa10a5cdf1379b4eb419581ddda5f Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11drm/rockchip: dsi: Add support for PX30Wyon Bi
Change-Id: Ib7e43456d8456b1db74880710b88bdf7da4639e8 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11drm/rockchip: dsi: Add a better description for dw_mipi_dsi_plat_dataWyon Bi
Change-Id: I6a149747a12bbd1c3e84cd33769ed453770353af Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11media: i2c: imx219: apply gain/exposure immediatelyJacob Chen
or it's too slow for AEC algorithm Change-Id: I646a31b026a1e753e8bee681d088c7b2944ed147 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11media: i2c: imx219: support 1920*1080*48fps modeJacob Chen
and correct some control to make 3A work Change-Id: Id3fc3ca9c5b123b6d45cd80d8e857a5c151c2427 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11ARM: configs: rockchip_linux: enable rockchip isp1 driverJacob Chen
and some sensors Change-Id: I8be884069341680c09c7bccd0e17b6faff0a681b Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11ARM: dts: add rk3288-firefly-reload-linuxJacob Chen
tc358749 enabled with rockchip-isp1 driver Change-Id: I94c36f2d78cb190436e974bd47500dbbce18deae Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11ARM: dts: add rk3288-rkisp1.dtsiJacob Chen
There are many isp driver in 4.4 kernel, let's add a dtsi to help switch between them. Change-Id: Ida1af575b6c64ffec56ad695933dfdf22cdd72c1 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11clocksource: arch_timer: make virtual counter access configurableGreg Hackmann
CVE-2017-13218 Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
2018-01-11arm64: issue isb when trapping CNTVCT_EL0 accessGreg Hackmann
CVE-2017-13218 Change-Id: I6005a6e944494257bfc2243fde2f7a09c3fd76c6
2018-01-11BACKPORT: arm64: Add CNTFRQ_EL0 trap handlerMarc Zyngier
We now trap accesses to CNTVCT_EL0 when the counter is broken enough to require the kernel to mediate the access. But it turns out that some existing userspace (such as OpenMPI) do probe for the counter frequency, leading to an UNDEF exception as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit. The fix is to handle the exception the same way we do for CNTVCT_EL0. Fixes: a86bd139f2ae ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled") Reported-by: Hanjun Guo <guohanjun@huawei.com> Tested-by: Hanjun Guo <guohanjun@huawei.com> Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit 9842119a238bfb92cbab63258dabb54f0e7b111b) CVE-2017-13218 Change-Id: I2f163e2511bab6225f319c0a9e732735cbd108a0
2018-01-11BACKPORT: arm64: Add CNTVCT_EL0 trap handlerMarc Zyngier
Since people seem to make a point in breaking the userspace visible counter, we have no choice but to trap the access. Add the required handler. Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> (cherry picked from commit 6126ce0588eb5a0752d5c8b5796a7fca324fd887) CVE-2017-13218 Change-Id: I0705f47c85a78040df38df18f51a4a22500b904d
2018-01-11drm/rockchip: dsi: Convert to use regmapWyon Bi
Change-Id: Ia697fce3f51cf0278f37ac0e809173ebca076d6b Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11drm/rockchip: dsi: Fix pclk hanndlingWyon Bi
Change-Id: I31f6bc3991a03b79209c846a9c051acb0b2e8270 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11arm: dts: rk3288-evb-rk808-linux: Add ov13850 camera support.Leo Wen
Change-Id: I693f3ec61b8a2cadc5d4c461149a54d8c6332eec Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-01-10dt-bindings: rockchip: rga: Document for px30/rk3326 rgaPutin Lee
Change-Id: Ibbd3c1c7aa47697870a0168c889ff6a0247464d5 Signed-off-by: Putin Lee <putin.li@rock-chips.com>
2018-01-10arm64: dts: rockchip: rk3328: add vpu_combo and enable itXinhuang Li
add vpu_combo consist of avsd and vdpu Change-Id: Ib49238d6a187dd7d621ad40ee0635b74825931f8 Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-01-10usb: dwc_otg_310: fix NULL pointer error from driver attributesMeng Dongyang
In current code, the driver attributes of DWC2 controller is created during driver initialization, if we get or set them before finish probe device, the device's pointer in attribute function will be NULL and this will crash the system. So this patch make the function return directly if the pointer is NULL. The attributes mention above: /sys/bus/platform/drivers/usb20_otg/dwc_otg_conn_en /sys/bus/platform/drivers/usb20_otg/force_usb_mode /sys/bus/platform/drivers/usb20_otg/vbus_status Change-Id: If063a884249afa7172bf28719b8c2b8a5641ac4b Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-01-09staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctlViktor Slavkovic
A lock-unlock is missing in ASHMEM_SET_SIZE ioctl which can result in a race condition when mmap is called. After the !asma->file check, before setting asma->size, asma->file can be set in mmap. That would result in having different asma->size than the mapped memory size. Combined with ASHMEM_UNPIN ioctl and shrinker invocation, this can result in memory corruption. Bug: 66954097 Signed-off-by: Viktor Slavkovic <viktors@google.com> Change-Id: I268225133f96fde0fadd1ec621aafef27d392d65
2018-01-09mfd: rk808: initialize rk808_i2c_client by defaultJoseph Chen
Even "rockchip,system-power-controller" is not found, rk808_i2c_client is needed for suspend/resume and the other. Change-Id: I17ebb3a1d1e7ec8dc9f4a3ee2dbdcd9ae4c1648b Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-09power: rk818-battery: fix 4250mv charge voltage missingJoseph Chen
Update according to latest datasheet. Change-Id: I980e3b9705c8e1ccce5d0fba9b1b40cbf1681abe Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-09driver: input: sensors: modify accel sensor calibration offsetZorro Liu
Change-Id: I411f148b38aa0b4feabf9135123d20d3006798fa Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-01-09arm64: dts: rockchip: auto select opp-table by leakage for rk3328Liang Chen
Change-Id: I5807d47085291efcd8eea61e59e931615b283ba5 Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-09video: rockchip: vpu: auto select opp-table by leakageLiang Chen
Change-Id: I3937d7bd896cca9aedb80bac2a8eb8737c79e7fb Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-09power: rk818-charger: flush workqueue on shutdownShunqing Chen
do not need to destroy workqueue on shutdown Change-Id: I78262414e91d8e48e088fd1a54a36542e29af8a7 Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-01-08arm64: dts: rockchip: update rk3328-dram-2layer-timingCanYang He
according kernel-3.10 below commit to update 16ceab7 ARM: dts: rockchip: update rk322xh-dram-2layer-timing Change-Id: I7ed708704adce3d1dfec6b2d8008e2474621a576 Signed-off-by: CanYang He <hcy@rock-chips.com>
2018-01-08PM / devfreq: rockchip_dmc: fix rk3328 of_get_ddr_timings failCanYang He
because of_parse_phandle() phandle_name parameter incorrect Change-Id: Ic1b2cf7b1a7331aff52102a863e97a937677f2ae Signed-off-by: CanYang He <hcy@rock-chips.com>
2018-01-08drm/rockchip: dsi: support read commandWyon Bi
Change-Id: I195b25ecef18978b1801e39ddc3fa37a3ae94050 Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-08arm64: dts: rockchip: rk3328-evb-android: Adjust temperature control parametersZhangbin Tong
Change-Id: I5e153efcdd1b839ddd412c2c0e6b15c69c4fa6b4 Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-01-08power: rk816: add power_supply property for CTS.Shunqing Chen
Android8.0 CTS needs to get max charging current, max charging voltage and battery charge counter. Change-Id: I83371d5b9f126ee17979f56e92d78b7887c316c6 Signed-off-by: Shunqing Chen <csq@rock-chips.com>