Unverified Commit d70eec52 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v6.3' of... 

Merge tag 'amlogic-arm64-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v6.3:
- Merge of immutable bindings branch with Reset & power domain binding
- New boards:
 - Odroid-N2L (Smaller version of Odroid-N2+)
 - BananaPi M2-Pro (Variant of BPI=M5 with on-board wifi)
 - Radxa Zero2 (New version of Radza Zero with A311D SoC)
- Add DT node for the VIPNano-QI on the A311D
- DT bindings fixups covering all SoC families
 - MAC address nodes
 - ethernet PHY node name
 - scpi & child node names
 - SD/SDIO node name
 - USB supply name
 - invalid clock-names
 - rng node name
 - rtc node name
 - ETH phy mux node name
 - button & adc keys node name
 - leds node names
 - RK818 pmic properties
- remove CPU opps below 1GHz for G12A boards, like it was done for G12B/SM1
- Fix WiFi/Bt definition around P212 & Khadas VIM1
- Add audio node to P212
- Fix FAN trip definition to Odroid-HC4
- Fix gpio-fan gpios definition
- Permit Radxa Zero OTG on USB1
- Fix VDDIO_C enable gpio by using OPEN DRAIN flag

* tag 'amlogic-arm64-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: (43 commits)
  arm64: dts: meson: add support for Radxa Zero2
  dt-bindings: arm: amlogic: add support for Radxa Zero2
  arm64: dts: meson: add support for BananaPi M2-Pro
  dt-bindings: arm: amlogic: add support for BananaPi M2-Pro
  arm64: dts: meson: bananapi-m5: convert dts to dtsi
  arm64: dts: meson: bananapi-m5: remove redundant status from sound node
  arm64: dts: meson: bananapi-m5: switch VDDIO_C pin to OPEN_DRAIN
  arm64: dts: meson: radxa-zero: allow usb otg mode
  arm64: dts: meson-gxm-khadas-vim2: use gpio-fan matrix instead of an array
  arm64: dts: meson-g12b-odroid: Add initial support for Hardkernel ODROID-N2L
  arm64: dts: meson-g12b: move common node into new odroid.dtsi
  dt-bindings: arm: amlogic: document Odroid-N2L
  arm64: dts: amlogic: meson-sm1-odroid-hc4: fix active fan thermal trip
  arm64: dts: meson: add audio playback to S905X-P212 dts
  arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1
  arm64: dts: meson: move pwm_ef node in P212 dtsi
  arm64: dts: meson: add Broadcom WiFi to P212 dtsi
  arm64: dts: amlogic: meson-g12b-odroid-go-ultra: fix rk818 pmic properties
  arm64: dts: amlogic: meson-gxbb-kii-pro: fix led node name
  arm64: dts: amlogic: meson-gxl-s905d-phicomm-n1: fix led node name
  ...

Link: https://lore.kernel.org/r/c1641ffd-71c9-9ac9-89d9-c22da4acea10@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4503fc6e d747e7f7

Documentation/devicetree/bindings/arm/amlogic.yaml

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ properties: 
        items:

          - enum:

              - khadas,vim3

              - radxa,zero2

          - const: amlogic,a311d

          - const: amlogic,g12b
@@ -165,6 +166,7 @@ properties: 
              - azw,gtking-pro

              - hardkernel,odroid-go-ultra

              - hardkernel,odroid-n2

              - hardkernel,odroid-n2l

              - hardkernel,odroid-n2-plus

              - khadas,vim3

              - ugoos,am6
@@ -176,6 +178,7 @@ properties: 
          - enum:

              - amediatech,x96-air

              - amediatech,x96-air-gbit

              - bananapi,bpi-m2-pro

              - bananapi,bpi-m5

              - cyx,a95xf3-air

              - cyx,a95xf3-air-gbit

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
@@ -60,6 +62,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m2-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb

arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -168,15 +168,15 @@ sn: sn@32 { 
		reg = <0x32 0x20>;

	};



	eth_mac: eth_mac@0 {

	eth_mac: eth-mac@0 {

		reg = <0x0 0x6>;

	};



	bt_mac: bt_mac@6 {

	bt_mac: bt-mac@6 {

		reg = <0x6 0x6>;

	};



	wifi_mac: wifi_mac@c {

	wifi_mac: wifi-mac@c {

		reg = <0xc 0x6>;

	};
@@ -217,7 +217,7 @@ &i2c1 { 
	pinctrl-names = "default";



	/* RTC */

	pcf8563: pcf8563@51 {

	pcf8563: rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

		status = "okay";
@@ -303,7 +303,7 @@ &uart_AO_B { 


&usb {

	status = "okay";

	phy-supply = <&usb_pwr>;

	vbus-supply = <&usb_pwr>;

};



&spicc1 {

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

+3 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ scpi { 
		scpi_clocks: clocks {

			compatible = "arm,scpi-clocks";



			scpi_dvfs: clock-controller {

			scpi_dvfs: clocks-0 {

				compatible = "arm,scpi-dvfs-clocks";

				#clock-cells = <1>;

				clock-indices = <0>;
@@ -162,7 +162,7 @@ scpi_dvfs: clock-controller { 
		};



		scpi_sensors: sensors {

			compatible = "amlogic,meson-gxbb-scpi-sensors";

			compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors";

			#thermal-sensor-cells = <1>;

		};

	};
@@ -1883,7 +1883,7 @@ apb: bus@ffe00000 { 
			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>;



			sd_emmc_b: sd@5000 {

			sd_emmc_b: mmc@5000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x5000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

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

+13 −3
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ int_mdio: mdio@1 { 
					#address-cells = <1>;

					#size-cells = <0>;



					internal_ephy: ethernet_phy@8 {

					internal_ephy: ethernet-phy@8 {

						compatible = "ethernet-phy-id0180.3301",

							     "ethernet-phy-ieee802.3-c22";

						interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -2321,7 +2321,7 @@ uart_A: serial@24000 { 
			};

		};



		sd_emmc_a: sd@ffe03000 {

		sd_emmc_a: mmc@ffe03000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe03000 0x0 0x800>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
@@ -2333,7 +2333,7 @@ sd_emmc_a: sd@ffe03000 { 
			resets = <&reset RESET_SD_EMMC_A>;

		};



		sd_emmc_b: sd@ffe05000 {

		sd_emmc_b: mmc@ffe05000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe05000 0x0 0x800>;

			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
@@ -2490,4 +2490,14 @@ xtal: xtal-clk { 
		#clock-cells = <0>;

	};



	npu: npu@ff100000 {

		compatible = "vivante,gc";

		reg = <0x0 0xff100000 0x0 0x20000>;

		interrupts = <0 147 4>;

		clocks = <&clkc CLKID_NNA_CORE_CLK>,

			 <&clkc CLKID_NNA_AXI_CLK>;

		clock-names = "core", "bus";

		resets = <&reset RESET_NNA>;

		status = "disabled";

	};

};