diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-02 09:01:28 -0500 | 
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-02 09:01:28 -0500 | 
| commit | 7a8ac9df5dc0c23620d07933288fc5bea1941c29 (patch) | |
| tree | 71223af015026b77082c68e1f2c95f66bae04999 /arch/arm | |
| parent | 41cab8edbcf38bce5cddf54957618dd4205d008f (diff) | |
| parent | ef8f34aea56465e1584ab60b6ae3f3340aab55de (diff) | |
Merge tag 'u-boot-atmel-fixes-2021.01-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel fixes for 2021.01 cycle:
This specific feature set includes the patches for DT required to fix
the warnings for newer DTC version (1.6.0+), i2c and spi bus unit
address.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/at91-vinco.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9260ek.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9261ek.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9g20-taurus.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9g20ek_common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9g25ek.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91sam9g45-gurnard.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/sama5d3xmb.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/sama5d3xmb_cmp.dtsi | 2 | 
9 files changed, 9 insertions, 9 deletions
| diff --git a/arch/arm/dts/at91-vinco.dts b/arch/arm/dts/at91-vinco.dts index 0ecb64e718b..bf17b0a5e99 100644 --- a/arch/arm/dts/at91-vinco.dts +++ b/arch/arm/dts/at91-vinco.dts @@ -128,7 +128,7 @@  			i2c2: i2c@f8024000 {  				status = "okay"; -				rtc1: rtc@64 { +				rtc1: rtc@32 {  					compatible = "epson,rx8900";  					reg = <0x32>;  				}; diff --git a/arch/arm/dts/at91sam9260ek.dts b/arch/arm/dts/at91sam9260ek.dts index 67a2660c80d..47606cbcdda 100644 --- a/arch/arm/dts/at91sam9260ek.dts +++ b/arch/arm/dts/at91sam9260ek.dts @@ -116,7 +116,7 @@  			spi0: spi@fffc8000 {  				cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -				mtd_dataflash@0 { +				mtd_dataflash@1 {  					compatible = "atmel,at45", "atmel,dataflash";  					spi-max-frequency = <15000000>;  					reg = <1>; diff --git a/arch/arm/dts/at91sam9261ek.dts b/arch/arm/dts/at91sam9261ek.dts index 55bd51f07fa..92fbdadb68d 100644 --- a/arch/arm/dts/at91sam9261ek.dts +++ b/arch/arm/dts/at91sam9261ek.dts @@ -121,7 +121,7 @@  					spi-max-frequency = <15000000>;  				}; -				tsc2046@0 { +				tsc2046@2 {  					reg = <2>;  					compatible = "ti,ads7843";  					interrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>; diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts index c00c5a8b8dd..ca982737a74 100644 --- a/arch/arm/dts/at91sam9g20-taurus.dts +++ b/arch/arm/dts/at91sam9g20-taurus.dts @@ -76,7 +76,7 @@  &spi0 {  	cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -	mtd_dataflash@0 { +	mtd_dataflash@1 {  		compatible = "atmel,at45", "atmel,dataflash";  		spi-max-frequency = <50000000>;  		reg = <1>; diff --git a/arch/arm/dts/at91sam9g20ek_common.dtsi b/arch/arm/dts/at91sam9g20ek_common.dtsi index 9db245e442c..71954547693 100644 --- a/arch/arm/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/dts/at91sam9g20ek_common.dtsi @@ -97,7 +97,7 @@  			spi0: spi@fffc8000 {  				cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -				mtd_dataflash@0 { +				mtd_dataflash@1 {  					compatible = "atmel,at45", "atmel,dataflash";  					spi-max-frequency = <15000000>;  					reg = <1>; diff --git a/arch/arm/dts/at91sam9g25ek.dts b/arch/arm/dts/at91sam9g25ek.dts index 91a71774472..31fecc2cdaf 100644 --- a/arch/arm/dts/at91sam9g25ek.dts +++ b/arch/arm/dts/at91sam9g25ek.dts @@ -25,7 +25,7 @@  			};  			i2c0: i2c@f8010000 { -				ov2640: camera@0x30 { +				ov2640: camera@30 {  					compatible = "ovti,ov2640";  					reg = <0x30>;  					pinctrl-names = "default"; diff --git a/arch/arm/dts/at91sam9g45-gurnard.dts b/arch/arm/dts/at91sam9g45-gurnard.dts index 75c1e992745..2bc55f01a96 100644 --- a/arch/arm/dts/at91sam9g45-gurnard.dts +++ b/arch/arm/dts/at91sam9g45-gurnard.dts @@ -115,7 +115,7 @@  			spi0: spi@fffa4000 {  				cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -				mtd_dataflash@0 { +				mtd_dataflash@1 {  					compatible = "atmel,at45", "atmel,dataflash";  					spi-max-frequency = <50000000>;  					reg = <1>; diff --git a/arch/arm/dts/sama5d3xmb.dtsi b/arch/arm/dts/sama5d3xmb.dtsi index c75b76aef2a..906f3ce8c9a 100644 --- a/arch/arm/dts/sama5d3xmb.dtsi +++ b/arch/arm/dts/sama5d3xmb.dtsi @@ -61,7 +61,7 @@  			};  			i2c1: i2c@f0018000 { -				ov2640: camera@0x30 { +				ov2640: camera@30 {  					compatible = "ovti,ov2640";  					reg = <0x30>;  					pinctrl-names = "default"; diff --git a/arch/arm/dts/sama5d3xmb_cmp.dtsi b/arch/arm/dts/sama5d3xmb_cmp.dtsi index 5566fde5148..c6bf0f50fd6 100644 --- a/arch/arm/dts/sama5d3xmb_cmp.dtsi +++ b/arch/arm/dts/sama5d3xmb_cmp.dtsi @@ -57,7 +57,7 @@  			};  			i2c1: i2c@f0018000 { -				ov2640: camera@0x30 { +				ov2640: camera@30 {  					compatible = "ovti,ov2640";  					reg = <0x30>;  					pinctrl-names = "default"; | 
