diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-17 13:52:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-17 13:52:44 +0200 |
| commit | 0743b12b70e9567f36c2de6a5d480e4df234aa88 (patch) | |
| tree | c4edfbde5257f12ca951877c0c3cb5514b3a4a57 /dts | |
| parent | 8ed978b79062787b9e911cf6d5ff4aebce484660 (diff) | |
| download | barebox-0743b12b70e9567f36c2de6a5d480e4df234aa88.tar.gz barebox-0743b12b70e9567f36c2de6a5d480e4df234aa88.tar.xz | |
dts: update to v4.1-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts')
| -rw-r--r-- | dts/Bindings/clock/silabs,si5351.txt | 4 | ||||
| -rw-r--r-- | dts/Bindings/net/cdns-emac.txt | 3 | ||||
| -rw-r--r-- | dts/src/arm/zynq-7000.dtsi | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/dts/Bindings/clock/silabs,si5351.txt b/dts/Bindings/clock/silabs,si5351.txt index c40711e8e8..28b28309f5 100644 --- a/dts/Bindings/clock/silabs,si5351.txt +++ b/dts/Bindings/clock/silabs,si5351.txt @@ -17,7 +17,8 @@ Required properties: - #clock-cells: from common clock binding; shall be set to 1. - clocks: from common clock binding; list of parent clock handles, shall be xtal reference clock or xtal and clkin for - si5351c only. + si5351c only. Corresponding clock input names are "xtal" and + "clkin" respectively. - #address-cells: shall be set to 1. - #size-cells: shall be set to 0. @@ -71,6 +72,7 @@ i2c-master-node { /* connect xtal input to 25MHz reference */ clocks = <&ref25>; + clock-names = "xtal"; /* connect xtal input as source of pll0 and pll1 */ silabs,pll-source = <0 0>, <1 0>; diff --git a/dts/Bindings/net/cdns-emac.txt b/dts/Bindings/net/cdns-emac.txt index abd67c13d3..4451ee9732 100644 --- a/dts/Bindings/net/cdns-emac.txt +++ b/dts/Bindings/net/cdns-emac.txt @@ -3,7 +3,8 @@ Required properties: - compatible: Should be "cdns,[<chip>-]{emac}" Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. - or the generic form: "cdns,emac". + Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. + Or the generic form: "cdns,emac". - reg: Address and length of the register set for the device - interrupts: Should contain macb interrupt - phy-mode: see ethernet.txt file in the same directory. diff --git a/dts/src/arm/zynq-7000.dtsi b/dts/src/arm/zynq-7000.dtsi index a5cd2eda3e..9ea54b3dba 100644 --- a/dts/src/arm/zynq-7000.dtsi +++ b/dts/src/arm/zynq-7000.dtsi @@ -193,7 +193,7 @@ }; gem0: ethernet@e000b000 { - compatible = "cdns,gem"; + compatible = "cdns,zynq-gem"; reg = <0xe000b000 0x1000>; status = "disabled"; interrupts = <0 22 4>; @@ -204,7 +204,7 @@ }; gem1: ethernet@e000c000 { - compatible = "cdns,gem"; + compatible = "cdns,zynq-gem"; reg = <0xe000c000 0x1000>; status = "disabled"; interrupts = <0 45 4>; |