Unverified Commit 5d16aa74 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Cleanup of ARM64 DTS for v5.20

Series of cleanups for ARM64 DTS: White-spaces, gpio-key subnode names,
USB DWC3/EHCI node names.

* tag 'dt64-cleanup-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: apm: Harmonize DWC USB3 DT nodes name
  arm64: dts: hisilicon: correct gpio-keys properties
  arm64: dts: hisilicon: align gpio-key node names with dtschema
  arm64: dts: broadcom: align gpio-key node names with dtschema
  arm64: dts: apm: correct gpio-keys properties
  arm64: dts: microchip: adjust whitespace around '='
  arm64: dts: sprd: adjust whitespace around '='
  arm64: dts: hisilicon: adjust whitespace around '='
  arm64: dts: marvell: adjust whitespace around '='
  arm64: dts: lg: adjust whitespace around '='
  arm64: dts: apm: adjust whitespace around '='
  arm64: dts: amd: adjust whitespace around '='

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3966af40 87ccc38e

arch/arm64/boot/dts/apm/apm-merlin.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ memory { 


	gpio-keys {

		compatible = "gpio-keys";

		button@1 {

		button {

			label = "POWER";

			linux,code = <116>;

			linux,input-type = <0x1>;

arch/arm64/boot/dts/apm/apm-mustang.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ memory { 


	gpio-keys {

		compatible = "gpio-keys";

		button@1 {

		button {

			label = "POWER";

			linux,code = <116>;

			linux,input-type = <0x1>;

arch/arm64/boot/dts/apm/apm-shadowcat.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -597,8 +597,8 @@ serial0: serial@10600000 { 
			interrupts = <0x0 0x4c 0x4>;

		};



		/* Do not change dwusb name, coded for backward compatibility */

		usb0: dwusb@19000000 {

		/* Node-name might need to be coded as dwusb for backward compatibility */

		usb0: usb@19000000 {

			status = "disabled";

			compatible = "snps,dwc3";

			reg = <0x0 0x19000000 0x0 0x100000>;

arch/arm64/boot/dts/apm/apm-storm.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -923,8 +923,8 @@ sata3: sata@1a800000 { 
			phy-names = "sata-phy";

		};



		/* Do not change dwusb name, coded for backward compatibility */

		usb0: dwusb@19000000 {

		/* Node-name might need to be coded as dwusb for backward compatibility */

		usb0: usb@19000000 {

			status = "disabled";

			compatible = "snps,dwc3";

			reg = <0x0 0x19000000 0x0 0x100000>;
@@ -933,7 +933,7 @@ usb0: dwusb@19000000 { 
			dr_mode = "host";

		};



		usb1: dwusb@19800000 {

		usb1: usb@19800000 {

			status = "disabled";

			compatible = "snps,dwc3";

			reg = <0x0 0x19800000 0x0 0x100000>;

arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts

+4 −4
Original line number Diff line number Diff line
@@ -83,25 +83,25 @@ gpio-keys-polled { 
		compatible = "gpio-keys-polled";

		poll-interval = <100>;



		brightness {

		key-brightness {

			label = "LEDs";

			linux,code = <KEY_BRIGHTNESS_ZERO>;

			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;

		};



		wps {

		key-wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;

		};



		wifi {

		key-wifi {

			label = "WiFi";

			linux,code = <KEY_RFKILL>;

			gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;

		};



		restart {

		key-restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;