diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-09-26 17:07:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-26 17:10:05 +0200 |
| commit | 1abf47edb388352ca674e3a96b7c3a39874bacea (patch) | |
| tree | 5b5757d26f5bb3ffce31e981493fb463fe79fff4 | |
| parent | Merge tag 'samsung-dt-4.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt (diff) | |
| parent | ARM: dts: xilinx: Fix I2C and SPI bus warnings (diff) | |
| download | wireguard-linux-1abf47edb388352ca674e3a96b7c3a39874bacea.tar.xz wireguard-linux-1abf47edb388352ca674e3a96b7c3a39874bacea.zip | |
Merge tag 'zynq-dt-for-v4.20' of https://github.com/Xilinx/linux-xlnx into next/dt
ARM: dts: zynq: DT changes for v4.20
- Fix DTS spi/i2c warnings for zc702/zc770 boards
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index cc5a3dc2b4a0..27cd6cb52f1b 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -174,17 +174,17 @@ #address-cells = <1>; #size-cells = <0>; reg = <7>; - hwmon@52 { + hwmon@34 { compatible = "ti,ucd9248"; - reg = <52>; + reg = <0x34>; }; - hwmon@53 { + hwmon@35 { compatible = "ti,ucd9248"; - reg = <53>; + reg = <0x35>; }; - hwmon@54 { + hwmon@36 { compatible = "ti,ucd9248"; - reg = <54>; + reg = <0x36>; }; }; }; diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts index 0e1bfdd3421f..0dd352289a45 100644 --- a/arch/arm/boot/dts/zynq-zc770-xm010.dts +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts @@ -68,7 +68,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - flash@0 { + flash@1 { compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>; diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts index 651913f1afa2..4ae2c85df3a0 100644 --- a/arch/arm/boot/dts/zynq-zc770-xm013.dts +++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts @@ -62,7 +62,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - eeprom: eeprom@0 { + eeprom: eeprom@2 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>; |