bmips: remove unneeded console from bootargs

[openwrt/staging/rmilecki.git] / target / linux / bmips / dts / bcm6358.dtsi

diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi
index 650459d339fd994fa6d4b3e77d23c42ad808042c..bb08abf25bb838506557ef53f6343735c7258e1f 100644 (file)
--- a/target/linux/bmips/dts/bcm6358.dtsi
+++ b/target/linux/bmips/dts/bcm6358.dtsi
@@ -22,7 +22,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,115200n8 earlycon";
+               bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
        };
 
@@ -92,16 +92,15 @@
                };
 
                pll_cntl: syscon@fffe0008 {
-                       compatible = "syscon";
+                       compatible = "syscon", "simple-mfd";
                        reg = <0xfffe0008 0x4>;
                        native-endian;
-               };
 
-               syscon-reboot {
-                       compatible = "syscon-reboot";
-                       regmap = <&pll_cntl>;
-                       offset = <0x0>;
-                       mask = <0x1>;
+                       syscon-reboot {
+                               compatible = "syscon-reboot";
+                               offset = <0x0>;
+                               mask = <0x1>;
+                       };
                };
 
                periph_intc: interrupt-controller@fffe000c {
@@ -149,76 +148,86 @@
                        #reset-cells = <1>;
                };
 
-               pinctrl: pin-controller@fffe0080 {
-                       compatible = "brcm,bcm6358-pinctrl";
-                       reg = <0xfffe0080 0x8>,
-                             <0xfffe0088 0x8>;
-                       reg-names = "dirout", "dat", "mode";
-                       brcm,gpiomode = <&gpiomode>;
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-
-                       interrupts-extended = <&ext_intc1 0 0>,
-                                             <&ext_intc1 1 0>,
-                                             <&ext_intc0 0 0>,
-                                             <&ext_intc0 1 0>,
-                                             <&ext_intc0 2 0>,
-                                             <&ext_intc0 3 0>;
-                       interrupt-names = "gpio32", "gpio33", "gpio34", "gpio35",
-                                         "gpio36", "gpio37";
-
-                       pinctrl_ebi_cs: ebi_cs {
-                               function = "ebi_cs";
-                               groups = "ebi_cs_grp";
-                       };
-
-                       pinctrl_uart1: uart1 {
-                               function = "uart1";
-                               groups = "uart1_grp";
-                       };
-
-                       pinctrl_serial_led: serial_led {
-                               function = "serial_led";
-                               groups = "serial_led_grp";
-                       };
+               wdt: watchdog@fffe005c {
+                       compatible = "brcm,bcm7038-wdt";
+                       reg = <0xfffe005c 0xc>;
 
-                       pinctrl_legacy_led: legacy_led {
-                               function = "legacy_led";
-                               groups = "legacy_led_grp";
-                       };
-
-                       pinctrl_led: led {
-                               function = "led";
-                               groups = "led_grp";
-                       };
-
-                       pinctrl_spi_cs_23: spi_cs {
-                               function = "spi_cs";
-                               groups = "spi_cs_grp";
-                       };
+                       clocks = <&periph_osc>;
 
-                       pinctrl_utopia: utopia {
-                               function = "utopia";
-                               groups = "utopia_grp";
-                       };
+                       timeout-sec = <30>;
+               };
 
-                       pinctrl_pwm_syn_clk: pwm_syn_clk {
-                               function = "pwm_syn_clk";
-                               groups = "pwm_syn_clk_grp";
-                       };
+               gpio: syscon@fffe0080 {
+                       compatible = "syscon", "simple-mfd";
+                       reg = <0xfffe0080 0x50>;
+                       native-endian;
 
-                       pinctrl_sys_irq: sys_irq {
-                               function = "sys_irq";
-                               groups = "sys_irq_grp";
+                       pinctrl: pin-controller {
+                               compatible = "brcm,bcm6358-pinctrl";
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
+
+                               interrupts-extended = <&ext_intc1 0 0>,
+                                                     <&ext_intc1 1 0>,
+                                                     <&ext_intc0 0 0>,
+                                                     <&ext_intc0 1 0>,
+                                                     <&ext_intc0 2 0>,
+                                                     <&ext_intc0 3 0>;
+                               interrupt-names = "gpio32",
+                                                 "gpio33",
+                                                 "gpio34",
+                                                 "gpio35",
+                                                 "gpio36",
+                                                 "gpio37";
+
+                               pinctrl_ebi_cs: ebi_cs {
+                                       function = "ebi_cs";
+                                       groups = "ebi_cs_grp";
+                               };
+
+                               pinctrl_uart1: uart1 {
+                                       function = "uart1";
+                                       groups = "uart1_grp";
+                               };
+
+                               pinctrl_serial_led: serial_led {
+                                       function = "serial_led";
+                                       groups = "serial_led_grp";
+                               };
+
+                               pinctrl_legacy_led: legacy_led {
+                                       function = "legacy_led";
+                                       groups = "legacy_led_grp";
+                               };
+
+                               pinctrl_led: led {
+                                       function = "led";
+                                       groups = "led_grp";
+                               };
+
+                               pinctrl_spi_cs_23: spi_cs {
+                                       function = "spi_cs";
+                                       groups = "spi_cs_grp";
+                               };
+
+                               pinctrl_utopia: utopia {
+                                       function = "utopia";
+                                       groups = "utopia_grp";
+                               };
+
+                               pinctrl_pwm_syn_clk: pwm_syn_clk {
+                                       function = "pwm_syn_clk";
+                                       groups = "pwm_syn_clk_grp";
+                               };
+
+                               pinctrl_sys_irq: sys_irq {
+                                       function = "sys_irq";
+                                       groups = "sys_irq_grp";
+                               };
                        };
                };
 
-               gpiomode: gpiomode@fffe0098 {
-                       compatible = "brcm,bcm6358-gpiomode", "syscon";
-                       reg = <0xfffe0098 0x4>;
-               };
-
                leds: led-controller@fffe00d0 {
                        #address-cells = <1>;
                        #size-cells = <0>;