projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: drop linux,part-probe usage where possible
[oweals/openwrt.git]
/
target
/
linux
/
brcm63xx
/
dts
/
bcm96318ref_p300.dts
diff --git
a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
index cb648a33edbdebfdd6da2ab51c5ec8d96108c01e..ef9b5c4aaf159edacb89880f8c249a3d950df1e7 100644
(file)
--- a/
target/linux/brcm63xx/dts/bcm96318ref_p300.dts
+++ b/
target/linux/brcm63xx/dts/bcm96318ref_p300.dts
@@
-9,7
+9,8
@@
compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318";
chosen {
compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318";
chosen {
- bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
gpio-keys-polled {
@@
-21,13
+22,13
@@
wps {
label = "wps";
wps {
label = "wps";
- gpios = <&
gpio1 1
1>;
+ gpios = <&
pinctrl 33
1>;
linux,code = <KEY_WPS_BUTTON>;
};
reset {
label = "reset";
linux,code = <KEY_WPS_BUTTON>;
};
reset {
label = "reset";
- gpios = <&
gpio1 2
1>;
+ gpios = <&
pinctrl 34
1>;
linux,code = <KEY_RESTART>;
};
};
linux,code = <KEY_RESTART>;
};
};
@@
-37,22
+38,22
@@
inet {
label = "96318REF_P300:green:inet";
inet {
label = "96318REF_P300:green:inet";
- gpios = <&
gpio0
8 1>;
+ gpios = <&
pinctrl
8 1>;
};
inet_fail {
label = "96318REF_P300:red:inet-fail";
};
inet_fail {
label = "96318REF_P300:red:inet-fail";
- gpios = <&
gpio0
9 1>;
+ gpios = <&
pinctrl
9 1>;
};
post_failed {
label = "96318REF_P300:red:post-failed";
};
post_failed {
label = "96318REF_P300:red:post-failed";
- gpios = <&
gpio0
11 1>;
+ gpios = <&
pinctrl
11 1>;
};
usb_pwron {
label = "96318REF_P300::usb-pwron";
};
usb_pwron {
label = "96318REF_P300::usb-pwron";
- gpios = <&
gpio0
13 1>;
+ gpios = <&
pinctrl
13 1>;
default-state = "on";
};
};
default-state = "on";
};
};
@@
-71,6
+72,17
@@
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
- linux,part-probe = "bcm63xxpart";
+ partitions {
+ compatible = "brcm,bcm963xx-cfe-nor-partitions";
+ };
};
};
};
};
+
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usb_pwron>;
+};
+
+&uart0 {
+ status = "ok";
+};