Merge tag 'amlogic-dt-2' of... (31c5d501) · Commits · 戴 / test

arch/arm/boot/dts/meson.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,15 @@
		#size-cells = <0>;
		status = "disabled";
		};

		rtc: rtc@740 {
		compatible = "amlogic,meson6-rtc";
		reg = <0x740 0x14>;
		interrupts = <GIC_SPI 72 IRQ_TYPE_EDGE_RISING>;
		#address-cells = <1>;
		#size-cells = <1>;
		status = "disabled";
		};
		};

		usb0: usb@c9040000 {

+5 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,11 @@
		compatible = "amlogic,meson8-pwm", "amlogic,meson8b-pwm";
		};

		&rtc {
		compatible = "amlogic,meson8-rtc";
		resets = <&reset RESET_RTC>;
		};

		&saradc {
		compatible = "amlogic,meson8-saradc", "amlogic,meson-saradc";
		clocks = <&clkc CLKID_XTAL>,

+14 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,14 @@
		};
		};

		rtc32k_xtal: rtc32k-xtal-clk {
		/* X2 in the schematics */
		compatible = "fixed-clock";
		clock-frequency = <32768>;
		clock-output-names = "RTC32K";
		#clock-cells = <0>;
		};

		usb_vbus: regulator-usb-vbus {
		/*
		* Silergy SY6288CCAC-GP 2A Power Distribution Switch.
		@@ -347,6 +355,12 @@
		clock-names = "clkin0";
		};

		&rtc {
		status = "okay";
		clocks = <&rtc32k_xtal>;
		vdd-supply = <&vcc_rtc>;
		};

		/* exposed through the pin headers labeled "URDUG1" on the top of the PCB */
		&uart_AO {
		status = "okay";

+14 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,14 @@
		io-channels = <&saradc 8>;
		};

		rtc32k_xtal: rtc32k-xtal-clk {
		/* X3 in the schematics */
		compatible = "fixed-clock";
		clock-frequency = <32768>;
		clock-output-names = "RTC32K";
		#clock-cells = <0>;
		};

		vcc_1v8: regulator-vcc-1v8 {
		/*
		* RICHTEK RT9179 configured for a fixed output voltage of
		@@ -345,6 +353,12 @@
		clock-names = "clkin0";
		};

		&rtc {
		/* needs to be enabled manually when a battery is connected */
		clocks = <&rtc32k_xtal>;
		vdd-supply = <&vdd_rtc>;
		};

		&uart_AO {
		status = "okay";
		pinctrl-0 = <&uart_ao_a_pins>;

+5 −0

Original line number	Diff line number	Diff line
		@@ -510,6 +510,11 @@
		compatible = "amlogic,meson8b-pwm";
		};

		&rtc {
		compatible = "amlogic,meson8b-rtc";
		resets = <&reset RESET_RTC>;
		};

		&saradc {
		compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";
		clocks = <&clkc CLKID_XTAL>,