diff options
| author | Olof Johansson <olof@lixom.net> | 2018-11-05 06:39:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-05 06:39:40 -0800 |
| commit | 6ff6bc46c0a4f44e7d0b5ca88c33f2b1eb55d519 (patch) | |
| tree | aae7e02f230ab41cf7918490be69370a757d049c /arch/arm/boot/dts/imx6sll.dtsi | |
| parent | f55275bcc72948056387041abe9fce1c54300adc (diff) | |
| parent | 1ad9fb750a104f51851c092edd7b3553f0218428 (diff) | |
| download | lwn-6ff6bc46c0a4f44e7d0b5ca88c33f2b1eb55d519.tar.gz lwn-6ff6bc46c0a4f44e7d0b5ca88c33f2b1eb55d519.zip | |
Merge tag 'imx-fixes-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.20:
- Add boot-on and always-on for imx6sx-sdb phy regulator to fix enet
resume problem, which is exposed by commit ("regulator: fixed:
Convert to use GPIO descriptor only").
- Fix improperly quoted stdout-path values for imx53-ppd and
vf610m4-colibri board.
- Fix the typo of compatible string "fs,imx6sll-i2c" which should be
"fsl,imx6sll-i2c".
* tag 'imx-fixes-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6sx-sdb: Fix enet phy regulator
ARM: dts: fsl: Fix improperly quoted stdout-path values
ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx6sll.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sll.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index ed9a980bce85..beefa1b2049d 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -740,7 +740,7 @@ i2c1: i2c@21a0000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c"; + compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c"; reg = <0x021a0000 0x4000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_I2C1>; |