From 3fae863387928806666951f19e8f0ba3e7ab0aa8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 19 May 2014 10:11:28 +0200 Subject: dts: update to v3.15-rc5 Signed-off-by: Sascha Hauer --- dts/src/xtensa/kc705.dts | 11 ++++++++ dts/src/xtensa/xtfpga-flash-128m.dtsi | 28 ++++++++++++++++++++ dts/src/xtensa/xtfpga-flash-16m.dtsi | 48 ++++++++++++++++++----------------- dts/src/xtensa/xtfpga-flash-4m.dtsi | 32 ++++++++++++----------- dts/src/xtensa/xtfpga.dtsi | 37 ++++++++++++++++----------- 5 files changed, 103 insertions(+), 53 deletions(-) create mode 100644 dts/src/xtensa/kc705.dts create mode 100644 dts/src/xtensa/xtfpga-flash-128m.dtsi (limited to 'dts/src') diff --git a/dts/src/xtensa/kc705.dts b/dts/src/xtensa/kc705.dts new file mode 100644 index 0000000000..742a347be6 --- /dev/null +++ b/dts/src/xtensa/kc705.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/include/ "xtfpga.dtsi" +/include/ "xtfpga-flash-128m.dtsi" + +/ { + compatible = "cdns,xtensa-kc705"; + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x08000000>; + }; +}; diff --git a/dts/src/xtensa/xtfpga-flash-128m.dtsi b/dts/src/xtensa/xtfpga-flash-128m.dtsi new file mode 100644 index 0000000000..d3a88e0298 --- /dev/null +++ b/dts/src/xtensa/xtfpga-flash-128m.dtsi @@ -0,0 +1,28 @@ +/ { + soc { + flash: flash@00000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x00000000 0x08000000>; + bank-width = <2>; + device-width = <2>; + partition@0x0 { + label = "data"; + reg = <0x00000000 0x06000000>; + }; + partition@0x6000000 { + label = "boot loader area"; + reg = <0x06000000 0x00800000>; + }; + partition@0x6800000 { + label = "kernel image"; + reg = <0x06800000 0x017e0000>; + }; + partition@0x7fe0000 { + label = "boot environment"; + reg = <0x07fe0000 0x00020000>; + }; + }; + }; +}; diff --git a/dts/src/xtensa/xtfpga-flash-16m.dtsi b/dts/src/xtensa/xtfpga-flash-16m.dtsi index e5703c7bee..1d97203c18 100644 --- a/dts/src/xtensa/xtfpga-flash-16m.dtsi +++ b/dts/src/xtensa/xtfpga-flash-16m.dtsi @@ -1,26 +1,28 @@ / { - flash: flash@f8000000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0xf8000000 0x01000000>; - bank-width = <2>; - device-width = <2>; - partition@0x0 { - label = "boot loader area"; - reg = <0x00000000 0x00400000>; + soc { + flash: flash@08000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x08000000 0x01000000>; + bank-width = <2>; + device-width = <2>; + partition@0x0 { + label = "boot loader area"; + reg = <0x00000000 0x00400000>; + }; + partition@0x400000 { + label = "kernel image"; + reg = <0x00400000 0x00600000>; + }; + partition@0xa00000 { + label = "data"; + reg = <0x00a00000 0x005e0000>; + }; + partition@0xfe0000 { + label = "boot environment"; + reg = <0x00fe0000 0x00020000>; + }; }; - partition@0x400000 { - label = "kernel image"; - reg = <0x00400000 0x00600000>; - }; - partition@0xa00000 { - label = "data"; - reg = <0x00a00000 0x005e0000>; - }; - partition@0xfe0000 { - label = "boot environment"; - reg = <0x00fe0000 0x00020000>; - }; - }; + }; }; diff --git a/dts/src/xtensa/xtfpga-flash-4m.dtsi b/dts/src/xtensa/xtfpga-flash-4m.dtsi index 6f9c10d6b6..d1c621ca8b 100644 --- a/dts/src/xtensa/xtfpga-flash-4m.dtsi +++ b/dts/src/xtensa/xtfpga-flash-4m.dtsi @@ -1,18 +1,20 @@ / { - flash: flash@f8000000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0xf8000000 0x00400000>; - bank-width = <2>; - device-width = <2>; - partition@0x0 { - label = "boot loader area"; - reg = <0x00000000 0x003f0000>; + soc { + flash: flash@08000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x08000000 0x00400000>; + bank-width = <2>; + device-width = <2>; + partition@0x0 { + label = "boot loader area"; + reg = <0x00000000 0x003f0000>; + }; + partition@0x3f0000 { + label = "boot environment"; + reg = <0x003f0000 0x00010000>; + }; }; - partition@0x3f0000 { - label = "boot environment"; - reg = <0x003f0000 0x00010000>; - }; - }; + }; }; diff --git a/dts/src/xtensa/xtfpga.dtsi b/dts/src/xtensa/xtfpga.dtsi index e7370b1134..dec9178840 100644 --- a/dts/src/xtensa/xtfpga.dtsi +++ b/dts/src/xtensa/xtfpga.dtsi @@ -42,21 +42,28 @@ }; }; - serial0: serial@fd050020 { - device_type = "serial"; - compatible = "ns16550a"; - no-loopback-test; - reg = <0xfd050020 0x20>; - reg-shift = <2>; - interrupts = <0 1>; /* external irq 0 */ - clocks = <&osc>; - }; + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges = <0x00000000 0xf0000000 0x10000000>; - enet0: ethoc@fd030000 { - compatible = "opencores,ethoc"; - reg = <0xfd030000 0x4000 0xfd800000 0x4000>; - interrupts = <1 1>; /* external irq 1 */ - local-mac-address = [00 50 c2 13 6f 00]; - clocks = <&osc>; + serial0: serial@0d050020 { + device_type = "serial"; + compatible = "ns16550a"; + no-loopback-test; + reg = <0x0d050020 0x20>; + reg-shift = <2>; + interrupts = <0 1>; /* external irq 0 */ + clocks = <&osc>; + }; + + enet0: ethoc@0d030000 { + compatible = "opencores,ethoc"; + reg = <0x0d030000 0x4000 0x0d800000 0x4000>; + interrupts = <1 1>; /* external irq 1 */ + local-mac-address = [00 50 c2 13 6f 00]; + clocks = <&osc>; + }; }; }; -- cgit v1.2.3