All device DTS files in the target set the stdout-path to the same value. So, let's move the definitions to the DTSI files. That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi). Signed-off-by: Adrian Schmutzler <[email protected]>
@@ -23,10 +23,6 @@
serial0 = &gsbi4_serial;
mdio-gpio0 = &mdio0;
};
-
- chosen {
- stdout-path = "serial0:115200n8";
- };
&adm_dma {
&qcom_pinmux {
@@ -32,10 +32,6 @@
label-mac-device = &gmac2;
keys {
compatible = "gpio-keys";
pinctrl-0 = <&button_pins>;
@@ -33,7 +33,6 @@
chosen {
bootargs = "rootfstype=squashfs noinitrd";
@@ -18,10 +18,6 @@
serial0 = &uart2;
bootargs = "console=ttyMSM0,115200n8";
append-rootblock = "ubi.mtd="; /* append to bootargs adding the root deviceblock nbr from bootloader */
@@ -34,7 +34,6 @@
@@ -38,7 +38,6 @@
@@ -1,5 +1,11 @@
#include "qcom-ipq8064.dtsi"
+/ {
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
+
&CPU_SPC {
status = "okay";
@@ -31,10 +31,6 @@
led-upgrade = &general;
led-upgrade = &power_green;
@@ -52,10 +52,6 @@
led-upgrade = &led_pass;
leds {
compatible = "gpio-leds";
/* use "ubi_rootfs" volume in "ubi" partition as rootfs */
bootargs = "ubi.block=0,1 root=/dev/ubiblock0_1 rootfstype=squashfs";
bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd";
append-rootblock = "root=/dev/mmcblk0p";
@@ -37,10 +37,6 @@
@@ -4,6 +4,10 @@
model = "Qualcomm IPQ8065";
compatible = "qcom,ipq8065", "qcom,ipq8064";
cpus {
qcom,l2 {
qcom,l2-cpufreq = <384000000 600000000 1400000000>;