diff options
| author | Greg Kroah-Hartman <[email protected]> | 2019-02-11 09:26:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2019-02-11 09:26:45 +0100 |
| commit | c744ca39f28f9a1e94a62ba02483619925d25ddc (patch) | |
| tree | bfcd445d31c88130cb0833675e2c7ea1c40f47e0 /arch/mips/boot/dts/xilfpga/nexys4ddr.dts | |
| parent | f233ea4327d7b6f67a224822fdc9241a9f4e4b59 (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'arch/mips/boot/dts/xilfpga/nexys4ddr.dts')
| -rw-r--r-- | arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts index 2152b7ba65fb..cc8dbea0911f 100644 --- a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts +++ b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts @@ -90,11 +90,11 @@ interrupts = <0>; }; - axi_i2c: i2c@10A00000 { + axi_i2c: i2c@10a00000 { compatible = "xlnx,xps-iic-2.00.a"; interrupt-parent = <&axi_intc>; interrupts = <4>; - reg = < 0x10A00000 0x10000 >; + reg = < 0x10a00000 0x10000 >; clocks = <&ext>; xlnx,clk-freq = <0x5f5e100>; xlnx,family = "Artix7"; @@ -106,9 +106,9 @@ #address-cells = <1>; #size-cells = <0>; - ad7420@4B { + ad7420@4b { compatible = "adi,adt7420"; - reg = <0x4B>; + reg = <0x4b>; }; } ; }; |