Unverified Commit 7ccd1f6d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Cleanup of ARM DTS for v5.20

Series of cleanups for ARM DTS:
1. White-spaces, gpio-key subnode names, USB DWC3/EHCI node names,
2. Add board-level compatibles to Aspeed evaluation boards.

* tag 'dt-cleanup-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: stih407-family: Harmonize DWC USB3 DT nodes name
  ARM: dts: lpc18xx: Harmonize EHCI/OHCI DT nodes name
  ARM: dts: ast2600-evb-a1: fix board compatible
  ARM: dts: ast2600-evb: fix board compatible
  ARM: dts: ast2500-evb: fix board compatible
  ARM: dts: animeo: correct gpio-keys properties
  ARM: dts: animeo: align gpio-key node names with dtschema
  ARM: dts: sd: adjust whitespace around '='
  ARM: dts: sti: adjust whitespace around '='
  ARM: dts: ste: adjust whitespace around '='
  ARM: dts: nuvoton: adjust whitespace around '='
  ARM: dts: lpc: adjust whitespace around '='
  ARM: dts: ecx: adjust whitespace around '='
  ARM: dts: alpine: adjust whitespace around '='
  ARM: dts: spear: adjust whitespace around '='
  ARM: dts: axm: adjust whitespace around '='
  ARM: dts: at91: adjust whitespace around '='
  ARM: dts: aspeed: adjust whitespace around '='
  ARM: dts: pxa: adjust whitespace around '='

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5d16aa74 2f7a7f94

arch/arm/boot/dts/animeo_ip.dts

+4 −6
Original line number Diff line number Diff line
@@ -168,26 +168,24 @@ tx_red { 
		};

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		keyswitch_in {

		key-switch-in {

			label = "keyswitch_in";

			gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;

			linux,code = <28>;

			wakeup-source;

		};



		error_in {

		key-error-in {

			label = "error_in";

			gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;

			linux,code = <29>;

			wakeup-source;

		};



		btn {

		key-s {

			label = "btn";

			gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;

			linux,code = <31>;

arch/arm/boot/dts/aspeed-ast2500-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


/ {

	model = "AST2500 EVB";

	compatible = "aspeed,ast2500";

	compatible = "aspeed,ast2500-evb", "aspeed,ast2500";



	aliases {

		serial4 = &uart5;

arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/ {

	model = "AST2600 A1 EVB";

	compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600";



	/delete-node/regulator-vcc-sdhci0;

	/delete-node/regulator-vcc-sdhci1;

arch/arm/boot/dts/aspeed-ast2600-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


/ {

	model = "AST2600 EVB";

	compatible = "aspeed,ast2600";

	compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600";



	aliases {

		serial4 = &uart5;

arch/arm/boot/dts/lpc18xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ mmcsd: mmcsd@40004000 { 
			status = "disabled";

		};



		usb0: ehci@40006100 {

		usb0: usb@40006100 {

			compatible = "nxp,lpc1850-ehci", "generic-ehci";

			reg = <0x40006100 0x100>;

			interrupts = <8>;
@@ -133,7 +133,7 @@ usb0: ehci@40006100 { 
			status = "disabled";

		};



		usb1: ehci@40007100 {

		usb1: usb@40007100 {

			compatible = "nxp,lpc1850-ehci", "generic-ehci";

			reg = <0x40007100 0x100>;

			interrupts = <9>;