Unverified Commit 25b892b5 authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLinus 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: default avatarArnd Bergmann <arnd@arndb.de>
parent eb425d57

arch/arm/boot/dts/arm-realview-eb.dtsi

+19 −8
Original line number Diff line number Diff line
@@ -198,61 +198,72 @@ fpga { 
		syscon: syscon@10000000 {

			compatible = "arm,realview-eb-syscon", "syscon", "simple-mfd";

			reg = <0x10000000 0x1000>;

			ranges = <0x0 0x10000000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



			led@08.0 {

			led@8,0 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x01>;

				label = "versatile:0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@08.1 {

			led@8,1 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x02>;

				label = "versatile:1";

				linux,default-trigger = "mmc0";

				default-state = "off";

			};

			led@08.2 {

			led@8,2 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x04>;

				label = "versatile:2";

				linux,default-trigger = "cpu0";

				default-state = "off";

			};

			led@08.3 {

			led@8,3 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x08>;

				label = "versatile:3";

				default-state = "off";

			};

			led@08.4 {

			led@8,4 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x10>;

				label = "versatile:4";

				default-state = "off";

			};

			led@08.5 {

			led@8,5 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x20>;

				label = "versatile:5";

				default-state = "off";

			};

			led@08.6 {

			led@8,6 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x40>;

				label = "versatile:6";

				default-state = "off";

			};

			led@08.7 {

			led@8,7 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x80>;

				label = "versatile:7";

arch/arm/boot/dts/arm-realview-pb1176.dts

+19 −8
Original line number Diff line number Diff line
@@ -216,61 +216,72 @@ soc { 
		syscon: syscon@10000000 {

			compatible = "arm,realview-pb1176-syscon", "syscon", "simple-mfd";

			reg = <0x10000000 0x1000>;

			ranges = <0x0 0x10000000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



			led@08.0 {

			led@8,0 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x01>;

				label = "versatile:0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@08.1 {

			led@8,1 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x02>;

				label = "versatile:1";

				linux,default-trigger = "mmc0";

				default-state = "off";

			};

			led@08.2 {

			led@8,2 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x04>;

				label = "versatile:2";

				linux,default-trigger = "cpu0";

				default-state = "off";

			};

			led@08.3 {

			led@8,3 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x08>;

				label = "versatile:3";

				default-state = "off";

			};

			led@08.4 {

			led@8,4 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x10>;

				label = "versatile:4";

				default-state = "off";

			};

			led@08.5 {

			led@8,5 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x20>;

				label = "versatile:5";

				default-state = "off";

			};

			led@08.6 {

			led@8,6 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x40>;

				label = "versatile:6";

				default-state = "off";

			};

			led@08.7 {

			led@8,7 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x80>;

				label = "versatile:7";

arch/arm/boot/dts/arm-realview-pb11mp.dts

+19 −8
Original line number Diff line number Diff line
@@ -303,64 +303,75 @@ soc { 
		pb11mp_syscon: syscon@10000000 {

			compatible = "arm,realview-pb11mp-syscon", "syscon", "simple-mfd";

			reg = <0x10000000 0x1000>;

			ranges = <0x0 0x10000000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



			led@08.0 {

			led@8,0 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x01>;

				label = "versatile:0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@08.1 {

			led@8,1 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x02>;

				label = "versatile:1";

				linux,default-trigger = "mmc0";

				default-state = "off";

			};

			led@08.2 {

			led@8,2 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x04>;

				label = "versatile:2";

				linux,default-trigger = "cpu0";

				default-state = "off";

			};

			led@08.3 {

			led@8,3 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x08>;

				label = "versatile:3";

				linux,default-trigger = "cpu1";

				default-state = "off";

			};

			led@08.4 {

			led@8,4 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x10>;

				label = "versatile:4";

				linux,default-trigger = "cpu2";

				default-state = "off";

			};

			led@08.5 {

			led@8,5 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x20>;

				label = "versatile:5";

				linux,default-trigger = "cpu3";

				default-state = "off";

			};

			led@08.6 {

			led@8,6 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x40>;

				label = "versatile:6";

				default-state = "off";

			};

			led@08.7 {

			led@8,7 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x80>;

				label = "versatile:7";

arch/arm/boot/dts/arm-realview-pbx.dtsi

+19 −8
Original line number Diff line number Diff line
@@ -220,61 +220,72 @@ soc: soc { 
		syscon: syscon@10000000 {

			compatible = "arm,realview-pbx-syscon", "syscon", "simple-mfd";

			reg = <0x10000000 0x1000>;

			ranges = <0x0 0x10000000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



			led@08.0 {

			led@8,0 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x01>;

				label = "versatile:0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@08.1 {

			led@8,1 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x02>;

				label = "versatile:1";

				linux,default-trigger = "mmc0";

				default-state = "off";

			};

			led@08.2 {

			led@8,2 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x04>;

				label = "versatile:2";

				linux,default-trigger = "cpu0";

				default-state = "off";

			};

			led@08.3 {

			led@8,3 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x08>;

				label = "versatile:3";

				default-state = "off";

			};

			led@08.4 {

			led@8,4 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x10>;

				label = "versatile:4";

				default-state = "off";

			};

			led@08.5 {

			led@8,5 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x20>;

				label = "versatile:5";

				default-state = "off";

			};

			led@08.6 {

			led@8,6 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x40>;

				label = "versatile:6";

				default-state = "off";

			};

			led@08.7 {

			led@8,7 {

				compatible = "register-bit-led";

				reg = <0x08 0x04>;

				offset = <0x08>;

				mask = <0x80>;

				label = "versatile:7";

arch/arm/boot/dts/integrator.dtsi

+17 −6
Original line number Diff line number Diff line
@@ -15,10 +15,14 @@ memory { 
	core-module@10000000 {

		compatible = "arm,core-module-integrator", "syscon", "simple-mfd";

		reg = <0x10000000 0x200>;

		ranges = <0x0 0x10000000 0x200>;

		#address-cells = <1>;

		#size-cells = <1>;



		/* Use core module LED to indicate CPU load */

		led@c.0 {

		led@c,0 {

			compatible = "register-bit-led";

			reg = <0x0c 0x04>;

			offset = <0x0c>;

			mask = <0x01>;

			label = "integrator:core_module";
@@ -104,35 +108,42 @@ kmi@19000000 { 
			interrupts = <4>;

		};



		syscon {

		syscon@1a000000 {

			/* Debug registers mapped as syscon */

			compatible = "syscon", "simple-mfd";

			reg = <0x1a000000 0x10>;

			ranges = <0x0 0x1a000000 0x10>;

			#address-cells = <1>;

			#size-cells = <1>;



			led@4.0 {

			led@4,0 {

				compatible = "register-bit-led";

				reg = <0x04 0x04>;

				offset = <0x04>;

				mask = <0x01>;

				label = "integrator:green0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@4.1 {

			led@4,1 {

				compatible = "register-bit-led";

				reg = <0x04 0x04>;

				offset = <0x04>;

				mask = <0x02>;

				label = "integrator:yellow";

				default-state = "off";

			};

			led@4.2 {

			led@4,2 {

				compatible = "register-bit-led";

				reg = <0x04 0x04>;

				offset = <0x04>;

				mask = <0x04>;

				label = "integrator:red";

				default-state = "off";

			};

			led@4.3 {

			led@4,3 {

				compatible = "register-bit-led";

				reg = <0x04 0x04>;

				offset = <0x04>;

				mask = <0x08>;

				label = "integrator:green1";