Unverified Commit 32c3d47f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.1/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM64-based SoC changes for 6.1,
please pull the following:

- Rafal adds the BCM4908 LED controller node and describes all 32 LED
pins, he also adds support for the Asus GC-AC5300 LEDs

* tag 'arm-soc/for-6.1/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: bcm4908: add Asus GT-AC5300 LEDs
  arm64: dts: broadcom: bcm4908: add LEDs controller block
  arm64: dts: broadcom: bcm4908: add remaining LED pins

Link: https://lore.kernel.org/r/20220915023044.2350782-3-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e3306087 3bcae339

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts

+48 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/leds/common.h>



#include "bcm4908.dtsi"
@@ -118,6 +119,53 @@ ethernet-phy@3 { 
	};

};



&leds {

	led-power@11 {

		reg = <0x11>;

		function = LED_FUNCTION_POWER;

		color = <LED_COLOR_ID_WHITE>;

		default-state = "on";

		active-low;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_led_17_a>;

	};



	led-wan-red@12 {

		reg = <0x12>;

		function = LED_FUNCTION_WAN;

		color = <LED_COLOR_ID_RED>;

		active-low;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_led_18_a>;

	};



	led-wps@14 {

		reg = <0x14>;

		function = LED_FUNCTION_WPS;

		color = <LED_COLOR_ID_WHITE>;

		active-low;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_led_20_a>;

	};



	led-wan-white@15 {

		reg = <0x15>;

		function = LED_FUNCTION_WAN;

		color = <LED_COLOR_ID_WHITE>;

		active-low;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_led_21_a>;

	};



	led-lan@19 {

		reg = <0x19>;

		function = LED_FUNCTION_LAN;

		color = <LED_COLOR_ID_WHITE>;

		pinctrl-names = "default";

		pinctrl-0 = <&pins_led_25_a>;

	};

};



&nandcs {

	nand-ecc-strength = <4>;

	nand-ecc-step-size = <512>;

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi

+83 −0
Original line number Diff line number Diff line
@@ -352,6 +352,61 @@ pins_led_9_a: led_9-a-pins { 
				groups = "led_9_grp_a";

			};



			pins_led_10_a: led_10-a-pins {

				function = "led_10";

				groups = "led_10_grp_a";

			};



			pins_led_11_a: led_11-a-pins {

				function = "led_11";

				groups = "led_11_grp_a";

			};



			pins_led_12_a: led_12-a-pins {

				function = "led_12";

				groups = "led_12_grp_a";

			};



			pins_led_13_a: led_13-a-pins {

				function = "led_13";

				groups = "led_13_grp_a";

			};



			pins_led_14_a: led_14-a-pins {

				function = "led_14";

				groups = "led_14_grp_a";

			};



			pins_led_15_a: led_15-a-pins {

				function = "led_15";

				groups = "led_15_grp_a";

			};



			pins_led_16_a: led_16-a-pins {

				function = "led_16";

				groups = "led_16_grp_a";

			};



			pins_led_17_a: led_17-a-pins {

				function = "led_17";

				groups = "led_17_grp_a";

			};



			pins_led_18_a: led_18-a-pins {

				function = "led_18";

				groups = "led_18_grp_a";

			};



			pins_led_19_a: led_19-a-pins {

				function = "led_19";

				groups = "led_19_grp_a";

			};



			pins_led_20_a: led_20-a-pins {

				function = "led_20";

				groups = "led_20_grp_a";

			};



			pins_led_21_a: led_21-a-pins {

				function = "led_21";

				groups = "led_21_grp_a";
@@ -362,6 +417,21 @@ pins_led_22_a: led_22-a-pins { 
				groups = "led_22_grp_a";

			};



			pins_led_23_a: led_23-a-pins {

				function = "led_23";

				groups = "led_23_grp_a";

			};



			pins_led_24_a: led_24-a-pins {

				function = "led_24";

				groups = "led_24_grp_a";

			};



			pins_led_25_a: led_25-a-pins {

				function = "led_25";

				groups = "led_25_grp_a";

			};



			pins_led_26_a: led_26-a-pins {

				function = "led_26";

				groups = "led_26_grp_a";
@@ -387,6 +457,11 @@ pins_led_30_a: led_30-a-pins { 
				groups = "led_30_grp_a";

			};



			pins_led_31_a: led_31-a-pins {

				function = "led_31";

				groups = "led_31_grp_a";

			};



			pins_hs_uart: hs_uart-pins {

				function = "hs_uart";

				groups = "hs_uart_grp";
@@ -442,6 +517,14 @@ uart0: serial@640 { 
			status = "okay";

		};



		leds: leds@800 {

			compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";

			reg = <0x800 0xdc>;



			#address-cells = <1>;

			#size-cells = <0>;

		};



		nand-controller@1800 {

			#address-cells = <1>;

			#size-cells = <0>;