Merge tag 'mvebu-dt-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge tag 'mvebu-dt-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt for 6.6 (part 1)

Fix style issue and incorrect syntax

* tag 'mvebu-dt-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: marvell: dove: drop incorrect reg in fixed regulators
ARM: dts: marvell: armada: drop incorrect reg in fixed regulators
ARM: dts: marvell: add missing space before {

Link: https://lore.kernel.org/r/87h6p4t0lv.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 2 years ago eeb751c4 7cb74e0c

+225 -288

15 changed files

expand all collapse all

arch

arm

boot

dts

marvell

armada-370-dlink-dns327l.dts

armada-370-seagate-nas-4bay.dts

armada-370-seagate-nas-xbay.dtsi

armada-370-seagate-personal-cloud-2bay.dts

armada-370-seagate-personal-cloud.dtsi

armada-370-synology-ds213j.dts

armada-382-rd-ac3x-48g4x2xl.dts

armada-xp-synology-ds414.dts

dove-cm-a510.dtsi

dove-cubox.dts

dove-d3plug.dts

dove-sbc-a510.dts

kirkwood-l-50.dts

pxa168.dtsi

pxa910.dtsi

+37 -46

arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts

reviewed

··· 105 105 }; 106 106 }; 107 107 108 108 - regulators { 109 109 - compatible = "simple-bus"; 110 110 - #address-cells = <1>; 111 111 - #size-cells = <0>; 108 108 + usb_power: regulator-1 { 109 109 + compatible = "regulator-fixed"; 110 110 + pinctrl-0 = <&xhci_pwr_pin>; 111 111 + pinctrl-names = "default"; 112 112 + regulator-name = "USB3.0 Port Power"; 113 113 + regulator-min-microvolt = <5000000>; 114 114 + regulator-max-microvolt = <5000000>; 115 115 + enable-active-high; 116 116 + regulator-boot-on; 117 117 + regulator-always-on; 118 118 + gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>; 119 119 + }; 112 120 113 113 - usb_power: regulator@1 { 114 114 - compatible = "regulator-fixed"; 115 115 - reg = <1>; 116 116 - pinctrl-0 = <&xhci_pwr_pin>; 117 117 - pinctrl-names = "default"; 118 118 - regulator-name = "USB3.0 Port Power"; 119 119 - regulator-min-microvolt = <5000000>; 120 120 - regulator-max-microvolt = <5000000>; 121 121 - enable-active-high; 122 122 - regulator-boot-on; 123 123 - regulator-always-on; 124 124 - gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>; 125 125 - }; 121 121 + sata_r_power: regulator-2 { 122 122 + compatible = "regulator-fixed"; 123 123 + pinctrl-0 = <&sata_r_pwr_pin>; 124 124 + pinctrl-names = "default"; 125 125 + regulator-name = "SATA-R Power"; 126 126 + regulator-min-microvolt = <5000000>; 127 127 + regulator-max-microvolt = <5000000>; 128 128 + startup-delay-us = <2000000>; 129 129 + enable-active-high; 130 130 + regulator-always-on; 131 131 + regulator-boot-on; 132 132 + gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 133 133 + }; 126 134 127 127 - sata_r_power: regulator@2 { 128 128 - compatible = "regulator-fixed"; 129 129 - reg = <2>; 130 130 - pinctrl-0 = <&sata_r_pwr_pin>; 131 131 - pinctrl-names = "default"; 132 132 - regulator-name = "SATA-R Power"; 133 133 - regulator-min-microvolt = <5000000>; 134 134 - regulator-max-microvolt = <5000000>; 135 135 - startup-delay-us = <2000000>; 136 136 - enable-active-high; 137 137 - regulator-always-on; 138 138 - regulator-boot-on; 139 139 - gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 140 140 - }; 141 141 - 142 142 - sata_l_power: regulator@3 { 143 143 - compatible = "regulator-fixed"; 144 144 - reg = <3>; 145 145 - pinctrl-0 = <&sata_l_pwr_pin>; 146 146 - pinctrl-names = "default"; 147 147 - regulator-name = "SATA-L Power"; 148 148 - regulator-min-microvolt = <5000000>; 149 149 - regulator-max-microvolt = <5000000>; 150 150 - startup-delay-us = <4000000>; 151 151 - enable-active-high; 152 152 - regulator-always-on; 153 153 - regulator-boot-on; 154 154 - gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>; 155 155 - }; 135 135 + sata_l_power: regulator-3 { 136 136 + compatible = "regulator-fixed"; 137 137 + pinctrl-0 = <&sata_l_pwr_pin>; 138 138 + pinctrl-names = "default"; 139 139 + regulator-name = "SATA-L Power"; 140 140 + regulator-min-microvolt = <5000000>; 141 141 + regulator-max-microvolt = <5000000>; 142 142 + startup-delay-us = <4000000>; 143 143 + enable-active-high; 144 144 + regulator-always-on; 145 145 + regulator-boot-on; 146 146 + gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>; 156 147 }; 157 148 }; 158 149

+20 -23

arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts

reviewed

··· 46 46 }; 47 47 }; 48 48 49 49 - regulators { 50 50 - regulator@3 { 51 51 - compatible = "regulator-fixed"; 52 52 - reg = <3>; 53 53 - regulator-name = "SATA2 power"; 54 54 - regulator-min-microvolt = <5000000>; 55 55 - regulator-max-microvolt = <5000000>; 56 56 - enable-active-high; 57 57 - regulator-always-on; 58 58 - regulator-boot-on; 59 59 - gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>; 60 60 - }; 61 61 - regulator@4 { 62 62 - compatible = "regulator-fixed"; 63 63 - reg = <4>; 64 64 - regulator-name = "SATA3 power"; 65 65 - regulator-min-microvolt = <5000000>; 66 66 - regulator-max-microvolt = <5000000>; 67 67 - enable-active-high; 68 68 - regulator-always-on; 69 69 - regulator-boot-on; 70 70 - gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>; 71 71 - }; 49 49 + regulator-3 { 50 50 + compatible = "regulator-fixed"; 51 51 + regulator-name = "SATA2 power"; 52 52 + regulator-min-microvolt = <5000000>; 53 53 + regulator-max-microvolt = <5000000>; 54 54 + enable-active-high; 55 55 + regulator-always-on; 56 56 + regulator-boot-on; 57 57 + gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>; 58 58 + }; 59 59 + 60 60 + regulator-4 { 61 61 + compatible = "regulator-fixed"; 62 62 + regulator-name = "SATA3 power"; 63 63 + regulator-min-microvolt = <5000000>; 64 64 + regulator-max-microvolt = <5000000>; 65 65 + enable-active-high; 66 66 + regulator-always-on; 67 67 + regulator-boot-on; 68 68 + gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>; 72 69 }; 73 70 74 71 gpio-leds {

+19 -27

arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi

reviewed

··· 70 70 71 71 }; 72 72 73 73 - regulators { 74 74 - compatible = "simple-bus"; 75 75 - #address-cells = <1>; 76 76 - #size-cells = <0>; 77 77 - pinctrl-names = "default"; 73 73 + regulator-1 { 74 74 + compatible = "regulator-fixed"; 75 75 + regulator-name = "SATA0 power"; 76 76 + regulator-min-microvolt = <5000000>; 77 77 + regulator-max-microvolt = <5000000>; 78 78 + enable-active-high; 79 79 + regulator-always-on; 80 80 + regulator-boot-on; 81 81 + gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; 82 82 + }; 78 83 79 79 - regulator@1 { 80 80 - compatible = "regulator-fixed"; 81 81 - reg = <1>; 82 82 - regulator-name = "SATA0 power"; 83 83 - regulator-min-microvolt = <5000000>; 84 84 - regulator-max-microvolt = <5000000>; 85 85 - enable-active-high; 86 86 - regulator-always-on; 87 87 - regulator-boot-on; 88 88 - gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; 89 89 - }; 90 90 - regulator@2 { 91 91 - compatible = "regulator-fixed"; 92 92 - reg = <2>; 93 93 - regulator-name = "SATA1 power"; 94 94 - regulator-min-microvolt = <5000000>; 95 95 - regulator-max-microvolt = <5000000>; 96 96 - enable-active-high; 97 97 - regulator-always-on; 98 98 - regulator-boot-on; 99 99 - gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 100 100 - }; 84 84 + regulator-2 { 85 85 + compatible = "regulator-fixed"; 86 86 + regulator-name = "SATA1 power"; 87 87 + regulator-min-microvolt = <5000000>; 88 88 + regulator-max-microvolt = <5000000>; 89 89 + enable-active-high; 90 90 + regulator-always-on; 91 91 + regulator-boot-on; 92 92 + gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 101 93 }; 102 94 103 95 gpio-fan {

+9 -12

arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts

reviewed

··· 32 32 }; 33 33 }; 34 34 35 35 - regulators { 36 36 - regulator@2 { 37 37 - compatible = "regulator-fixed"; 38 38 - reg = <2>; 39 39 - regulator-name = "SATA1 power"; 40 40 - regulator-min-microvolt = <5000000>; 41 41 - regulator-max-microvolt = <5000000>; 42 42 - enable-active-high; 43 43 - regulator-always-on; 44 44 - regulator-boot-on; 45 45 - gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 46 46 - }; 35 35 + regulator-2 { 36 36 + compatible = "regulator-fixed"; 37 37 + regulator-name = "SATA1 power"; 38 38 + regulator-min-microvolt = <5000000>; 39 39 + regulator-max-microvolt = <5000000>; 40 40 + enable-active-high; 41 41 + regulator-always-on; 42 42 + regulator-boot-on; 43 43 + gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; 47 44 }; 48 45 };

+18 -25

arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi

reviewed

··· 53 53 }; 54 54 }; 55 55 56 56 - regulators { 57 57 - compatible = "simple-bus"; 58 58 - #address-cells = <1>; 59 59 - #size-cells = <0>; 56 56 + regulator-0 { 57 57 + compatible = "regulator-fixed"; 58 58 + regulator-name = "USB Power"; 59 59 + regulator-min-microvolt = <5000000>; 60 60 + regulator-max-microvolt = <5000000>; 61 61 + regulator-always-on; 62 62 + regulator-boot-on; 63 63 + gpio = <&gpio1 27 GPIO_ACTIVE_LOW>; 64 64 + }; 60 65 61 61 - regulator@0 { 62 62 - compatible = "regulator-fixed"; 63 63 - reg = <0>; 64 64 - regulator-name = "USB Power"; 65 65 - regulator-min-microvolt = <5000000>; 66 66 - regulator-max-microvolt = <5000000>; 67 67 - regulator-always-on; 68 68 - regulator-boot-on; 69 69 - gpio = <&gpio1 27 GPIO_ACTIVE_LOW>; 70 70 - }; 71 71 - regulator@1 { 72 72 - compatible = "regulator-fixed"; 73 73 - reg = <1>; 74 74 - regulator-name = "SATA0 power"; 75 75 - regulator-min-microvolt = <5000000>; 76 76 - regulator-max-microvolt = <5000000>; 77 77 - enable-active-high; 78 78 - regulator-always-on; 79 79 - regulator-boot-on; 80 80 - gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; 81 81 - }; 66 66 + regulator-1 { 67 67 + compatible = "regulator-fixed"; 68 68 + regulator-name = "SATA0 power"; 69 69 + regulator-min-microvolt = <5000000>; 70 70 + regulator-max-microvolt = <5000000>; 71 71 + enable-active-high; 72 72 + regulator-always-on; 73 73 + regulator-boot-on; 74 74 + gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; 82 75 }; 83 76 84 77 gpio-keys {

+24 -30

arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts

reviewed

··· 142 142 }; 143 143 }; 144 144 145 145 - regulators { 146 146 - compatible = "simple-bus"; 147 147 - #address-cells = <1>; 148 148 - #size-cells = <0>; 149 149 - pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>; 145 145 + sata1_regulator: sata1-regulator-1 { 146 146 + compatible = "regulator-fixed"; 147 147 + regulator-name = "SATA1 Power"; 148 148 + regulator-min-microvolt = <5000000>; 149 149 + regulator-max-microvolt = <5000000>; 150 150 + startup-delay-us = <2000000>; 151 151 + enable-active-high; 152 152 + regulator-always-on; 153 153 + regulator-boot-on; 154 154 + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; 155 155 + pinctrl-0 = <&sata1_pwr_pin>; 150 156 pinctrl-names = "default"; 157 157 + }; 151 158 152 152 - sata1_regulator: sata1-regulator@1 { 153 153 - compatible = "regulator-fixed"; 154 154 - reg = <1>; 155 155 - regulator-name = "SATA1 Power"; 156 156 - regulator-min-microvolt = <5000000>; 157 157 - regulator-max-microvolt = <5000000>; 158 158 - startup-delay-us = <2000000>; 159 159 - enable-active-high; 160 160 - regulator-always-on; 161 161 - regulator-boot-on; 162 162 - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; 163 163 - }; 164 164 - 165 165 - sata2_regulator: sata2-regulator@2 { 166 166 - compatible = "regulator-fixed"; 167 167 - reg = <2>; 168 168 - regulator-name = "SATA2 Power"; 169 169 - regulator-min-microvolt = <5000000>; 170 170 - regulator-max-microvolt = <5000000>; 171 171 - startup-delay-us = <4000000>; 172 172 - enable-active-high; 173 173 - regulator-always-on; 174 174 - regulator-boot-on; 175 175 - gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>; 176 176 - }; 159 159 + sata2_regulator: sata2-regulator-2 { 160 160 + compatible = "regulator-fixed"; 161 161 + regulator-name = "SATA2 Power"; 162 162 + regulator-min-microvolt = <5000000>; 163 163 + regulator-max-microvolt = <5000000>; 164 164 + startup-delay-us = <4000000>; 165 165 + enable-active-high; 166 166 + regulator-always-on; 167 167 + regulator-boot-on; 168 168 + gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>; 169 169 + pinctrl-0 = <&sata2_pwr_pin>; 170 170 + pinctrl-names = "default"; 177 171 }; 178 172 }; 179 173

+3 -3

arch/arm/boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts

reviewed

··· 40 40 pinctrl-0 = <&i2c0_pins>; 41 41 status = "okay"; 42 42 43 43 - eeprom@53{ 43 43 + eeprom@53 { 44 44 compatible = "atmel,24c64"; 45 45 reg = <0x53>; 46 46 }; ··· 95 95 reg = <0x00000000 0x00500000>; 96 96 label = "u-boot"; 97 97 }; 98 98 - partition@500000{ 98 98 + partition@500000 { 99 99 reg = <0x00500000 0x00400000>; 100 100 label = "u-boot env"; 101 101 }; 102 102 - partition@900000{ 102 102 + partition@900000 { 103 103 reg = <0x00900000 0x3F700000>; 104 104 label = "user"; 105 105 };

+50 -55

arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts

reviewed

··· 109 109 }; 110 110 }; 111 111 112 112 - regulators { 113 113 - compatible = "simple-bus"; 114 114 - #address-cells = <1>; 115 115 - #size-cells = <0>; 116 116 - pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin 117 117 - &sata3_pwr_pin &sata4_pwr_pin>; 112 112 + sata1_regulator: sata1-regulator-1 { 113 113 + compatible = "regulator-fixed"; 114 114 + regulator-name = "SATA1 Power"; 115 115 + regulator-min-microvolt = <5000000>; 116 116 + regulator-max-microvolt = <5000000>; 117 117 + startup-delay-us = <2000000>; 118 118 + enable-active-high; 119 119 + regulator-always-on; 120 120 + regulator-boot-on; 121 121 + gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>; 122 122 + pinctrl-0 = <&sata1_pwr_pin>; 118 123 pinctrl-names = "default"; 124 124 + }; 119 125 120 120 - sata1_regulator: sata1-regulator@1 { 121 121 - compatible = "regulator-fixed"; 122 122 - reg = <1>; 123 123 - regulator-name = "SATA1 Power"; 124 124 - regulator-min-microvolt = <5000000>; 125 125 - regulator-max-microvolt = <5000000>; 126 126 - startup-delay-us = <2000000>; 127 127 - enable-active-high; 128 128 - regulator-always-on; 129 129 - regulator-boot-on; 130 130 - gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>; 131 131 - }; 126 126 + sata2_regulator: sata2-regulator-2 { 127 127 + compatible = "regulator-fixed"; 128 128 + regulator-name = "SATA2 Power"; 129 129 + regulator-min-microvolt = <5000000>; 130 130 + regulator-max-microvolt = <5000000>; 131 131 + startup-delay-us = <4000000>; 132 132 + enable-active-high; 133 133 + regulator-always-on; 134 134 + regulator-boot-on; 135 135 + gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>; 136 136 + pinctrl-0 = <&sata2_pwr_pin>; 137 137 + pinctrl-names = "default"; 138 138 + }; 132 139 133 133 - sata2_regulator: sata2-regulator@2 { 134 134 - compatible = "regulator-fixed"; 135 135 - reg = <2>; 136 136 - regulator-name = "SATA2 Power"; 137 137 - regulator-min-microvolt = <5000000>; 138 138 - regulator-max-microvolt = <5000000>; 139 139 - startup-delay-us = <4000000>; 140 140 - enable-active-high; 141 141 - regulator-always-on; 142 142 - regulator-boot-on; 143 143 - gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>; 144 144 - }; 140 140 + sata3_regulator: sata3-regulator-3 { 141 141 + compatible = "regulator-fixed"; 142 142 + regulator-name = "SATA3 Power"; 143 143 + regulator-min-microvolt = <5000000>; 144 144 + regulator-max-microvolt = <5000000>; 145 145 + startup-delay-us = <6000000>; 146 146 + enable-active-high; 147 147 + regulator-always-on; 148 148 + regulator-boot-on; 149 149 + gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>; 150 150 + pinctrl-0 = <&sata3_pwr_pin>; 151 151 + pinctrl-names = "default"; 152 152 + }; 145 153 146 146 - sata3_regulator: sata3-regulator@3 { 147 147 - compatible = "regulator-fixed"; 148 148 - reg = <3>; 149 149 - regulator-name = "SATA3 Power"; 150 150 - regulator-min-microvolt = <5000000>; 151 151 - regulator-max-microvolt = <5000000>; 152 152 - startup-delay-us = <6000000>; 153 153 - enable-active-high; 154 154 - regulator-always-on; 155 155 - regulator-boot-on; 156 156 - gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>; 157 157 - }; 158 158 - 159 159 - sata4_regulator: sata4-regulator@4 { 160 160 - compatible = "regulator-fixed"; 161 161 - reg = <4>; 162 162 - regulator-name = "SATA4 Power"; 163 163 - regulator-min-microvolt = <5000000>; 164 164 - regulator-max-microvolt = <5000000>; 165 165 - startup-delay-us = <8000000>; 166 166 - enable-active-high; 167 167 - regulator-always-on; 168 168 - regulator-boot-on; 169 169 - gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; 170 170 - }; 154 154 + sata4_regulator: sata4-regulator-4 { 155 155 + compatible = "regulator-fixed"; 156 156 + regulator-name = "SATA4 Power"; 157 157 + regulator-min-microvolt = <5000000>; 158 158 + regulator-max-microvolt = <5000000>; 159 159 + startup-delay-us = <8000000>; 160 160 + enable-active-high; 161 161 + regulator-always-on; 162 162 + regulator-boot-on; 163 163 + gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; 164 164 + pinctrl-0 = <&sata4_pwr_pin>; 165 165 + pinctrl-names = "default"; 171 166 }; 172 167 }; 173 168

+6 -12

arch/arm/boot/dts/marvell/dove-cm-a510.dtsi

reviewed

··· 108 108 }; 109 109 }; 110 110 111 111 - regulators { 112 112 - compatible = "simple-bus"; 113 113 - #address-cells = <1>; 114 114 - #size-cells = <0>; 115 115 - 116 116 - wifi_power: regulator@1 { 117 117 - compatible = "regulator-fixed"; 118 118 - regulator-name = "WiFi Power"; 119 119 - regulator-min-microvolt = <3300000>; 120 120 - regulator-max-microvolt = <3300000>; 121 121 - gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>; 122 122 - }; 111 111 + wifi_power: regulator-1 { 112 112 + compatible = "regulator-fixed"; 113 113 + regulator-name = "WiFi Power"; 114 114 + regulator-min-microvolt = <3300000>; 115 115 + regulator-max-microvolt = <3300000>; 116 116 + gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>; 123 117 }; 124 118 }; 125 119

+11 -18

arch/arm/boot/dts/marvell/dove-cubox.dts

reviewed

··· 28 28 }; 29 29 }; 30 30 31 31 - regulators { 32 32 - compatible = "simple-bus"; 33 33 - #address-cells = <1>; 34 34 - #size-cells = <0>; 35 35 - 36 36 - usb_power: regulator@1 { 37 37 - compatible = "regulator-fixed"; 38 38 - reg = <1>; 39 39 - regulator-name = "USB Power"; 40 40 - regulator-min-microvolt = <5000000>; 41 41 - regulator-max-microvolt = <5000000>; 42 42 - enable-active-high; 43 43 - regulator-always-on; 44 44 - regulator-boot-on; 45 45 - gpio = <&gpio0 1 0>; 46 46 - pinctrl-0 = <&pmx_gpio_1>; 47 47 - pinctrl-names = "default"; 48 48 - }; 31 31 + usb_power: regulator-1 { 32 32 + compatible = "regulator-fixed"; 33 33 + regulator-name = "USB Power"; 34 34 + regulator-min-microvolt = <5000000>; 35 35 + regulator-max-microvolt = <5000000>; 36 36 + enable-active-high; 37 37 + regulator-always-on; 38 38 + regulator-boot-on; 39 39 + gpio = <&gpio0 1 0>; 40 40 + pinctrl-0 = <&pmx_gpio_1>; 41 41 + pinctrl-names = "default"; 49 42 }; 50 43 51 44 clocks {

+11 -18

arch/arm/boot/dts/marvell/dove-d3plug.dts

reviewed

··· 37 37 }; 38 38 }; 39 39 40 40 - regulators { 41 41 - compatible = "simple-bus"; 42 42 - #address-cells = <1>; 43 43 - #size-cells = <0>; 44 44 - 45 45 - usb_power: regulator@1 { 46 46 - compatible = "regulator-fixed"; 47 47 - reg = <1>; 48 48 - regulator-name = "USB Power"; 49 49 - regulator-min-microvolt = <5000000>; 50 50 - regulator-max-microvolt = <5000000>; 51 51 - enable-active-high; 52 52 - regulator-always-on; 53 53 - regulator-boot-on; 54 54 - gpio = <&gpio0 8 0>; 55 55 - pinctrl-0 = <&pmx_gpio_8>; 56 56 - pinctrl-names = "default"; 57 57 - }; 40 40 + usb_power: regulator-1 { 41 41 + compatible = "regulator-fixed"; 42 42 + regulator-name = "USB Power"; 43 43 + regulator-min-microvolt = <5000000>; 44 44 + regulator-max-microvolt = <5000000>; 45 45 + enable-active-high; 46 46 + regulator-always-on; 47 47 + regulator-boot-on; 48 48 + gpio = <&gpio0 8 0>; 49 49 + pinctrl-0 = <&pmx_gpio_8>; 50 50 + pinctrl-names = "default"; 58 51 }; 59 52 }; 60 53

+13 -15

arch/arm/boot/dts/marvell/dove-sbc-a510.dts

reviewed

··· 76 76 stdout-path = &uart0; 77 77 }; 78 78 79 79 - regulators { 80 80 - usb0_power: regulator@2 { 81 81 - compatible = "regulator-fixed"; 82 82 - regulator-name = "USB Power"; 83 83 - regulator-min-microvolt = <5000000>; 84 84 - regulator-max-microvolt = <5000000>; 85 85 - gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; 86 86 - }; 79 79 + usb0_power: regulator-2 { 80 80 + compatible = "regulator-fixed"; 81 81 + regulator-name = "USB Power"; 82 82 + regulator-min-microvolt = <5000000>; 83 83 + regulator-max-microvolt = <5000000>; 84 84 + gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; 85 85 + }; 87 86 88 88 - mmc_power: regulator@3 { 89 89 - compatible = "regulator-fixed"; 90 90 - regulator-name = "MMC Power"; 91 91 - regulator-min-microvolt = <3300000>; 92 92 - regulator-max-microvolt = <3300000>; 93 93 - gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>; 94 94 - }; 87 87 + mmc_power: regulator-3 { 88 88 + compatible = "regulator-fixed"; 89 89 + regulator-name = "MMC Power"; 90 90 + regulator-min-microvolt = <3300000>; 91 91 + regulator-max-microvolt = <3300000>; 92 92 + gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>; 95 93 }; 96 94 }; 97 95

+2 -2

arch/arm/boot/dts/marvell/kirkwood-l-50.dts

reviewed

··· 62 62 status = "okay"; 63 63 clock-frequency = <400000>; 64 64 65 65 - gpio2: gpio-expander@20{ 65 65 + gpio2: gpio-expander@20 { 66 66 #gpio-cells = <2>; 67 67 #interrupt-cells = <2>; 68 68 compatible = "semtech,sx1505q"; ··· 76 76 * 5: mPCIE reset (active low) 77 77 * 6: Express card reset (active low) 78 78 */ 79 79 - gpio3: gpio-expander@21{ 79 79 + gpio3: gpio-expander@21 { 80 80 #gpio-cells = <2>; 81 81 #interrupt-cells = <2>; 82 82 compatible = "semtech,sx1505q";

+1 -1

arch/arm/boot/dts/marvell/pxa168.dtsi

reviewed

··· 153 153 }; 154 154 }; 155 155 156 156 - soc_clocks: clocks{ 156 156 + soc_clocks: clocks { 157 157 compatible = "marvell,pxa168-clock"; 158 158 reg = <0xd4050000 0x1000>, 159 159 <0xd4282800 0x400>,

+1 -1

arch/arm/boot/dts/marvell/pxa910.dtsi

reviewed

··· 163 163 }; 164 164 }; 165 165 166 166 - soc_clocks: clocks{ 166 166 + soc_clocks: clocks { 167 167 compatible = "marvell,pxa910-clock"; 168 168 reg = <0xd4050000 0x1000>, 169 169 <0xd4282800 0x400>,