diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
| commit | e809777b9539405f2e74ea39849c57b1a65a2f02 (patch) | |
| tree | 57c5362707bf885a2b77d6e85e59b94a02fdf9e2 /arch/arm/dts | |
| parent | 1d8493e63b13954cb16d0304285271dfac208758 (diff) | |
| parent | 48921a46eb70e369cec41c76e5e54baa55980cd0 (diff) | |
| download | barebox-e809777b9539405f2e74ea39849c57b1a65a2f02.tar.gz barebox-e809777b9539405f2e74ea39849c57b1a65a2f02.tar.xz | |
Merge branch 'for-next/am335x'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/am335x-bone-common.dts | 1 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycard-som.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycore-som.dtsi | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/dts/am335x-bone-common.dts b/arch/arm/dts/am335x-bone-common.dts index 91745d3f62..0488cbe1fc 100644 --- a/arch/arm/dts/am335x-bone-common.dts +++ b/arch/arm/dts/am335x-bone-common.dts @@ -9,6 +9,7 @@ #include "am33xx.dtsi" #include "am33xx-strip.dtsi" +#include "am33xx-clocks-strip.dtsi" #include "am335x-bone-common.dtsi" / { diff --git a/arch/arm/dts/am335x-phytec-phycard-som.dtsi b/arch/arm/dts/am335x-phytec-phycard-som.dtsi index c0b2456636..d1dfa86bca 100644 --- a/arch/arm/dts/am335x-phytec-phycard-som.dtsi +++ b/arch/arm/dts/am335x-phytec-phycard-som.dtsi @@ -92,7 +92,7 @@ status = "okay"; clock-frequency = <400000>; - eeprom: 24c32@52 { + eeprom: eeprom@54 { status = "disabled"; compatible = "atmel,24c32"; pagesize = <32>; diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi index ba0589cdc5..f3a1d4d45a 100644 --- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi +++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi @@ -143,7 +143,7 @@ status = "okay"; clock-frequency = <400000>; - eeprom: 24c32@52 { + eeprom: eeprom@52 { status = "disabled"; compatible = "atmel,24c32"; pagesize = <32>; |