diff options
| author | Arnd Bergmann | 2017-08-15 17:34:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2017-08-15 17:34:52 +0200 |
| commit | 64c2c372dbcf1b701b79e1f6f0f75c5c83529994 (patch) | |
| tree | 94e8888da9c9907622d1e1721f9632e642debb0d /arch | |
| parent | 69a80d8c2cb0956fc2aab41aae786ed0c663b582 (diff) | |
| parent | 8317562097acec4c9e9750eb91115687931bca35 (diff) | |
Merge tag 'imx-fixes-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "i.MX fixes for 4.13, round 2" from Shawn Guo:
- Add missing 'ranges' property for i.MX25 device tree TSCADC node, so
that it's child nodes ADC and TSC device can be probed by kernel.
- Fix i.MX GPCv2 power domain driver to request regulator after power
domain initialization, since regulator could defer probing and
therefore cause power domain initialized twice.
* tag 'imx-fixes-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: i.MX25: add ranges to tscadc
soc: imx: gpcv2: fix regulator deferred probe
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx25.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index dfcc8e00cf1c..0ade3619f3c3 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -297,6 +297,7 @@ #address-cells = <1>; #size-cells = <1>; status = "disabled"; + ranges; adc: adc@50030800 { compatible = "fsl,imx25-gcq"; |