summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dt-bindings: gpu: Add Mali Utgard bindingsMaxime Ripard2017-02-021-0/+81
| | | | | | | | | | | The ARM Mali Utgard GPU family is embedded into a number of SoCs from Allwinner, Amlogic, Mediatek or Rockchip. Add a binding for the GPU of that family. Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: Add SPDIF to the Beelink X2Marcus Cooper2017-01-271-0/+24
| | | | | | | Enable the S/PDIF transmitter that is present on the Beelink X2 STB. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: Add the SPDIF block to the H3Marcus Cooper2017-01-271-0/+13
| | | | | | | Add the SPDIF transceiver controller block to the H3 dtsi. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: Add SPDIF TX pin to the H3Marcus Cooper2017-01-271-0/+5
| | | | | | | Add the SPDIF TX pin to the H3 dtsi. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: Add dts for the Beelink X2 STBMarcus Cooper2017-01-272-0/+137
| | | | | | | | | | The Beelink X2 is an STB based on the Allwinner H3 SoC with a uSD slot, 2 USB ports( 1 * USB-2 Host, 1 USB OTG), a 10/100M ethernet port using the SoC's integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver, a dual colour LED and an optical S/PDIF connector. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: sun8i: sina33: Enable displayMaxime Ripard2017-01-271-0/+34
| | | | | | | Enable the display pipeline with the associated 7" panel sold with the SinA33. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: sun8i: a23/a33: Add the oscillators accuracyMaxime Ripard2017-01-271-0/+2
| | | | | | | | The datasheet provided by Allwinner requires oscillators with an accuracy of 50ppm. Add it to our fixed clocks so that we can properly track the accuracy chain. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: sun8i: a23/a33: Enable the real LOSC and use itMaxime Ripard2017-01-271-5/+8
| | | | | | | | | | So far, the LOSC was generated through the RTC internal oscillator, which was a pretty poor and inaccurate choice. Now that the RTC properly exposes its internal mux between its oscillator and the external oscillator, we can use it were relevant. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: add support for Lichee Pi Zero boardIcenowy Zheng2017-01-272-1/+105
| | | | | | | | | Lichee Pi Zero is a small-sized V3s board, which is breadboard-compatible, and with a MicroUSB port with both OTG function and power function. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: add dtsi file for V3s SoCIcenowy Zheng2017-01-271-0/+309
| | | | | | | | | | | As we have the pinctrl and clock support for the V3s SoC, it's now to run a mainline Linux on it. So add a .dtsi file for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> [Maxime: Removed the dependency on the CCU headers] Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: sina31s: Enable USB OTG controller in peripheral modeChen-Yu Tsai2017-01-181-0/+5
| | | | | | | | | | | | | | | | | | | | While the SinA31s does have a proper 5-pin mini USB OTG port, the ID pin does not seem to work. The pin used in the schematics is always low, regardless of the attached OTG cable or SoC internal pin bias settings. The v1.5 board is missing bias resistors shown in the schematics for earlier revisions, and the connections of the remaining one does not match the schematics either. In addition, VBUS for this port is disconnected from the board's 5V power rail. The board features a pad to solder jumper pins to connect VBUS to 5V manually. Given the above and the fact that the board has 5 more USB host ports, it makes more sense to have the OTG port work in peripheral mode. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: reference-design: use AXP223 DTSIQuentin Schulz2017-01-121-1/+1
| | | | | | | | | | | | | Previously, the sun8i tablets used everything declared in AXP221 DTSI while they have an AXP223 PMIC. This corrects that so the sun8i tablets can get some features the AXP223 has (at the moment, ability to have 100mA as maximal current on VBUS power supply). Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: parrot: use AXP223 DTSIQuentin Schulz2017-01-121-1/+1
| | | | | | | | | | | | | Previously, the Allwinner Parrot R16 used everything declared in AXP221 DTSI while it has an AXP223 PMIC. This corrects that so the Allwinner Parrot R16 can get some features the AXP223 has (at the moment, ability to have 100mA as maximal current on VBUS power supply). Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: sina33: use AXP223 DTSIQuentin Schulz2017-01-121-1/+1
| | | | | | | | | | | | | Previously, the Sinlinx SinA33 used everything declared in AXP221 DTSI while it has an AXP223 PMIC. This corrects that so the Sinlinx SinA33 can get some features the AXP223 has (at the moment, ability to have 100mA as maximal current on VBUS power supply). Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: a33-olinuxino: use AXP223 DTSIQuentin Schulz2017-01-121-1/+1
| | | | | | | | | | | | | Previously, the Olimex A33-OlinuXino used everything declared in AXP221 DTSI while it has an AXP223 PMIC. This corrects that so the Olimex A33-OlinuXino can get some features the AXP223 has (at the moment, ability to have 100mA as maximal current on VBUS power supply). Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: add DTSI for AXP223Quentin Schulz2017-01-121-0/+58
| | | | | | | | | The AXP223 shares most of its logic with the AXP221 but it has some differences for the VBUS driver. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* dt-bindings: power: axp20x-usb: add axp223 compatibleQuentin Schulz2017-01-121-0/+5
| | | | | | | | | | This adds the "x-powers,axp223-usb-power-supply" to the list of compatibles for AXP20X VBUS power supply driver. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Rob Herring <robh@kernel.org> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun7i: Add wifi dt node on Banana ProJörg Krause2017-01-101-12/+17
| | | | | | | | | | | | | | | | The Banana Pro has an AMPAK AP6181 WiFi+Bluetooth module. The WiFi part is a BCM43362 IC connected to MMC3 of the A20 SoC via SDIO. The IC also takes a power enable signal via GPIO. This commit adds a device-tree node to power it up, so the mmc subsys can scan it, and enables the mmc controller which is connected to it. As the wifi enable pin of the AP6181 module is not really a regulator, switch the mmc3 node to the mmc-pwrseq framework for controlling it. This more accurately reflectes how the hardware actually works. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: Add SPDIF to the Mele I7Marcus Cooper2017-01-101-0/+24
| | | | | | | | Enable the S/PDIF transmitter that is present on the Mele I7. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* devicetree: bindings: Add vendor prefix for Shenzhen Xunlong SoftwareIcenowy Zheng2017-01-101-0/+1
| | | | | | | | | | | Shenzhen Xunlong Software CO.,Limited is a SBC vendor, which produces the "Orange Pi" series of SBCs. Add a vendor prefix for it. This prefix is already used in many Allwinner H3 boards. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: orange-pi-pc: Enable audio codecChen-Yu Tsai2017-01-101-0/+8
| | | | | | | | | The Orange Pi PC routes the LINEOUT pins to the audio out jack on the board. The onboard microphone is routed to MIC1, with MBIAS providing power. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-h3: Add device nodes for audio codec and its analog controlsChen-Yu Tsai2017-01-101-0/+19
| | | | | | | | Now that we support the audio codec found on the Allwinner H3 SoC, add device nodes for it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-a23: q8-tablet: Enable internal audio codecChen-Yu Tsai2017-01-101-0/+23
| | | | | | | | | | | | | | | | The A23 Q8 tablets have an internal mono speaker w/ external amp which has a shutdown control tied to a GPIO pin. Both the speaker amp and the headphone jack are tied to the HP output pins. While the speaker is mono, the headset jack is stereo. Unfortunately the driver does not support automatic switching of this. In addition, the headset is DC coupled, or "direct drive" enabled. The headset's microphone is tied to MIC2 with HBIAS providing power. A separate internal microphone is tied to MIC1 with MBIAS providing power. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i-a23: Add device node for internal audio codecChen-Yu Tsai2017-01-101-0/+16
| | | | | | | | Now that we have a device tree binding and driver for the A23's internal audio codec, add a device node for it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: Add codec analog path controls node in PRCM for A23/A33Chen-Yu Tsai2017-01-101-0/+4
| | | | | | | | | | On the A23/A33, the internal codec's analog path controls are located in the PRCM node. Add a sub-device node to the PRCM for it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: Enable UEXT related nodes for Olimex A20 SOM EVBEmmanuel Vadot2017-01-101-0/+38
| | | | | | | | | | | UEXT are Universal EXTension connector from Olimex. They embed i2c, spi and uart pins along power in one connector and are found on most, if not all, Olimex boards. The Olimex A20 SOM EVB have two UEXT connector so enable the nodes found on those two connectors. Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun7i: Enable audio codec on Banana ProJörg Krause2017-01-101-0/+4
| | | | | | | | This commit enables the on-chip audio codec present on the A20 SoC on the Banana Pro board. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: Add num-cs for A20 spi nodesEmmanuel Vadot2017-01-101-0/+4
| | | | | | | | | | | The spi0 controller on the A20 have up to 4 CS (Chip Select) while the others three only have 1. Add the num-cs property to each node. The current driver doesn't read this property but this is useful for downstream user of DTS (FreeBSD for example). Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: Use axp209.dtsi for Olinuxino Lime2Emmanuel Vadot2017-01-101-48/+42
| | | | | | | | | | | | | | | Use axp209.dtsi in sun7i-a20-olinuxino-lime2.dts and correct some regulators. DCDC2 is used for vdd-cpu so it should never be bellow 1V and above 1.4V DCDC3 is used for VDD_INT so same as above. LD01 is used for the RTC, and should have a typical value of 1.3V LD02 is used for AVCC and should have a typical value of 3.0V LD03/4 are used for Port-E/Port-G Power pin, and the schematics recommands to set them to 2.8V as they can be used for CSI0/1. Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun5i: add support for Lichee Pi One boardIcenowy Zheng2017-01-102-0/+225
| | | | | | | | | | | | | Lichee Pi One is a low-cost Allwinner A13-based development board, with an AXP209 PMU, a USB2.0 OTG port, a USB2.0 host port (or an onboard RTL8723BU Wi-Fi card), optional headers for LCD and CSI, two GPIO headers and two MicroSD card slots (connected to mmc0 and mmc2, both bootable). Add support for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* dt-bindings: add vendor prefix for Lichee PiIcenowy Zheng2017-01-101-0/+1
| | | | | | | | | | Lichee Pi is a new "Pi"-named development board series. Currently available device, Lichee Pi One, is by only one person as night job, so the device series name is chosen to be the vendor prefix. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun5i: add a pinctrl node for 4bit mmc2Icenowy Zheng2017-01-101-0/+8
| | | | | | | | | Some board only use 4bit mode of mmc2. Add a pinctrl node for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun4i: A1000: add axp209 regulator nodesMarcus Cooper2017-01-101-0/+31
| | | | | | | | | | | This patch adds the regulator nodes for the axp209 by including the axp209 dtsi. DCDC2 is used as the cpu power supply. This patch also references it from the cpu node. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: Add the SPDIF block to the A31Marcus Cooper2017-01-101-0/+13
| | | | | | | Add the SPDIF transceiver controller block to the A31 dtsi. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: Add SPDIF TX pin to the A31Marcus Cooper2017-01-101-0/+5
| | | | | | | Add the SPDIF TX pin to the A31 dtsi. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: Mele I7: Enable internal audio codecMarcus Cooper2017-01-101-0/+6
| | | | | | | The Mele I7 has an audio jack for the SoC's internal codec. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: add a delay after reset xr819 on Orange Pi ZeroIcenowy Zheng2017-01-101-0/+1
| | | | | | | | | | | XR819 seems to need a delay after its reset line to be deasserted, otherwise it may not respond MMC commands correctly, and fail to initialize. Add a 200ms delay in the mmc-pwrseq. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: add opp-v2 table for A33Icenowy Zheng2017-01-101-0/+35
| | | | | | | | | | | An operating point table is needed for the cpu frequency adjusting to work. The operating point table is converted from the common value in extracted script.fex from many A33 board/tablets. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: set cpu-supply in reference tablet DTSIIcenowy Zheng2017-01-101-0/+4
| | | | | | | | | | All reference design A33 tablets uses DCDC2 of AXP223 as the power supply of the Cortex-A7 cores. Set the cpu-supply in the DTSI of sun8i reference tablets. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun8i: add a cpu0 label to cpu@0 node on A23/33Icenowy Zheng2017-01-101-1/+1
| | | | | | | | | A "cpu0" label is needed on cpu@0 for cpufreq-dt to work. Add such a label, in order to prepare for cpufreq support of A23/33. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: add support for Orange Pi Zero boardIcenowy Zheng2017-01-102-0/+160
| | | | | | | | | | Orange Pi Zero is a board that came with the new Allwinner H2+ SoC and a SDIO Wi-Fi chip by Allwinner (XR819). Add a device tree file for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sun6i: hummingbird: Enable USB OTGChen-Yu Tsai2017-01-101-0/+19
| | | | | | | | | | | | The A31 Hummingbird has a mini USB OTG port, and uses GPIO pins from the SoC for ID pin and VBUS detection and VBUS control. The PMIC can also do VBUS detection and control. Here we prefer to use the PMIC's DRIVEVBUS function to control VBUS for USB OTG, as that is the hardware default. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: dts: sunxi: Explicitly enable pull-ups for MMC pinsChen-Yu Tsai2017-01-108-0/+18
| | | | | | | | | | | | | | | | | | In the past, all the MMC pins had allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; which was actually a no-op. We were relying on U-boot to set the bias pull up for us. These properties were removed as part of the fix up to actually support no bias on the pins. During the transition some boards experienced regular MMC time-outs during normal operation, while others completely failed to initialize the SD card. Given that MMC starts in open-drain mode and the pull-ups are required, it's best to enable it for all the pin settings. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* ARM: sunxi: Convert pinctrl nodes to generic bindingsMaxime Ripard2016-12-2699-1081/+1081
| | | | | | | | Now that we can handle the generic pinctrl bindings, convert our DT to it. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
* ARM: sunxi: Remove useless allwinner,pull propertyMaxime Ripard2016-12-2685-321/+0
| | | | | | | | | | | | The allwinner,pull property set to NO_PULL was really considered our default (and wasn't even changing the default value in the code). Remove these properties to make it obvious that we do not set anything in such a case. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
* ARM: sunxi: Remove useless allwinner,drive propertyMaxime Ripard2016-12-2694-381/+0
| | | | | | | | | The allwinner,drive property set to 10mA was really considered as our default. Remove all those properties entirely to make that obvious. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
* Linux 4.10-rc1v4.10-rc1Linus Torvalds2016-12-261-2/+2
|
* powerpc: Fix build warning on 32-bit PPCLarry Finger2016-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am getting the following warning when I build kernel 4.9-git on my PowerBook G4 with a 32-bit PPC processor: AS arch/powerpc/kernel/misc_32.o arch/powerpc/kernel/misc_32.S:299:7: warning: "CONFIG_FSL_BOOKE" is not defined [-Wundef] This problem is evident after commit 989cea5c14be ("kbuild: prevent lib-ksyms.o rebuilds"); however, this change in kbuild only exposes an error that has been in the code since 2005 when this source file was created. That was with commit 9994a33865f4 ("powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S"). The offending line does not make a lot of sense. This error does not seem to cause any errors in the executable, thus I am not recommending that it be applied to any stable versions. Thanks to Nicholas Piggin for suggesting this solution. Fixes: 9994a33865f4 ("powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S") Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* avoid spurious "may be used uninitialized" warningLinus Torvalds2016-12-251-0/+1
| | | | | | | | | | | | | | | | | | | | The timer type simplifications caused a new gcc warning: drivers/base/power/domain.c: In function ‘genpd_runtime_suspend’: drivers/base/power/domain.c:562:14: warning: ‘time_start’ may be used uninitialized in this function [-Wmaybe-uninitialized] elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start)); despite the actual use of "time_start" not having changed in any way. It appears that simply changing the type of ktime_t from a union to a plain scalar type made gcc check the use. The variable wasn't actually used uninitialized, but gcc apparently failed to notice that the conditional around the use was exactly the same as the conditional around the initialization of that variable. Add an unnecessary initialization just to shut up the compiler. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds2016-12-25227-665/+604
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer type cleanups from Thomas Gleixner: "This series does a tree wide cleanup of types related to timers/timekeeping. - Get rid of cycles_t and use a plain u64. The type is not really helpful and caused more confusion than clarity - Get rid of the ktime union. The union has become useless as we use the scalar nanoseconds storage unconditionally now. The 32bit timespec alike storage got removed due to the Y2038 limitations some time ago. That leaves the odd union access around for no reason. Clean it up. Both changes have been done with coccinelle and a small amount of manual mopping up" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ktime: Get rid of ktime_equal() ktime: Cleanup ktime_set() usage ktime: Get rid of the union clocksource: Use a plain u64 instead of cycle_t