lantiq: cleanup dts files

- remove not existing properties
- remove properties having the same values as the included dtsi
- remove nodes which are disabled in the included dtsi and not enabled
  in dts
- replace the deprecated pinctrl-* compatible strings
- use the same labels for nodes as the included dtsi
- move common used vr9 pci properties to vr9.dtsi
- remove the unused stp node from HomeHub 2B devcie tree source file
- fix spaces vs. tabs and remove superfluous linebreaks

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-11-02 19:49:04 +01:00
parent 12bd0f2820
commit 112cf52d45
33 changed files with 35 additions and 312 deletions

View file

@ -134,7 +134,6 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x7>; req-mask = <0x7>;
}; };
}; };
gpio-keys-polled { gpio-keys-polled {

View file

@ -4,12 +4,4 @@
/ { / {
model = "ARV4518PWR01 - SMC7908A-ISP"; model = "ARV4518PWR01 - SMC7908A-ISP";
fpi@10000000 {
pci@E105400 {
lantiq,internal-clock;
};
};
}; };

View file

@ -125,7 +125,6 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0xf>; req-mask = <0xf>;
}; };
}; };
gpio-keys-polled { gpio-keys-polled {

View file

@ -6,10 +6,8 @@
model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221"; model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221";
fpi@10000000 { fpi@10000000 {
pci@E105400 { pci@E105400 {
lantiq,external-clock; lantiq,external-clock;
}; };
}; };
}; };

View file

@ -118,7 +118,7 @@
ifxhcd@E101000 { ifxhcd@E101000 {
status = "okay"; status = "okay";
gpios = <&gpio 28 GPIO_ACTIVE_HIGH>; gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
}; };
pci@E105400 { pci@E105400 {
@ -126,7 +126,6 @@
lantiq,external-clock; lantiq,external-clock;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
// gpiomm 10 - switch // gpiomm 10 - switch

View file

@ -111,7 +111,6 @@
status = "okay"; status = "okay";
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
/* /*

View file

@ -135,7 +135,6 @@
lantiq,external-clock; lantiq,external-clock;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
/* /*
@ -209,7 +208,7 @@
}; };
voice { voice {
label = "arv452cqw:blue:sprache"; label = "arv452cqw:blue:sprache";
gpios = <&gpiomm 4 1>; gpios = <&gpiomm 4 1>;
}; };
usb: usb { usb: usb {
label = "arv452cqw:blue:usb"; label = "arv452cqw:blue:usb";

View file

@ -144,7 +144,6 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0xf>; req-mask = <0xf>;
}; };
}; };
/* /*

View file

@ -125,7 +125,7 @@
ralink_eep { ralink_eep {
compatible = "ralink,eeprom"; compatible = "ralink,eeprom";
ralink,eeprom = "RT2860.eeprom"; ralink,eeprom = "RT2860.eeprom";
}; };
gpio-keys-polled { gpio-keys-polled {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";

View file

@ -91,11 +91,6 @@
pcie@d900000 { pcie@d900000 {
status = "disabled"; status = "disabled";
}; };
pci@E105400 {
status = "disabled";
compatible = "lantiq,pci-xway";
};
}; };
gphy-xrx200 { gphy-xrx200 {

View file

@ -100,9 +100,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
interrupt-map = <0x7000 0 0 1 &icu0 135 1>; interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
req-mask = <0x1>;
}; };
}; };
gpio-keys-polled { gpio-keys-polled {

View file

@ -143,7 +143,6 @@
interrupt-map = <0x7000 0 0 1 &icu0 135>; interrupt-map = <0x7000 0 0 1 &icu0 135>;
req-mask = <0x3>; req-mask = <0x3>;
}; };
}; };
ralink_eep { ralink_eep {

View file

@ -139,15 +139,14 @@
status = "okay"; status = "okay";
lantiq,external-clock; lantiq,external-clock;
interrupt-map = < interrupt-map = <
0x7000 0 0 1 &icu0 30 0x7000 0 0 1 &icu0 30
0x7800 0 0 1 &icu0 135 0x7800 0 0 1 &icu0 135
0x7800 0 0 2 &icu0 135 0x7800 0 0 2 &icu0 135
0x7800 0 0 3 &icu0 135 0x7800 0 0 3 &icu0 135
>; >;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x3>; req-mask = <0x3>;
}; };
}; };
ralink_eep { ralink_eep {

View file

@ -72,7 +72,6 @@
ath,mac-increment = <1>; ath,mac-increment = <1>;
ath,pci-slot = <14>; ath,pci-slot = <14>;
ath,eep-endian; ath,eep-endian;
ath,arv-ath9k-fix;
}; };
}; };
@ -120,7 +119,6 @@
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
lantiq,portmask = <0x3>; lantiq,portmask = <0x3>;
}; };
}; };
gpio-keys-polled { gpio-keys-polled {

View file

@ -30,15 +30,7 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
localbus@0 { localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
1 0 0x4000000 0x4000010>; /* addsel1 */
compatible = "lantiq,localbus", "simple-bus";
nor-boot@0 { /* NOR Flash: Spansion S29AL004D 512KB */ nor-boot@0 { /* NOR Flash: Spansion S29AL004D 512KB */
compatible = "lantiq,nor"; /* "AMD AM29LV400BB" compatible on 3.3.8 */ compatible = "lantiq,nor"; /* "AMD AM29LV400BB" compatible on 3.3.8 */
lantiq,cs = <0>; lantiq,cs = <0>;
@ -111,7 +103,6 @@
}; };
}; };
ath9k_eep { ath9k_eep {
compatible = "ath9k,eeprom"; compatible = "ath9k,eeprom";
ath,eep-flash = <&ath9k_cal 0x0000>; ath,eep-flash = <&ath9k_cal 0x0000>;
@ -122,22 +113,10 @@
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xway";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
nand_out { nand_out {
lantiq,groups = "nand cle", "nand ale"; lantiq,groups = "nand cle", "nand ale";
lantiq,function = "ebu"; lantiq,function = "ebu";
@ -186,38 +165,21 @@
}; };
etop@E180000 { etop@E180000 {
compatible = "lantiq,etop-xway";
reg = <0xE180000 0x40000>;
interrupt-parent = <&icu0>;
interrupts = <73 78>;
phy-mode = "rmii"; phy-mode = "rmii";
mac-address = [ 00 11 22 33 44 55 ];
}; };
ifxhcd@E101000 { ifxhcd@E101000 {
status = "okay"; status = "okay";
}; };
stp0: stp@E100BB0 { gpios: stp@E100BB0 {
status = "okay"; status = "okay";
#gpio-cells = <2>;
compatible = "lantiq,gpio-stp-xway";
gpio-controller;
reg = <0xE100BB0 0x40>;
lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>;
}; };
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
}; };
}; };
gpio-keys-polled { gpio-keys-polled {
@ -248,52 +210,52 @@
upgrading-orange { upgrading-orange {
label = "bthomehubv2b:orange:upgrading"; label = "bthomehubv2b:orange:upgrading";
gpios = <&stp0 5 GPIO_ACTIVE_HIGH>; gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
}; };
phone-orange { phone-orange {
label = "bthomehubv2b:orange:phone"; label = "bthomehubv2b:orange:phone";
gpios = <&stp0 6 GPIO_ACTIVE_HIGH>; gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
}; };
phone-blue { phone-blue {
label = "bthomehubv2b:blue:phone"; label = "bthomehubv2b:blue:phone";
gpios = <&stp0 7 GPIO_ACTIVE_HIGH>; gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
}; };
wireless-orange { wireless-orange {
label = "bthomehubv2b:orange:wireless"; label = "bthomehubv2b:orange:wireless";
gpios = <&stp0 8 GPIO_ACTIVE_HIGH>; gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
}; };
wireless_blue: wireless-blue { wireless_blue: wireless-blue {
label = "bthomehubv2b:blue:wireless"; label = "bthomehubv2b:blue:wireless";
gpios = <&stp0 9 GPIO_ACTIVE_HIGH>; gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
}; };
broadband-red { broadband-red {
label = "bthomehubv2b:red:broadband"; label = "bthomehubv2b:red:broadband";
gpios = <&stp0 10 GPIO_ACTIVE_HIGH>; gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
}; };
broadband-orange { broadband-orange {
label = "bthomehubv2b:orange:broadband"; label = "bthomehubv2b:orange:broadband";
gpios = <&stp0 11 GPIO_ACTIVE_HIGH>; gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
}; };
broadband_blue: broadband-blue { broadband_blue: broadband-blue {
label = "bthomehubv2b:blue:broadband"; label = "bthomehubv2b:blue:broadband";
gpios = <&stp0 12 GPIO_ACTIVE_HIGH>; gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
}; };
power_red: power-red { power_red: power-red {
label = "bthomehubv2b:red:power"; label = "bthomehubv2b:red:power";
gpios = <&stp0 13 GPIO_ACTIVE_HIGH>; gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
}; };
power_orange: power-orange { power_orange: power-orange {
label = "bthomehubv2b:orange:power"; label = "bthomehubv2b:orange:power";
gpios = <&stp0 14 GPIO_ACTIVE_HIGH>; gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
}; };
power_blue: power-blue { power_blue: power-blue {
label = "bthomehubv2b:blue:power"; label = "bthomehubv2b:blue:power";
gpios = <&stp0 15 GPIO_ACTIVE_HIGH>; gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
}; };
}; };
}; };

View file

@ -30,15 +30,7 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
localbus@0 { localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
1 0 0x4000000 0x4000010>; /* addsel1 */
compatible = "lantiq,localbus", "simple-bus";
nand-parts@0 { /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */ nand-parts@0 { /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
compatible = "gen_nand", "lantiq,nand-xway"; compatible = "gen_nand", "lantiq,nand-xway";
lantiq,cs = <1>; lantiq,cs = <1>;
@ -91,14 +83,9 @@
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xr9";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
nand_out { nand_out {
lantiq,groups = "nand cle", "nand ale"; lantiq,groups = "nand cle", "nand ale";
@ -150,7 +137,6 @@
status = "okay"; status = "okay";
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
gpio-keys-polled { gpio-keys-polled {
@ -219,4 +205,3 @@
}; };
}; };
}; };

View file

@ -67,9 +67,6 @@
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>;
state_default: pinmux { state_default: pinmux {
mdio { mdio {
lantiq,groups = "mdio"; lantiq,groups = "mdio";
@ -115,9 +112,6 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
}; };
}; };

View file

@ -104,6 +104,7 @@
}; };
}; };
}; };
ifxhcd@E101000 { ifxhcd@E101000 {
status = "okay"; status = "okay";
}; };

View file

@ -62,7 +62,6 @@
etop@E180000 { etop@E180000 {
phy-mode = "mii"; phy-mode = "mii";
mac-address = [ 00 11 22 33 44 55 ];
}; };
ifxhcd@E101000 { ifxhcd@E101000 {
@ -71,12 +70,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
}; };
}; };
@ -143,7 +137,7 @@
label = "dgn3500:red:power"; label = "dgn3500:red:power";
gpios = <&gpio 39 GPIO_ACTIVE_LOW>; gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
}; };
/* /*
power amber is missing power amber is missing
*/ */
wifi: wifi { wifi: wifi {

View file

@ -12,15 +12,7 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
localbus@0 { localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
1 0 0x4000000 0x4000010>; /* addsel1 */
compatible = "lantiq,localbus", "simple-bus";
nor-boot@0 { nor-boot@0 {
compatible = "lantiq,nor"; compatible = "lantiq,nor";
bank-width = <2>; bank-width = <2>;
@ -57,14 +49,9 @@
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xway";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
stp { stp {
lantiq,groups = "stp"; lantiq,groups = "stp";
@ -87,33 +74,7 @@
}; };
etop@E180000 { etop@E180000 {
compatible = "lantiq,etop-xway";
reg = <0xE180000 0x40000>;
interrupt-parent = <&icu0>;
interrupts = <73 78>;
phy-mode = "rmii"; phy-mode = "rmii";
mac-address = [ 00 11 22 33 44 55 ];
}; };
stp0: stp@E100BB0 {
#gpio-cells = <2>;
compatible = "lantiq,gpio-stp-xway";
gpio-controller;
reg = <0xE100BB0 0x40>;
lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>;
};
pci@E105400 {
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
>;
gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
};
}; };
}; };

View file

@ -12,15 +12,7 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
localbus@0 { localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
1 0 0x4000000 0x4000010>; /* addsel1 */
compatible = "lantiq,localbus", "simple-bus";
nor-boot@0 { nor-boot@0 {
compatible = "lantiq,nor"; compatible = "lantiq,nor";
bank-width = <2>; bank-width = <2>;
@ -57,14 +49,9 @@
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xr9";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
stp { stp {
lantiq,groups = "stp"; lantiq,groups = "stp";
@ -87,13 +74,7 @@
}; };
etop@E180000 { etop@E180000 {
compatible = "lantiq,etop-xway";
reg = <0xE180000 0x40000
0xE108000 0x200>;
interrupt-parent = <&icu0>;
interrupts = <72 73>;
phy-mode = "rmii"; phy-mode = "rmii";
mac-address = [ 00 11 22 33 44 55 ];
}; };
stp0: stp@E100BB0 { stp0: stp@E100BB0 {
@ -105,16 +86,5 @@
lantiq,shadow = <0xfff>; lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>; lantiq,groups = <0x3>;
}; };
pci@E105400 {
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
>;
gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
};
}; };
}; };

View file

@ -19,31 +19,10 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "lantiq,fpi", "simple-bus";
ranges = <0x0 0x10000000 0xEEFFFFF>;
reg = <0x10000000 0xEF00000>;
localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
compatible = "lantiq,localbus", "simple-bus";
};
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 {
exin3 { exin3 {
lantiq,groups = "exin3"; lantiq,groups = "exin3";
@ -119,28 +98,6 @@
gpios = <&gpio 33 GPIO_ACTIVE_HIGH>; gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
lantiq,portmask = <0x3>; lantiq,portmask = <0x3>;
}; };
pci@E105400 {
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
compatible = "lantiq,pci-xway1";
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,external-clock;*/
lantiq,delay-hi = <0>; /* 0ns delay */
lantiq,delay-lo = <0>; /* 0.0ns delay */
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
>;
gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
};
}; };
gphy-xrx200 { gphy-xrx200 {

View file

@ -96,7 +96,6 @@
etop@E180000 { etop@E180000 {
phy-mode = "mii"; phy-mode = "mii";
mac-address = [ 00 11 22 33 44 55 ];
}; };
ifxhcd@E101000 { ifxhcd@E101000 {
@ -106,11 +105,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
req-mask = <0xf>; req-mask = <0xf>;
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0xf>; /* GNT1 */
}; };
}; };

View file

@ -89,9 +89,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,internal-clock;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>;
}; };
}; };

View file

@ -24,15 +24,7 @@
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
localbus@0 { localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff
1 0 0x4000000 0x4000010>;
compatible = "lantiq,localbus", "simple-bus";
nor-boot@0 { nor-boot@0 {
compatible = "lantiq,nor"; compatible = "lantiq,nor";
bank-width = <2>; bank-width = <2>;
@ -66,14 +58,9 @@
}; };
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
compatible = "lantiq,pinctrl-xr9";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
#gpio-cells = <2>;
gpio-controller;
reg = <0xE100B10 0xA0>;
state_default: pinmux { state_default: pinmux {
stp { stp {
lantiq,groups = "stp"; lantiq,groups = "stp";
@ -120,14 +107,6 @@
lantiq,shadow = <0xfff>; lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>; lantiq,groups = <0x3>;
}; };
pci@E105400 {
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 29 1>;
gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>;
};
}; };
gpio-keys-polled { gpio-keys-polled {

View file

@ -44,6 +44,7 @@
}; };
}; };
}; };
pcie@d900000 { pcie@d900000 {
status = "disabled"; status = "disabled";
}; };

View file

@ -19,33 +19,11 @@
reg = <0x0 0x8000000>; reg = <0x0 0x8000000>;
}; };
fpi@10000000 { fpi@10000000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "lantiq,fpi", "simple-bus";
ranges = <0x0 0x10000000 0xEEFFFFF>;
reg = <0x10000000 0xEF00000>;
localbus@0 {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
1 0 0x4000000 0x4000010>; /* addsel1 */
compatible = "lantiq,localbus", "simple-bus";
};
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 {
exin3 { exin3 {
lantiq,groups = "exin3"; lantiq,groups = "exin3";
@ -143,25 +121,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,external-clock;*/
lantiq,delay-hi = <0>; /* 0ns delay */
lantiq,delay-lo = <0>; /* 0.0ns delay */
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
}; };
}; };

View file

@ -120,7 +120,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
/* /*
power is not controllable via gpio power is not controllable via gpio
*/ */
dsl: dsl { dsl: dsl {
label = "tdw89x0:green:dsl"; label = "tdw89x0:green:dsl";
gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;

View file

@ -77,13 +77,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
}; };
pcie@d900000 { pcie@d900000 {

View file

@ -2,7 +2,7 @@
/ { / {
model = "VGV7519 - KPN Experiabox V8"; model = "VGV7519 - KPN Experiabox V8";
chosen { chosen {
bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
@ -104,13 +104,7 @@
pci@E105400 { pci@E105400 {
status = "okay"; status = "okay";
lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
>;
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
req-mask = <0x1>; /* GNT1 */
}; };
pcie@d900000 { pcie@d900000 {

View file

@ -90,7 +90,7 @@
compatible = "lantiq,gptu-xway"; compatible = "lantiq,gptu-xway";
reg = <0xE100A00 0x100>; reg = <0xE100A00 0x100>;
interrupt-parent = <&icu0>; interrupt-parent = <&icu0>;
interrupts = <97 98 99 100 101 102>; interrupts = <97 98 99 100 101 102>;
status = "disabled"; status = "disabled";
}; };

View file

@ -197,8 +197,8 @@
0xE105400 0x400>; /* pci bridge */ 0xE105400 0x400>; /* pci bridge */
lantiq,bus-clock = <33333333>; lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>; interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>; interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */
req-mask = <0x1>; req-mask = <0x1>; /* GNT1 */
}; };
}; };

View file

@ -116,7 +116,7 @@
compatible = "lantiq,gptu-xway"; compatible = "lantiq,gptu-xway";
reg = <0xE100A00 0x100>; reg = <0xE100A00 0x100>;
interrupt-parent = <&icu0>; interrupt-parent = <&icu0>;
interrupts = <126 127 128 129 130 131>; interrupts = <126 127 128 129 130 131>;
}; };
asc0: serial@E100400 { asc0: serial@E100400 {
@ -219,6 +219,8 @@
}; };
pci0: pci@E105400 { pci0: pci@E105400 {
status = "disabled";
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
@ -228,7 +230,10 @@
0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */ 0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
reg = <0x7000000 0x8000 /* config space */ reg = <0x7000000 0x8000 /* config space */
0xE105400 0x400>; /* pci bridge */ 0xE105400 0x400>; /* pci bridge */
status = "disabled"; lantiq,bus-clock = <33333333>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */
req-mask = <0x1>; /* GNT1 */
}; };
}; };