Commit d9421d6c authored by Kevin Hilman's avatar Kevin Hilman Committed by Arnd Bergmann
Browse files

arm64: dts: amlogic: misc DT schema fixups 



Take a pass at cleaning up a bunch of warnings
from 'make dtbs_check' that have crept in.

Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210421204833.18523-1-khilman@baylibre.com

'
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d028b508

Documentation/devicetree/bindings/media/rc.yaml

+4 −0
Original line number Diff line number Diff line
@@ -90,9 +90,12 @@ properties: 
      - rc-leadtek-y04g0051

      - rc-lme2510

      - rc-manli

      - rc-mecool-kii-pro

      - rc-mecool-kiii-pro

      - rc-medion-x10

      - rc-medion-x10-digitainer

      - rc-medion-x10-or2x

      - rc-minix-neo

      - rc-msi-digivox-ii

      - rc-msi-digivox-iii

      - rc-msi-tvanywhere
@@ -145,6 +148,7 @@ properties: 
      - rc-videomate-s350

      - rc-videomate-tv-pvr

      - rc-videostrong-kii-pro

      - rc-vega-s9x

      - rc-wetek-hub

      - rc-wetek-play2

      - rc-winfast

arch/arm64/boot/dts/amlogic/meson-a1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -88,13 +88,13 @@ reset: reset-controller@0 { 
				#reset-cells = <1>;

			};



			periphs_pinctrl: pinctrl@0400 {

			periphs_pinctrl: pinctrl@400 {

				compatible = "amlogic,meson-a1-periphs-pinctrl";

				#address-cells = <2>;

				#size-cells = <2>;

				ranges;



				gpio: bank@0400 {

				gpio: bank@400 {

					reg = <0x0 0x0400 0x0 0x003c>,

					      <0x0 0x0480 0x0 0x0118>;

					reg-names = "mux", "gpio";

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1731,7 +1731,6 @@ ge2d: ge2d@ff940000 { 
			interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;

			clocks = <&clkc CLKID_VAPB>;

			resets = <&reset RESET_GE2D>;

			reset-names = "core";

		};



		gic: interrupt-controller@ffc01000 {

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ soc { 


		pcie: pcie@fc000000 {

			compatible = "amlogic,g12a-pcie", "snps,dw-pcie";

			reg = <0x0 0xfc000000 0x0 0x400000

			       0x0 0xff648000 0x0 0x2000

			       0x0 0xfc400000 0x0 0x200000>;

			reg = <0x0 0xfc000000 0x0 0x400000>,

			      <0x0 0xff648000 0x0 0x2000>,

			      <0x0 0xfc400000 0x0 0x200000>;

			reg-names = "elbi", "cfg", "config";

			interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;

			#interrupt-cells = <1>;
@@ -140,8 +140,8 @@ pcie: pcie@fc000000 { 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000

				  0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;

			ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000>,

				 <0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;



			clocks = <&clkc CLKID_PCIE_PHY

				  &clkc CLKID_PCIE_COMB
@@ -2009,7 +2009,7 @@ mux { 
				};

			};



			vrtc: rtc@0a8 {

			vrtc: rtc@a8 {

				compatible = "amlogic,meson-vrtc";

				reg = <0x0 0x000a8 0x0 0x4>;

			};
@@ -2187,7 +2187,7 @@ gpio_intc: interrupt-controller@f080 { 
				amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

			};



			watchdog: wdt@f0d0 {

			watchdog: watchdog@f0d0 {

				compatible = "amlogic,meson-gxbb-wdt";

				reg = <0x0 0xf0d0 0x0 0x10>;

				clocks = <&xtal>;

arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>



/ {

	compatible = "azw,gsking-x", "amlogic,g12b";

	compatible = "azw,gsking-x", "amlogic,s922x", "amlogic,g12b";

	model = "Beelink GS-King X";



	aliases {