diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-25 13:50:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-25 13:50:33 -0400 |
| commit | c9e50bb12af19a8365ae4d3099abb8db1abee785 (patch) | |
| tree | 7728da43b2f33fc558d797ffe37172bfc522acc1 /arch/arm/dts | |
| parent | e382713d224d6fc14cf8fe8f6bb852f24ab652a7 (diff) | |
| parent | 4c49753ce2e527c6b561ca6fbbd782b4914f83e2 (diff) | |
Merge tag 'u-boot-atmel-2020.01-b' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
Second set of u-boot-atmel features and fixes for 2020.01 cycle
This feature set includes Eugen's work on a new tiny flexcom driver and
eeprom mac retrieval for the sam9x60-ek board.
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/sam9x60.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/dts/sam9x60ek.dts | 29 |
2 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi index e01539e5ce..41ac1f164c 100644 --- a/arch/arm/dts/sam9x60.dtsi +++ b/arch/arm/dts/sam9x60.dtsi @@ -73,6 +73,16 @@ status = "disabled"; }; + flx0: flexcom@f801c600 { + compatible = "atmel,sama5d2-flexcom"; + reg = <0xf801c000 0x200>; + clocks = <&flx0_clk>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xf801c000 0x800>; + status = "disabled"; + }; + macb0: ethernet@f802c000 { compatible = "cdns,sam9x60-macb", "cdns,macb"; reg = <0xf802c000 0x100>; @@ -221,6 +231,11 @@ reg = <3>; }; + flx0_clk: flx0_clk { + #clock-cells = <0>; + reg = <5>; + }; + pioD_clk: pioD_clk { #clock-cells = <0>; reg = <44>; diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts index bed59f3da2..8767de98b8 100644 --- a/arch/arm/dts/sam9x60ek.dts +++ b/arch/arm/dts/sam9x60ek.dts @@ -15,6 +15,7 @@ chosen { stdout-path = &dbgu; + i2c0 = &flx0; }; onewire_tm: onewire { @@ -45,6 +46,28 @@ }; }; + flx0: flexcom@f801c600 { + atmel,flexcom-mode = <3>; + status = "okay"; + + i2c@600 { + compatible = "atmel,sama5d2-i2c"; + reg = <0x600 0x200>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flx0>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&flx0_clk>; + status = "okay"; + + eeprom@53 { + compatible = "atmel,24c32"; + reg = <0x53>; + pagesize = <16>; + }; + }; + }; + pinctrl { pinctrl_qspi: qspi { atmel,pins = @@ -56,6 +79,12 @@ AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; + pinctrl_flx0: flx0_default { + atmel,pins = + <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE + AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; + }; + pinctrl_onewire_tm_default: onewire_tm_default { atmel,pins = <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; |