aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/dts/CARAMBOLA.dts
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-06-24 20:17:26 +0200
committerGitHub <noreply@github.com>2016-06-24 20:17:26 +0200
commit6eb05f9f38210bfd7cb667fab1b00e5ebd737556 (patch)
tree8adb7f0946f1c0f2fba4cc28999d915b167af464 /target/linux/ramips/dts/CARAMBOLA.dts
parent282b917e47d9ae5017e1e426face9b75cb7aabd0 (diff)
parent64de7165e5bce0d6f811795bc5a0a81165eb58ca (diff)
downloadmaster-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.tar.gz
master-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.tar.bz2
master-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.zip
Merge pull request #12 from wigyori/master
update oxnas target, update ipq806x target, create trunk tag and update revisioning accordingly
Diffstat (limited to 'target/linux/ramips/dts/CARAMBOLA.dts')
-rw-r--r--target/linux/ramips/dts/CARAMBOLA.dts48
1 files changed, 24 insertions, 24 deletions
diff --git a/target/linux/ramips/dts/CARAMBOLA.dts b/target/linux/ramips/dts/CARAMBOLA.dts
index 5ff60c3af6..e38c49f957 100644
--- a/target/linux/ramips/dts/CARAMBOLA.dts
+++ b/target/linux/ramips/dts/CARAMBOLA.dts
@@ -10,15 +10,6 @@
bootargs = "console=ttyS0,115200";
};
- pinctrl {
- state_default: pinctrl0 {
- gpio {
- ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
- ralink,function = "gpio";
- };
- };
- };
-
cfi@1f000000 {
compatible = "cfi-flash";
reg = <0x1f000000 0x800000>;
@@ -51,25 +42,34 @@
};
};
- ethernet@10100000 {
- mtd-mac-address = <&factory 0x28>;
+ i2c-gpio {
+ compatible = "i2c-gpio";
+ gpios = <&gpio0 1 0 &gpio0 2 0>;
+ i2c-gpio,delay-us = <10>;
};
+};
- esw@10110000 {
- mediatek,portmap = <0x3f>;
+&pinctrl {
+ state_default: pinctrl0 {
+ gpio {
+ ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+ ralink,function = "gpio";
+ };
};
+};
- wmac@10180000 {
- ralink,mtd-eeprom = <&factory 0>;
- };
+&ethernet {
+ mtd-mac-address = <&factory 0x28>;
+};
- otg@101c0000 {
- status = "okay";
- };
+&esw {
+ mediatek,portmap = <0x3f>;
+};
- i2c-gpio {
- compatible = "i2c-gpio";
- gpios = <&gpio0 1 0 &gpio0 2 0>;
- i2c-gpio,delay-us = <10>;
- };
+&wmac {
+ ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+ status = "okay";
};