Unverified Commit 65edaea6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt64-cleanup-6.3' of... 

Merge tag 'dt64-cleanup-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into arm/dt

Minor improvements in ARM64 DTS for v6.3

1. Drop 0x from unit address (microchip).
2. Align HDMI CEC and LED nodes with bindings (hisilicon).

* tag 'dt64-cleanup-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  arm64: dts: hisilicon: align LED node names with dtschema
  arm64: dts: microchip: drop 0x from unit address

Link: https://lore.kernel.org/r/20230122121541.29312-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bbabe541 d0931f1d

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

+6 −6
Original line number Diff line number Diff line
@@ -85,28 +85,28 @@ key-power { 
	leds {

		compatible = "gpio-leds";



		user_led1 {

		led-user-1 {

			label = "green:user1";

			/* gpio_150_user_led1 */

			gpios = <&gpio18 6 0>;

			linux,default-trigger = "heartbeat";

		};



		user_led2 {

		led-user-2 {

			label = "green:user2";

			/* gpio_151_user_led2 */

			gpios = <&gpio18 7 0>;

			linux,default-trigger = "none";

		};



		user_led3 {

		led-user-3 {

			label = "green:user3";

			/* gpio_189_user_led3 */

			gpios = <&gpio23 5 0>;

			linux,default-trigger = "mmc0";

		};



		user_led4 {

		led-user-4 {

			label = "green:user4";

			/* gpio_190_user_led4 */

			gpios = <&gpio23 6 0>;
@@ -114,7 +114,7 @@ user_led4 { 
			linux,default-trigger = "none";

		};



		wlan_active_led {

		led-wlan {

			label = "yellow:wlan";

			/* gpio_205_wifi_active */

			gpios = <&gpio25 5 0>;
@@ -122,7 +122,7 @@ wlan_active_led { 
			default-state = "off";

		};



		bt_active_led {

		led-bt {

			label = "blue:bt";

			gpios = <&gpio25 7 0>;

			/* gpio_207_user_led1 */

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

+6 −6
Original line number Diff line number Diff line
@@ -125,39 +125,39 @@ wl1835_pwrseq: wl1835-pwrseq { 
	leds {

		compatible = "gpio-leds";



		user_led1 {

		led-user-1 {

			label = "green:user1";

			gpios = <&gpio4 0 0>; /* <&gpio_user_led_1>; */

			linux,default-trigger = "heartbeat";

		};



		user_led2 {

		led-user-2 {

			label = "green:user2";

			gpios = <&gpio4 1 0>; /* <&gpio_user_led_2>; */

			linux,default-trigger = "mmc0";

		};



		user_led3 {

		led-user-3 {

			label = "green:user3";

			gpios = <&gpio4 2 0>; /* <&gpio_user_led_3>; */

			linux,default-trigger = "mmc1";

		};



		user_led4 {

		led-user-4 {

			label = "green:user4";

			gpios = <&gpio4 3 0>; /* <&gpio_user_led_4>; */

			panic-indicator;

			linux,default-trigger = "none";

		};



		wlan_active_led {

		led-wlan {

			label = "yellow:wlan";

			gpios = <&gpio3 5 0>; /* <&gpio_wlan_active_led>; */

			linux,default-trigger = "phy0tx";

			default-state = "off";

		};



		bt_active_led {

		led-bt {

			label = "blue:bt";

			gpios = <&gpio4 7 0>; /* <&gpio_bt_active_led>; */

			linux,default-trigger = "hci0-power";

arch/arm64/boot/dts/microchip/sparx5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ serdes: serdes@10808000 { 
			reg = <0x6 0x10808000 0x5d0000>;

		};



		switch: switch@0x600000000 {

		switch: switch@600000000 {

			compatible = "microchip,sparx5-switch";

			reg =	<0x6 0 0x401000>,

				<0x6 0x10004000 0x7fc000>,