From bfd65fc4ab71b9504a9280e91a67698ac4e1e06d Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sun, 22 Jul 2018 10:33:42 +0200 Subject: [PATCH] ramips: fix whitespace and comment issues in dts Fix space vs. tabs issue and trainling whitespaces. Use C style comments or drop the comments if they explain what is already to see in the devicetree parameters. Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/11ACNAS.dts | 5 ----- target/linux/ramips/dts/AP-MT7621A-V60.dts | 2 +- target/linux/ramips/dts/ArcherC20v4.dts | 2 +- target/linux/ramips/dts/BR-6475ND.dts | 8 ++++--- target/linux/ramips/dts/FREESTATION5.dts | 16 +++++++++----- target/linux/ramips/dts/GL-MT300A.dts | 4 ++-- target/linux/ramips/dts/GL-MT300N-V2.dts | 10 ++++----- target/linux/ramips/dts/GL-MT300N.dts | 4 ++-- target/linux/ramips/dts/GL-MT750.dts | 4 ++-- target/linux/ramips/dts/JHR-N805R.dts | 18 +++++++-------- target/linux/ramips/dts/NIXCORE.dtsi | 10 ++++----- target/linux/ramips/dts/RB750Gr3.dts | 1 - target/linux/ramips/dts/RBM33G.dts | 1 - .../linux/ramips/dts/RT5350F-OLINUXINO.dtsi | 8 +++---- target/linux/ramips/dts/SK-WB8.dts | 1 - target/linux/ramips/dts/TEW-714TRU.dts | 22 +++++++++---------- target/linux/ramips/dts/UBNT-ER-e50.dtsi | 10 +++++---- target/linux/ramips/dts/W2914NSV2.dts | 5 ----- target/linux/ramips/dts/WD03.dts | 2 +- target/linux/ramips/dts/WIZFI630A.dts | 2 +- target/linux/ramips/dts/WNDR3700V5.dts | 2 +- target/linux/ramips/dts/WRC-1167GHBK2-S.dts | 6 +++-- target/linux/ramips/dts/WRC-2533GST.dts | 3 +-- target/linux/ramips/dts/WRTNODE2P.dts | 2 +- target/linux/ramips/dts/WRTNODE2R.dts | 2 +- target/linux/ramips/dts/Y1.dtsi | 4 ++-- target/linux/ramips/dts/Y1S.dts | 6 ++--- target/linux/ramips/dts/mt7621.dtsi | 8 +++---- 28 files changed, 82 insertions(+), 86 deletions(-) diff --git a/target/linux/ramips/dts/11ACNAS.dts b/target/linux/ramips/dts/11ACNAS.dts index b8c326889c..f66bee6363 100644 --- a/target/linux/ramips/dts/11ACNAS.dts +++ b/target/linux/ramips/dts/11ACNAS.dts @@ -14,11 +14,6 @@ gpio-leds { compatible = "gpio-leds"; - // Only USB LED is connected to GPIO. - // All of other LEDs are connected directly to - // switch, WiFi chip, Vcc, so they are not controllable - // via GPIO - usb { label = "11acnas:green:usb"; gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/AP-MT7621A-V60.dts b/target/linux/ramips/dts/AP-MT7621A-V60.dts index a98d8a6467..8209922fd9 100644 --- a/target/linux/ramips/dts/AP-MT7621A-V60.dts +++ b/target/linux/ramips/dts/AP-MT7621A-V60.dts @@ -21,7 +21,7 @@ simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&dailink0_master>; simple-audio-card,frame-master = <&dailink0_master>; - simple-audio-card,widgets = + simple-audio-card,widgets = "Microphone", "Microphone Jack", "Headphone", "Headphone Jack"; simple-audio-card,routing = diff --git a/target/linux/ramips/dts/ArcherC20v4.dts b/target/linux/ramips/dts/ArcherC20v4.dts index 0466e046af..49f9dc9a0f 100644 --- a/target/linux/ramips/dts/ArcherC20v4.dts +++ b/target/linux/ramips/dts/ArcherC20v4.dts @@ -35,7 +35,7 @@ label = "c20-v4:orange:wan"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; - + wlan5g { label = "c20-v4:green:wlan5g"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts index c9e8d2894a..e0505eabaa 100644 --- a/target/linux/ramips/dts/BR-6475ND.dts +++ b/target/linux/ramips/dts/BR-6475ND.dts @@ -94,9 +94,11 @@ realtek,extif0 = <1 0 1 1 1 1 1 1 2>; }; - /* Unclear if this is the correct gpio setup; the USB ports are - unpopulated on a stock BR-6475nD, even though the hardware exists - and the headers are there. */ + /* + * Unclear if this is the correct gpio setup; the USB ports are + * unpopulated on a stock BR-6475nD, even though the hardware exists + * and the headers are there. + */ /* gpio_export { compatible = "gpio-export"; diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts index 38f058dfa2..807cfc4f64 100644 --- a/target/linux/ramips/dts/FREESTATION5.dts +++ b/target/linux/ramips/dts/FREESTATION5.dts @@ -48,20 +48,24 @@ gpio-export { compatible = "gpio-export"; - // Used to enable power-over-ethernet passthrough from port0 to port1. - // Disable passthrough by default to prevent accidental equipment damage. + /* + * Used to enable power-over-ethernet passthrough from port0 to port1. + * Disable passthrough by default to prevent accidental equipment damage. + */ poe { gpio-export,name = "poe-passthrough"; - gpio-export,output = <1>; // OUT_INIT_HIGH - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; // GPIO 11, ACTIVE_LOW + gpio-export,output = <1>; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; gpio-leds { compatible = "gpio-leds"; - // The following leds are defined in the ArcOS firmware, but reportedly - // not present in the Freestation5 device. + /* + * The following leds are defined in the ArcOS firmware, but reportedly + * not present in the Freestation5 device. + */ wifi { label = "freestation5:unknown:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/GL-MT300A.dts index f6ab3e4537..589b95ad3e 100644 --- a/target/linux/ramips/dts/GL-MT300A.dts +++ b/target/linux/ramips/dts/GL-MT300A.dts @@ -53,7 +53,7 @@ linux,code = ; }; - BTN_1 { + BTN_1 { label = "BTN_1"; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; linux,code = ; @@ -72,7 +72,7 @@ &gpio2 { status = "okay"; }; - + &gpio3 { status = "okay"; }; diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts index 56cd92d6ff..35ad4cc38c 100644 --- a/target/linux/ramips/dts/GL-MT300N-V2.dts +++ b/target/linux/ramips/dts/GL-MT300N-V2.dts @@ -120,14 +120,14 @@ }; factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; + label = "factory"; + reg = <0x40000 0x10000>; + read-only; }; partition@50000 { - label = "firmware"; - reg = <0x50000 0xfb0000>; + label = "firmware"; + reg = <0x50000 0xfb0000>; }; }; }; diff --git a/target/linux/ramips/dts/GL-MT300N.dts b/target/linux/ramips/dts/GL-MT300N.dts index 5dad8f845e..91064abe32 100644 --- a/target/linux/ramips/dts/GL-MT300N.dts +++ b/target/linux/ramips/dts/GL-MT300N.dts @@ -48,7 +48,7 @@ linux,code = ; }; - BTN_1 { + BTN_1 { label = "BTN_1"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; linux,code = ; @@ -67,7 +67,7 @@ &gpio2 { status = "okay"; }; - + &gpio3 { status = "okay"; }; diff --git a/target/linux/ramips/dts/GL-MT750.dts b/target/linux/ramips/dts/GL-MT750.dts index 73257abdb0..c89deb19b4 100644 --- a/target/linux/ramips/dts/GL-MT750.dts +++ b/target/linux/ramips/dts/GL-MT750.dts @@ -48,7 +48,7 @@ linux,code = ; }; - BTN_1 { + BTN_1 { label = "BTN_1"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; linux,code = ; @@ -67,7 +67,7 @@ &gpio2 { status = "okay"; }; - + &gpio3 { status = "okay"; }; diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/JHR-N805R.dts index 32e6ab1aaf..92b8eac4c1 100644 --- a/target/linux/ramips/dts/JHR-N805R.dts +++ b/target/linux/ramips/dts/JHR-N805R.dts @@ -22,15 +22,15 @@ }; }; - gpio-keys-polled { - compatible = "gpio-keys-polled"; - poll-interval = <20>; - - reset { - label = "reset"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - linux,code = ; - }; + gpio-keys-polled { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + linux,code = ; + }; }; }; diff --git a/target/linux/ramips/dts/NIXCORE.dtsi b/target/linux/ramips/dts/NIXCORE.dtsi index 4d2a82d242..1702d74db7 100644 --- a/target/linux/ramips/dts/NIXCORE.dtsi +++ b/target/linux/ramips/dts/NIXCORE.dtsi @@ -109,20 +109,20 @@ }; &gpio0 { - status = "okay"; + status = "okay"; }; &gpio1 { - status = "okay"; + status = "okay"; }; &i2c { - status = "okay"; + status = "okay"; }; &uart { - status = "okay"; - reset-names = "gpio uartf"; + status = "okay"; + reset-names = "gpio uartf"; }; &pinctrl { diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts index e32fd45bce..bb4697eadf 100644 --- a/target/linux/ramips/dts/RB750Gr3.dts +++ b/target/linux/ramips/dts/RB750Gr3.dts @@ -104,7 +104,6 @@ label = "firmware"; reg = <0x50000 0xfb0000>; }; - }; }; diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts index ca8fb87d8c..98a9d57e51 100644 --- a/target/linux/ramips/dts/RBM33G.dts +++ b/target/linux/ramips/dts/RBM33G.dts @@ -113,7 +113,6 @@ reg = <0xf000 0x71000>; read-only; }; - }; w25q128@1 { diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi index 629dab8934..10819aff04 100644 --- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi @@ -3,10 +3,10 @@ / { compatible = "olimex,rt5350f-olinuxino", "ralink,rt5350-soc"; - aliases { - serial0 = &uartlite; - serial1 = &uart; - }; + aliases { + serial0 = &uartlite; + serial1 = &uart; + }; }; diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts index f38f7272ac..de7a544bd6 100644 --- a/target/linux/ramips/dts/SK-WB8.dts +++ b/target/linux/ramips/dts/SK-WB8.dts @@ -83,7 +83,6 @@ label = "firmware"; reg = <0x50000 0xfb0000>; }; - }; }; diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts index 5a38ce6262..4e04bb3e79 100644 --- a/target/linux/ramips/dts/TEW-714TRU.dts +++ b/target/linux/ramips/dts/TEW-714TRU.dts @@ -27,17 +27,17 @@ compatible = "gpio-keys-polled"; poll-interval = <20>; - reset { - label = "reset"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; - linux,code = ; - }; + reset { + label = "reset"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + linux,code = ; + }; }; gpio_export { diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi index 05d0ec6b8f..1bf889e141 100644 --- a/target/linux/ramips/dts/UBNT-ER-e50.dtsi +++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi @@ -77,10 +77,12 @@ }; &spi0 { - /* This board has 2Mb spi flash soldered in and visible - from manufacturer's firmware. - But this SoC shares spi and nand pins, - and current driver does't handle this sharing well */ + /* + * This board has 2Mb spi flash soldered in and visible + * from manufacturer's firmware. + * But this SoC shares spi and nand pins, + * and current driver doesn't handle this sharing well + */ status = "disabled"; m25p80@0 { diff --git a/target/linux/ramips/dts/W2914NSV2.dts b/target/linux/ramips/dts/W2914NSV2.dts index ac26dbe75d..e1a9c41626 100644 --- a/target/linux/ramips/dts/W2914NSV2.dts +++ b/target/linux/ramips/dts/W2914NSV2.dts @@ -13,11 +13,6 @@ gpio-leds { compatible = "gpio-leds"; - // Only USB LED is connected to GPIO. - // All of other LEDs are connected directly to - // switch, WiFi chip, Vcc, so they are not controllable - // via GPIO - usb { label = "w2914nsv2:green:usb"; gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/WD03.dts b/target/linux/ramips/dts/WD03.dts index d66867ea97..dbc1c79678 100644 --- a/target/linux/ramips/dts/WD03.dts +++ b/target/linux/ramips/dts/WD03.dts @@ -49,7 +49,7 @@ }; &i2c { - status = "okay"; + status = "okay"; }; &spi0 { diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts index 69575e9556..8ee457c4ba 100644 --- a/target/linux/ramips/dts/WIZFI630A.dts +++ b/target/linux/ramips/dts/WIZFI630A.dts @@ -56,7 +56,7 @@ gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; linux,code = ; }; - + scm1 { label = "SCM1"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts index fea81a1435..184a04e3dc 100644 --- a/target/linux/ramips/dts/WNDR3700V5.dts +++ b/target/linux/ramips/dts/WNDR3700V5.dts @@ -133,7 +133,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "rgmii2", "mdio", "wdt"; + ralink,group = "rgmii2", "mdio", "wdt"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts index 73e1d45c1f..5c9fe5f22a 100644 --- a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts +++ b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts @@ -137,8 +137,10 @@ &pcie { status = "okay"; - // WRC-1167GHBK2-S has MT7615D for 2.4/5 GHz wifi, - // but it's not supported in OpenWrt. + /* + * WRC-1167GHBK2-S has MT7615D for 2.4/5 GHz wifi, + * but it's not supported in OpenWrt. + */ }; &xhci { diff --git a/target/linux/ramips/dts/WRC-2533GST.dts b/target/linux/ramips/dts/WRC-2533GST.dts index 74f8bb91e3..e61fc9600b 100644 --- a/target/linux/ramips/dts/WRC-2533GST.dts +++ b/target/linux/ramips/dts/WRC-2533GST.dts @@ -167,8 +167,7 @@ &pcie { status = "okay"; - // WRC-2533GST has MT7615 for 2.4/5 GHz wifi, - // but it's not supported in OpenWrt. + /* WRC-2533GST has MT7615 for 2.4/5 GHz wifi, but it's not supported */ }; &xhci { diff --git a/target/linux/ramips/dts/WRTNODE2P.dts b/target/linux/ramips/dts/WRTNODE2P.dts index d3f8fe7e32..f9cc1e97f2 100644 --- a/target/linux/ramips/dts/WRTNODE2P.dts +++ b/target/linux/ramips/dts/WRTNODE2P.dts @@ -17,7 +17,7 @@ label = "wrtnode:blue:indicator"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; - }; + }; }; &pinctrl { diff --git a/target/linux/ramips/dts/WRTNODE2R.dts b/target/linux/ramips/dts/WRTNODE2R.dts index 469d65c350..79f65e0594 100644 --- a/target/linux/ramips/dts/WRTNODE2R.dts +++ b/target/linux/ramips/dts/WRTNODE2R.dts @@ -17,7 +17,7 @@ label = "wrtnode:blue:indicator"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; }; - }; + }; }; &pinctrl { diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/Y1.dtsi index 6e0b254f2c..4efbc3d395 100644 --- a/target/linux/ramips/dts/Y1.dtsi +++ b/target/linux/ramips/dts/Y1.dtsi @@ -21,7 +21,7 @@ }; }; }; - + &gpio0 { status = "okay"; }; @@ -88,7 +88,7 @@ ieee80211-freq-limit = <5000000 6000000>; }; }; - + &wmac { ralink,mtd-eeprom = <&factory 0>; pinctrl-names = "default"; diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/Y1S.dts index 95e2aea084..51bd10d75a 100644 --- a/target/linux/ramips/dts/Y1S.dts +++ b/target/linux/ramips/dts/Y1S.dts @@ -13,11 +13,11 @@ gpio_export { compatible = "gpio-export"; #size-cells = <0>; - /* GPIO 54、55、56 USB1、2、3 */ + usb0 { gpio-export,name = "usb0"; - gpio-export,output = <1>; // GPIOF_OUT_INIT_HIGH - gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; // GPIO2:40+14=GPIO 54 + gpio-export,output = <1>; + gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; }; usb1 { gpio-export,name = "usb1"; diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index 7c19ff4643..207fd3bf1f 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -155,13 +155,13 @@ }; cpc: cpc@1fbf0000 { - compatible = "mtk,mt7621-cpc"; - reg = <0x1fbf0000 0x8000>; + compatible = "mtk,mt7621-cpc"; + reg = <0x1fbf0000 0x8000>; }; mc: mc@1fbf8000 { - compatible = "mtk,mt7621-mc"; - reg = <0x1fbf8000 0x8000>; + compatible = "mtk,mt7621-mc"; + reg = <0x1fbf8000 0x8000>; }; uartlite: uartlite@c00 { -- 2.25.1