tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: arm: Update register-bit-led nodes 'reg' and node names

Add a 'reg' entry for register-bit-led nodes on the Arm Ltd platforms.
The 'reg' entry is the LED control register address. With this, the node
name can be updated to use a generic node name, 'led', and a
unit-address.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20211024232003.211484-1-linus.walleij@linaro.org'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Rob Herring and committed by
Arnd Bergmann 25b892b5 eb425d57

+144 -57
+19 -8
arch/arm/boot/dts/arm-realview-eb.dtsi
··· 198 198 syscon: syscon@10000000 { 199 199 compatible = "arm,realview-eb-syscon", "syscon", "simple-mfd"; 200 200 reg = <0x10000000 0x1000>; 201 + ranges = <0x0 0x10000000 0x1000>; 202 + #address-cells = <1>; 203 + #size-cells = <1>; 201 204 202 - led@08.0 { 205 + led@8,0 { 203 206 compatible = "register-bit-led"; 207 + reg = <0x08 0x04>; 204 208 offset = <0x08>; 205 209 mask = <0x01>; 206 210 label = "versatile:0"; 207 211 linux,default-trigger = "heartbeat"; 208 212 default-state = "on"; 209 213 }; 210 - led@08.1 { 214 + led@8,1 { 211 215 compatible = "register-bit-led"; 216 + reg = <0x08 0x04>; 212 217 offset = <0x08>; 213 218 mask = <0x02>; 214 219 label = "versatile:1"; 215 220 linux,default-trigger = "mmc0"; 216 221 default-state = "off"; 217 222 }; 218 - led@08.2 { 223 + led@8,2 { 219 224 compatible = "register-bit-led"; 225 + reg = <0x08 0x04>; 220 226 offset = <0x08>; 221 227 mask = <0x04>; 222 228 label = "versatile:2"; 223 229 linux,default-trigger = "cpu0"; 224 230 default-state = "off"; 225 231 }; 226 - led@08.3 { 232 + led@8,3 { 227 233 compatible = "register-bit-led"; 234 + reg = <0x08 0x04>; 228 235 offset = <0x08>; 229 236 mask = <0x08>; 230 237 label = "versatile:3"; 231 238 default-state = "off"; 232 239 }; 233 - led@08.4 { 240 + led@8,4 { 234 241 compatible = "register-bit-led"; 242 + reg = <0x08 0x04>; 235 243 offset = <0x08>; 236 244 mask = <0x10>; 237 245 label = "versatile:4"; 238 246 default-state = "off"; 239 247 }; 240 - led@08.5 { 248 + led@8,5 { 241 249 compatible = "register-bit-led"; 250 + reg = <0x08 0x04>; 242 251 offset = <0x08>; 243 252 mask = <0x20>; 244 253 label = "versatile:5"; 245 254 default-state = "off"; 246 255 }; 247 - led@08.6 { 256 + led@8,6 { 248 257 compatible = "register-bit-led"; 258 + reg = <0x08 0x04>; 249 259 offset = <0x08>; 250 260 mask = <0x40>; 251 261 label = "versatile:6"; 252 262 default-state = "off"; 253 263 }; 254 - led@08.7 { 264 + led@8,7 { 255 265 compatible = "register-bit-led"; 266 + reg = <0x08 0x04>; 256 267 offset = <0x08>; 257 268 mask = <0x80>; 258 269 label = "versatile:7";
+19 -8
arch/arm/boot/dts/arm-realview-pb1176.dts
··· 216 216 syscon: syscon@10000000 { 217 217 compatible = "arm,realview-pb1176-syscon", "syscon", "simple-mfd"; 218 218 reg = <0x10000000 0x1000>; 219 + ranges = <0x0 0x10000000 0x1000>; 220 + #address-cells = <1>; 221 + #size-cells = <1>; 219 222 220 - led@08.0 { 223 + led@8,0 { 221 224 compatible = "register-bit-led"; 225 + reg = <0x08 0x04>; 222 226 offset = <0x08>; 223 227 mask = <0x01>; 224 228 label = "versatile:0"; 225 229 linux,default-trigger = "heartbeat"; 226 230 default-state = "on"; 227 231 }; 228 - led@08.1 { 232 + led@8,1 { 229 233 compatible = "register-bit-led"; 234 + reg = <0x08 0x04>; 230 235 offset = <0x08>; 231 236 mask = <0x02>; 232 237 label = "versatile:1"; 233 238 linux,default-trigger = "mmc0"; 234 239 default-state = "off"; 235 240 }; 236 - led@08.2 { 241 + led@8,2 { 237 242 compatible = "register-bit-led"; 243 + reg = <0x08 0x04>; 238 244 offset = <0x08>; 239 245 mask = <0x04>; 240 246 label = "versatile:2"; 241 247 linux,default-trigger = "cpu0"; 242 248 default-state = "off"; 243 249 }; 244 - led@08.3 { 250 + led@8,3 { 245 251 compatible = "register-bit-led"; 252 + reg = <0x08 0x04>; 246 253 offset = <0x08>; 247 254 mask = <0x08>; 248 255 label = "versatile:3"; 249 256 default-state = "off"; 250 257 }; 251 - led@08.4 { 258 + led@8,4 { 252 259 compatible = "register-bit-led"; 260 + reg = <0x08 0x04>; 253 261 offset = <0x08>; 254 262 mask = <0x10>; 255 263 label = "versatile:4"; 256 264 default-state = "off"; 257 265 }; 258 - led@08.5 { 266 + led@8,5 { 259 267 compatible = "register-bit-led"; 268 + reg = <0x08 0x04>; 260 269 offset = <0x08>; 261 270 mask = <0x20>; 262 271 label = "versatile:5"; 263 272 default-state = "off"; 264 273 }; 265 - led@08.6 { 274 + led@8,6 { 266 275 compatible = "register-bit-led"; 276 + reg = <0x08 0x04>; 267 277 offset = <0x08>; 268 278 mask = <0x40>; 269 279 label = "versatile:6"; 270 280 default-state = "off"; 271 281 }; 272 - led@08.7 { 282 + led@8,7 { 273 283 compatible = "register-bit-led"; 284 + reg = <0x08 0x04>; 274 285 offset = <0x08>; 275 286 mask = <0x80>; 276 287 label = "versatile:7";
+19 -8
arch/arm/boot/dts/arm-realview-pb11mp.dts
··· 303 303 pb11mp_syscon: syscon@10000000 { 304 304 compatible = "arm,realview-pb11mp-syscon", "syscon", "simple-mfd"; 305 305 reg = <0x10000000 0x1000>; 306 + ranges = <0x0 0x10000000 0x1000>; 307 + #address-cells = <1>; 308 + #size-cells = <1>; 306 309 307 - led@08.0 { 310 + led@8,0 { 308 311 compatible = "register-bit-led"; 312 + reg = <0x08 0x04>; 309 313 offset = <0x08>; 310 314 mask = <0x01>; 311 315 label = "versatile:0"; 312 316 linux,default-trigger = "heartbeat"; 313 317 default-state = "on"; 314 318 }; 315 - led@08.1 { 319 + led@8,1 { 316 320 compatible = "register-bit-led"; 321 + reg = <0x08 0x04>; 317 322 offset = <0x08>; 318 323 mask = <0x02>; 319 324 label = "versatile:1"; 320 325 linux,default-trigger = "mmc0"; 321 326 default-state = "off"; 322 327 }; 323 - led@08.2 { 328 + led@8,2 { 324 329 compatible = "register-bit-led"; 330 + reg = <0x08 0x04>; 325 331 offset = <0x08>; 326 332 mask = <0x04>; 327 333 label = "versatile:2"; 328 334 linux,default-trigger = "cpu0"; 329 335 default-state = "off"; 330 336 }; 331 - led@08.3 { 337 + led@8,3 { 332 338 compatible = "register-bit-led"; 339 + reg = <0x08 0x04>; 333 340 offset = <0x08>; 334 341 mask = <0x08>; 335 342 label = "versatile:3"; 336 343 linux,default-trigger = "cpu1"; 337 344 default-state = "off"; 338 345 }; 339 - led@08.4 { 346 + led@8,4 { 340 347 compatible = "register-bit-led"; 348 + reg = <0x08 0x04>; 341 349 offset = <0x08>; 342 350 mask = <0x10>; 343 351 label = "versatile:4"; 344 352 linux,default-trigger = "cpu2"; 345 353 default-state = "off"; 346 354 }; 347 - led@08.5 { 355 + led@8,5 { 348 356 compatible = "register-bit-led"; 357 + reg = <0x08 0x04>; 349 358 offset = <0x08>; 350 359 mask = <0x20>; 351 360 label = "versatile:5"; 352 361 linux,default-trigger = "cpu3"; 353 362 default-state = "off"; 354 363 }; 355 - led@08.6 { 364 + led@8,6 { 356 365 compatible = "register-bit-led"; 366 + reg = <0x08 0x04>; 357 367 offset = <0x08>; 358 368 mask = <0x40>; 359 369 label = "versatile:6"; 360 370 default-state = "off"; 361 371 }; 362 - led@08.7 { 372 + led@8,7 { 363 373 compatible = "register-bit-led"; 374 + reg = <0x08 0x04>; 364 375 offset = <0x08>; 365 376 mask = <0x80>; 366 377 label = "versatile:7";
+19 -8
arch/arm/boot/dts/arm-realview-pbx.dtsi
··· 220 220 syscon: syscon@10000000 { 221 221 compatible = "arm,realview-pbx-syscon", "syscon", "simple-mfd"; 222 222 reg = <0x10000000 0x1000>; 223 + ranges = <0x0 0x10000000 0x1000>; 224 + #address-cells = <1>; 225 + #size-cells = <1>; 223 226 224 - led@08.0 { 227 + led@8,0 { 225 228 compatible = "register-bit-led"; 229 + reg = <0x08 0x04>; 226 230 offset = <0x08>; 227 231 mask = <0x01>; 228 232 label = "versatile:0"; 229 233 linux,default-trigger = "heartbeat"; 230 234 default-state = "on"; 231 235 }; 232 - led@08.1 { 236 + led@8,1 { 233 237 compatible = "register-bit-led"; 238 + reg = <0x08 0x04>; 234 239 offset = <0x08>; 235 240 mask = <0x02>; 236 241 label = "versatile:1"; 237 242 linux,default-trigger = "mmc0"; 238 243 default-state = "off"; 239 244 }; 240 - led@08.2 { 245 + led@8,2 { 241 246 compatible = "register-bit-led"; 247 + reg = <0x08 0x04>; 242 248 offset = <0x08>; 243 249 mask = <0x04>; 244 250 label = "versatile:2"; 245 251 linux,default-trigger = "cpu0"; 246 252 default-state = "off"; 247 253 }; 248 - led@08.3 { 254 + led@8,3 { 249 255 compatible = "register-bit-led"; 256 + reg = <0x08 0x04>; 250 257 offset = <0x08>; 251 258 mask = <0x08>; 252 259 label = "versatile:3"; 253 260 default-state = "off"; 254 261 }; 255 - led@08.4 { 262 + led@8,4 { 256 263 compatible = "register-bit-led"; 264 + reg = <0x08 0x04>; 257 265 offset = <0x08>; 258 266 mask = <0x10>; 259 267 label = "versatile:4"; 260 268 default-state = "off"; 261 269 }; 262 - led@08.5 { 270 + led@8,5 { 263 271 compatible = "register-bit-led"; 272 + reg = <0x08 0x04>; 264 273 offset = <0x08>; 265 274 mask = <0x20>; 266 275 label = "versatile:5"; 267 276 default-state = "off"; 268 277 }; 269 - led@08.6 { 278 + led@8,6 { 270 279 compatible = "register-bit-led"; 280 + reg = <0x08 0x04>; 271 281 offset = <0x08>; 272 282 mask = <0x40>; 273 283 label = "versatile:6"; 274 284 default-state = "off"; 275 285 }; 276 - led@08.7 { 286 + led@8,7 { 277 287 compatible = "register-bit-led"; 288 + reg = <0x08 0x04>; 278 289 offset = <0x08>; 279 290 mask = <0x80>; 280 291 label = "versatile:7";
+17 -6
arch/arm/boot/dts/integrator.dtsi
··· 15 15 core-module@10000000 { 16 16 compatible = "arm,core-module-integrator", "syscon", "simple-mfd"; 17 17 reg = <0x10000000 0x200>; 18 + ranges = <0x0 0x10000000 0x200>; 19 + #address-cells = <1>; 20 + #size-cells = <1>; 18 21 19 22 /* Use core module LED to indicate CPU load */ 20 - led@c.0 { 23 + led@c,0 { 21 24 compatible = "register-bit-led"; 25 + reg = <0x0c 0x04>; 22 26 offset = <0x0c>; 23 27 mask = <0x01>; 24 28 label = "integrator:core_module"; ··· 108 104 interrupts = <4>; 109 105 }; 110 106 111 - syscon { 107 + syscon@1a000000 { 112 108 /* Debug registers mapped as syscon */ 113 109 compatible = "syscon", "simple-mfd"; 114 110 reg = <0x1a000000 0x10>; 111 + ranges = <0x0 0x1a000000 0x10>; 112 + #address-cells = <1>; 113 + #size-cells = <1>; 115 114 116 - led@4.0 { 115 + led@4,0 { 117 116 compatible = "register-bit-led"; 117 + reg = <0x04 0x04>; 118 118 offset = <0x04>; 119 119 mask = <0x01>; 120 120 label = "integrator:green0"; 121 121 linux,default-trigger = "heartbeat"; 122 122 default-state = "on"; 123 123 }; 124 - led@4.1 { 124 + led@4,1 { 125 125 compatible = "register-bit-led"; 126 + reg = <0x04 0x04>; 126 127 offset = <0x04>; 127 128 mask = <0x02>; 128 129 label = "integrator:yellow"; 129 130 default-state = "off"; 130 131 }; 131 - led@4.2 { 132 + led@4,2 { 132 133 compatible = "register-bit-led"; 134 + reg = <0x04 0x04>; 133 135 offset = <0x04>; 134 136 mask = <0x04>; 135 137 label = "integrator:red"; 136 138 default-state = "off"; 137 139 }; 138 - led@4.3 { 140 + led@4,3 { 139 141 compatible = "register-bit-led"; 142 + reg = <0x04 0x04>; 140 143 offset = <0x04>; 141 144 mask = <0x08>; 142 145 label = "integrator:green1";
+8 -2
arch/arm/boot/dts/mps2.dtsi
··· 216 216 compatible = "syscon", "simple-mfd"; 217 217 reg = <0x8000 0x10>; 218 218 219 - led0 { 219 + ranges = <0x0 0x8000 0x10>; 220 + #address-cells = <1>; 221 + #size-cells = <1>; 222 + 223 + led@0,0 { 220 224 compatible = "register-bit-led"; 225 + reg = <0x00 0x04>; 221 226 offset = <0x0>; 222 227 mask = <0x01>; 223 228 label = "userled:0"; ··· 230 225 default-state = "on"; 231 226 }; 232 227 233 - led1 { 228 + led@0,1 { 234 229 compatible = "register-bit-led"; 230 + reg = <0x00 0x04>; 235 231 offset = <0x0>; 236 232 mask = <0x02>; 237 233 label = "userled:1";
+5 -1
arch/arm/boot/dts/versatile-ab-ib2.dts
··· 13 13 syscon@27000000 { 14 14 compatible = "arm,versatile-ib2-syscon", "syscon", "simple-mfd"; 15 15 reg = <0x27000000 0x4>; 16 + ranges = <0x0 0x27000000 0x4>; 17 + #address-cells = <1>; 18 + #size-cells = <1>; 16 19 17 - led@00.4 { 20 + led@0,4 { 18 21 compatible = "register-bit-led"; 22 + reg = <0x00 0x04>; 19 23 offset = <0x00>; 20 24 mask = <0x10>; 21 25 label = "versatile-ib2:0";
+19 -8
arch/arm/boot/dts/versatile-ab.dts
··· 70 70 core-module@10000000 { 71 71 compatible = "arm,core-module-versatile", "syscon", "simple-mfd"; 72 72 reg = <0x10000000 0x200>; 73 + ranges = <0x0 0x10000000 0x200>; 74 + #address-cells = <1>; 75 + #size-cells = <1>; 73 76 74 - led@08.0 { 77 + led@8,0 { 75 78 compatible = "register-bit-led"; 79 + reg = <0x08 0x04>; 76 80 offset = <0x08>; 77 81 mask = <0x01>; 78 82 label = "versatile:0"; 79 83 linux,default-trigger = "heartbeat"; 80 84 default-state = "on"; 81 85 }; 82 - led@08.1 { 86 + led@8,1 { 83 87 compatible = "register-bit-led"; 88 + reg = <0x08 0x04>; 84 89 offset = <0x08>; 85 90 mask = <0x02>; 86 91 label = "versatile:1"; 87 92 linux,default-trigger = "mmc0"; 88 93 default-state = "off"; 89 94 }; 90 - led@08.2 { 95 + led@8,2 { 91 96 compatible = "register-bit-led"; 97 + reg = <0x08 0x04>; 92 98 offset = <0x08>; 93 99 mask = <0x04>; 94 100 label = "versatile:2"; 95 101 linux,default-trigger = "cpu0"; 96 102 default-state = "off"; 97 103 }; 98 - led@08.3 { 104 + led@8,3 { 99 105 compatible = "register-bit-led"; 106 + reg = <0x08 0x04>; 100 107 offset = <0x08>; 101 108 mask = <0x08>; 102 109 label = "versatile:3"; 103 110 default-state = "off"; 104 111 }; 105 - led@08.4 { 112 + led@8,4 { 106 113 compatible = "register-bit-led"; 114 + reg = <0x08 0x04>; 107 115 offset = <0x08>; 108 116 mask = <0x10>; 109 117 label = "versatile:4"; 110 118 default-state = "off"; 111 119 }; 112 - led@08.5 { 120 + led@8,5 { 113 121 compatible = "register-bit-led"; 122 + reg = <0x08 0x04>; 114 123 offset = <0x08>; 115 124 mask = <0x20>; 116 125 label = "versatile:5"; 117 126 default-state = "off"; 118 127 }; 119 - led@08.6 { 128 + led@8,6 { 120 129 compatible = "register-bit-led"; 130 + reg = <0x08 0x04>; 121 131 offset = <0x08>; 122 132 mask = <0x40>; 123 133 label = "versatile:6"; 124 134 default-state = "off"; 125 135 }; 126 - led@08.7 { 136 + led@8,7 { 127 137 compatible = "register-bit-led"; 138 + reg = <0x08 0x04>; 128 139 offset = <0x08>; 129 140 mask = <0x80>; 130 141 label = "versatile:7";
+19 -8
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
··· 153 153 apbregs@10000 { 154 154 compatible = "syscon", "simple-mfd"; 155 155 reg = <0x010000 0x1000>; 156 + ranges = <0x0 0x10000 0x1000>; 157 + #address-cells = <1>; 158 + #size-cells = <1>; 156 159 157 - led0 { 160 + led@8,0 { 158 161 compatible = "register-bit-led"; 162 + reg = <0x08 0x04>; 159 163 offset = <0x08>; 160 164 mask = <0x01>; 161 165 label = "vexpress:0"; 162 166 linux,default-trigger = "heartbeat"; 163 167 default-state = "on"; 164 168 }; 165 - led1 { 169 + led@8,1 { 166 170 compatible = "register-bit-led"; 171 + reg = <0x08 0x04>; 167 172 offset = <0x08>; 168 173 mask = <0x02>; 169 174 label = "vexpress:1"; 170 175 linux,default-trigger = "mmc0"; 171 176 default-state = "off"; 172 177 }; 173 - led2 { 178 + led@8,2 { 174 179 compatible = "register-bit-led"; 180 + reg = <0x08 0x04>; 175 181 offset = <0x08>; 176 182 mask = <0x04>; 177 183 label = "vexpress:2"; 178 184 linux,default-trigger = "cpu0"; 179 185 default-state = "off"; 180 186 }; 181 - led3 { 187 + led@8,3 { 182 188 compatible = "register-bit-led"; 189 + reg = <0x08 0x04>; 183 190 offset = <0x08>; 184 191 mask = <0x08>; 185 192 label = "vexpress:3"; 186 193 linux,default-trigger = "cpu1"; 187 194 default-state = "off"; 188 195 }; 189 - led4 { 196 + led@8,4 { 190 197 compatible = "register-bit-led"; 198 + reg = <0x08 0x04>; 191 199 offset = <0x08>; 192 200 mask = <0x10>; 193 201 label = "vexpress:4"; 194 202 linux,default-trigger = "cpu2"; 195 203 default-state = "off"; 196 204 }; 197 - led5 { 205 + led@8,5 { 198 206 compatible = "register-bit-led"; 207 + reg = <0x08 0x04>; 199 208 offset = <0x08>; 200 209 mask = <0x20>; 201 210 label = "vexpress:5"; 202 211 linux,default-trigger = "cpu3"; 203 212 default-state = "off"; 204 213 }; 205 - led6 { 214 + led@8,6 { 206 215 compatible = "register-bit-led"; 216 + reg = <0x08 0x04>; 207 217 offset = <0x08>; 208 218 mask = <0x40>; 209 219 label = "vexpress:6"; 210 220 default-state = "off"; 211 221 }; 212 - led7 { 222 + led@8,7 { 213 223 compatible = "register-bit-led"; 224 + reg = <0x08 0x04>; 214 225 offset = <0x08>; 215 226 mask = <0x80>; 216 227 label = "vexpress:7";