Merge tag 'amlogic-fixes' into v5.11/dt64 (5bc0d756) · Commits · 戴 / test

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -584,3 +584,9 @@
		pinctrl-0 = <&uart_ao_a_pins>;
		pinctrl-names = "default";
		};

		&usb {
		status = "okay";
		dr_mode = "otg";
		vbus-supply = <&usb_pwr>;
		};

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

+52 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,46 @@
		#size-cells = <2>;
		ranges;

		usb: usb@ffe09080 {
		compatible = "amlogic,meson-axg-usb-ctrl";
		reg = <0x0 0xffe09080 0x0 0x20>;
		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;

		clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1_DDR_BRIDGE>;
		clock-names = "usb_ctrl", "ddr";
		resets = <&reset RESET_USB_OTG>;

		dr_mode = "otg";

		phys = <&usb2_phy1>;
		phy-names = "usb2-phy1";

		dwc2: usb@ff400000 {
		compatible = "amlogic,meson-g12a-usb", "snps,dwc2";
		reg = <0x0 0xff400000 0x0 0x40000>;
		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clkc CLKID_USB1>;
		clock-names = "otg";
		phys = <&usb2_phy1>;
		dr_mode = "peripheral";
		g-rx-fifo-size = <192>;
		g-np-tx-fifo-size = <128>;
		g-tx-fifo-size = <128 128 16 16 16>;
		};

		dwc3: usb@ff500000 {
		compatible = "snps,dwc3";
		reg = <0x0 0xff500000 0x0 0x100000>;
		interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
		dr_mode = "host";
		maximum-speed = "high-speed";
		snps,dis_u2_susphy_quirk;
		};
		};

		ethmac: ethernet@ff3f0000 {
		compatible = "amlogic,meson-axg-dwmac",
		"snps,dwmac-3.70a",
		@@ -187,6 +227,8 @@
		"timing-adjustment";
		rx-fifo-depth = <4096>;
		tx-fifo-depth = <2048>;
		resets = <&reset RESET_ETHERNET>;
		reset-names = "stmmaceth";
		status = "disabled";
		};

		@@ -1734,6 +1776,16 @@
		clock-names = "core", "clkin0", "clkin1";
		resets = <&reset RESET_SD_EMMC_C>;
		};

		usb2_phy1: phy@9020 {
		compatible = "amlogic,meson-gxl-usb2-phy";
		#phy-cells = <0>;
		reg = <0x0 0x9020 0x0 0x20>;
		clocks = <&clkc CLKID_USB>;
		clock-names = "phy";
		resets = <&reset RESET_USB_OTG>;
		reset-names = "phy";
		};
		};

		sram: sram@fffc0000 {

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@
		};

		ethmac: ethernet@ff3f0000 {
		compatible = "amlogic,meson-axg-dwmac",
		compatible = "amlogic,meson-g12a-dwmac",
		"snps,dwmac-3.70a",
		"snps,dwmac";
		reg = <0x0 0xff3f0000 0x0 0x10000>,
		@@ -224,6 +224,8 @@
		"timing-adjustment";
		rx-fifo-depth = <4096>;
		tx-fifo-depth = <2048>;
		resets = <&reset RESET_ETHERNET>;
		reset-names = "stmmaceth";
		status = "disabled";

		mdio0: mdio {
		@@ -282,6 +284,8 @@
		hwrng: rng@218 {
		compatible = "amlogic,meson-rng";
		reg = <0x0 0x218 0x0 0x4>;
		clocks = <&clkc CLKID_RNG0>;
		clock-names = "core";
		};
		};

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		regulator-min-microvolt = <680000>;
		regulator-max-microvolt = <1040000>;

		pwms = <&pwm_AO_cd 1 1500 0>;
		pwms = <&pwm_ab 0 1500 0>;
		};

		&vddcpu_b {

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <dt-bindings/interrupt-controller/irq.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/power/meson-gxbb-power.h>
		#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
		#include <dt-bindings/thermal/thermal.h>

		/ {
		@@ -575,6 +576,8 @@
		interrupt-names = "macirq";
		rx-fifo-depth = <4096>;
		tx-fifo-depth = <2048>;
		resets = <&reset RESET_ETHERNET>;
		reset-names = "stmmaceth";
		power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
		status = "disabled";
		};

Admin message