lantiq: VGV7519 - remove/merge redundant parts in dts

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-05-26 23:08:19 +02:00 committed by John Crispin
parent f778cdd9c9
commit 8a382f1221
3 changed files with 21 additions and 68 deletions

View file

@ -23,30 +23,32 @@
}; };
fpi@10000000 { fpi@10000000 {
localbus@0 {
nor-boot@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "lantiq,fpi", "simple-bus";
ranges = <0x0 0x10000000 0xEEFFFFF>;
reg = <0x10000000 0xEF00000>;
localbus@0 { partitions {
#address-cells = <2>; compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "lantiq,localbus", "simple-bus";
boardconfig: partition@40000 {
label = "board_config";
reg = <0x40000 0x10000>;
read-only;
};
};
};
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xr9";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
interrupt-parent = <&icu0>;
interrupts = <166 135 66 40 41 42 38>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
stp { stp {
lantiq,groups = "stp"; lantiq,groups = "stp";
@ -109,19 +111,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
compatible = "lantiq,pci-xway";
bus-range = <0x0 0x0>;
ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000 /* pci memory */
0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
reg = <0x7000000 0x8000 /* config space */
0xE105400 0x400>; /* pci bridge */
lantiq,bus-clock = <33333333>; lantiq,bus-clock = <33333333>;
/*lantiq,external-clock;*/
lantiq,delay-hi = <0>; /* 0ns delay */
lantiq,delay-lo = <0>; /* 0.0ns delay */
interrupt-map-mask = <0xf800 0x0 0x0 0x7>; interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = < interrupt-map = <
0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30 0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
@ -278,6 +268,7 @@
reg = <1>; reg = <1>;
mac-address = [ 00 11 22 33 44 56 ]; mac-address = [ 00 11 22 33 44 56 ];
lantiq,wan; lantiq,wan;
ethernet@5 { ethernet@5 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <5>; reg = <5>;
@ -293,27 +284,22 @@
phy0: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0x0>; reg = <0x0>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
lantiq,c45-reg-init = <1 0 0 0>;
}; };
phy1: ethernet-phy@1 { phy1: ethernet-phy@1 {
reg = <0x1>; reg = <0x1>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
lantiq,c45-reg-init = <1 0 0 0>;
}; };
phy5: ethernet-phy@5 { phy5: ethernet-phy@5 {
reg = <0x5>; reg = <0x5>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
lantiq,c45-reg-init = <1 0 0 0>;
}; };
phy11: ethernet-phy@11 { phy11: ethernet-phy@11 {
reg = <0x11>; reg = <0x11>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
lantiq,c45-reg-init = <1 0 0 0>;
}; };
phy13: ethernet-phy@13 { phy13: ethernet-phy@13 {
reg = <0x13>; reg = <0x13>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
lantiq,c45-reg-init = <1 0 0 0>;
}; };
}; };
}; };

View file

@ -6,23 +6,8 @@
/ { / {
fpi@10000000 { fpi@10000000 {
localbus@0 { localbus@0 {
nor-flash@0 { nor-boot@0 {
compatible = "lantiq,nor", "cfi-flash";
bank-width = <2>;
reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
#address-cells = <1>;
#size-cells = <1>;
partitions { partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@40000 {
label = "board_config";
reg = <0x40000 0x10000>;
read-only;
};
partition@80000 { partition@80000 {
label = "firmware"; label = "firmware";
reg = <0x80000 0x780000>; reg = <0x80000 0x780000>;

View file

@ -7,26 +7,11 @@
fpi@10000000 { fpi@10000000 {
localbus@0 { localbus@0 {
nor-boot@0 { nor-boot@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
#address-cells = <1>;
#size-cells = <1>;
partitions { partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 { partition@0 {
label = "uboot"; label = "uboot";
reg = <0x00000 0x40000>; reg = <0x00000 0x40000>;
}; };
partition@40000 {
label = "board_config";
reg = <0x40000 0x10000>;
read-only;
};
partition@60000 { partition@60000 {
label = "uboot_env"; label = "uboot_env";
reg = <0x60000 0x10000>; reg = <0x60000 0x10000>;
@ -34,9 +19,6 @@
partition@80000 { partition@80000 {
label = "firmware"; label = "firmware";
reg = <0x80000 0xf80000>; reg = <0x80000 0xf80000>;
// 0x080000 - 0x01b0000 : kernel
// 0x1b0000 - 0x1000000 : rootfs (squashfs)
// 0x390000 - 0x1000000 : rootfs_data
}; };
}; };
}; };