Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7ac420 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64' of... 

Merge tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Pull "Amlogic 64-bit DT updates for v4.16" from Kevin Hilman
- meson-gx: add VPU power domain support
- odroid-c2: add HDMI and CEC nodes
- misc cleanups

* tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxm: fix q200 interrupt number
  ARM64: dts: meson-gxm: add the PHY interrupt line on Khadas VIM2
  ARM64: dts: meson: add comments with the GPIO for the PHY interrupts
  ARM64: dts: amlogic: use generic bus node names
  ARM64: dts: meson: drop "sana" clock from SAR ADC
  ARM64: dts: odroid-c2: Add HDMI and CEC Nodes
  ARM64: dts: meson-gx: grow reset controller memory zone
  ARM64: dts: meson-gx: Add HDMI_5V regulator on selected boards
  ARM64: dts: meson-gx: add VPU power domain
parents c4e8db5f 3106507e

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ 
		#size-cells = <2>;

		#size-cells = <2>;

		ranges;

		ranges;





		cbus: cbus@ffd00000 {

		cbus: bus@ffd00000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xffd00000 0x0 0x25000>;

			reg = <0x0 0xffd00000 0x0 0x25000>;

			#address-cells = <2>;

			#address-cells = <2>;
@@ -175,7 +175,7 @@ 
			};

			};

		};

		};





		aobus: aobus@ff800000 {

		aobus: bus@ff800000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xff800000 0x0 0x100000>;

			reg = <0x0 0xff800000 0x0 0x100000>;

			#address-cells = <2>;

			#address-cells = <2>;

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,18 @@ 
		reg = <0x0 0x0 0x0 0x80000000>;

		reg = <0x0 0x0 0x0 0x80000000>;

	};

	};





	hdmi_5v: regulator-hdmi-5v {

		compatible = "regulator-fixed";



		regulator-name = "HDMI_5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;



		gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		regulator-always-on;

	};



	vddio_boot: regulator-vddio_boot {

	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_BOOT";

		regulator-name = "VDDIO_BOOT";

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

+15 −4
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ 
		#size-cells = <2>;

		#size-cells = <2>;

		ranges;

		ranges;





		cbus: cbus@c1100000 {

		cbus: bus@c1100000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xc1100000 0x0 0x100000>;

			reg = <0x0 0xc1100000 0x0 0x100000>;

			#address-cells = <2>;

			#address-cells = <2>;
@@ -229,7 +229,7 @@ 




			reset: reset-controller@4404 {

			reset: reset-controller@4404 {

				compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";

				compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";

				reg = <0x0 0x04404 0x0 0x20>;

				reg = <0x0 0x04404 0x0 0x9c>;

				#reset-cells = <1>;

				#reset-cells = <1>;

			};

			};
@@ -366,7 +366,7 @@ 
			};

			};

		};

		};





		aobus: aobus@c8100000 {

		aobus: bus@c8100000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xc8100000 0x0 0x100000>;

			reg = <0x0 0xc8100000 0x0 0x100000>;

			#address-cells = <2>;

			#address-cells = <2>;
@@ -377,6 +377,12 @@ 
				compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";

				compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";

				reg =  <0x0 0x0 0x0 0x100>;

				reg =  <0x0 0x0 0x0 0x100>;





				pwrc_vpu: power-controller-vpu {

					compatible = "amlogic,meson-gx-pwrc-vpu";

					#power-domain-cells = <0>;

					amlogic,hhi-sysctrl = <&sysctrl>;

				};



				clkc_AO: clock-controller {

				clkc_AO: clock-controller {

					compatible = "amlogic,meson-gx-aoclkc";

					compatible = "amlogic,meson-gx-aoclkc";

					#clock-cells = <1>;

					#clock-cells = <1>;
@@ -447,13 +453,18 @@ 
			};

			};

		};

		};





		hiubus: hiubus@c883c000 {

		hiubus: bus@c883c000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xc883c000 0x0 0x2000>;

			reg = <0x0 0xc883c000 0x0 0x2000>;

			#address-cells = <2>;

			#address-cells = <2>;

			#size-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;

			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;





			sysctrl: system-controller@0 {

				compatible = "amlogic,meson-gx-hhi-sysctrl", "syscon", "simple-mfd";

				reg = <0 0 0 0x400>;

			};



			mailbox: mailbox@404 {

			mailbox: mailbox@404 {

				compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";

				compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";

				reg = <0 0x404 0 0x4c>;

				reg = <0 0x404 0 0x4c>;

arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -169,6 +169,7 @@ 
			/* Realtek RTL8211F (0x001cc916) */

			/* Realtek RTL8211F (0x001cc916) */

			reg = <0>;

			reg = <0>;

			interrupt-parent = <&gpio_intc>;

			interrupt-parent = <&gpio_intc>;

			/* MAC_INTR on GPIOZ_15 */

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

		};

		};

	};

	};

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+32 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,24 @@ 
		compatible = "mmc-pwrseq-emmc";

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi_tx_tmds_out>;

			};

		};

	};

};



&cec_AO {

	status = "okay";

	pinctrl-0 = <&ao_cec_pins>;

	pinctrl-names = "default";

	hdmi-phandle = <&hdmi_tx>;

};

};





&ethmac {

&ethmac {
@@ -156,8 +174,10 @@ 
		#size-cells = <0>;

		#size-cells = <0>;





		eth_phy0: ethernet-phy@0 {

		eth_phy0: ethernet-phy@0 {

			/* Realtek RTL8211F (0x001cc916) */

			reg = <0>;

			reg = <0>;

			interrupt-parent = <&gpio_intc>;

			interrupt-parent = <&gpio_intc>;

			/* MAC_INTR on GPIOZ_15 */

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

			eee-broken-1000t;

			eee-broken-1000t;

		};

		};
@@ -179,6 +199,18 @@ 
	};

	};

};

};





&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;

	pinctrl-names = "default";

};



&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};



&i2c_A {

&i2c_A {

	status = "okay";

	status = "okay";

	pinctrl-0 = <&i2c_a_pins>;

	pinctrl-0 = <&i2c_a_pins>;