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

Commit 18ea0db3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-2' of... 

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

Pull "Amlogic 64-bit DT updates for v4.15, round 2" from Kevin Hilman:
- add support for new GPIO IRQ driver

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gx: add external PHY interrupt on some platforms
  ARM64: dts: meson-gx: add gpio interrupt controller
  ARM64: meson: enable MESON_IRQ_GPIO in Kconfig
  ARM64: dts: meson-gxbb-odroidc2: fix usb1 power supply
parents e45cba78 b94d22d9

arch/arm64/Kconfig.platforms

+1 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,7 @@ config ARCH_MESON 
	select PINCTRL_MESON

	select PINCTRL_MESON

	select COMMON_CLK_AMLOGIC

	select COMMON_CLK_AMLOGIC

	select COMMON_CLK_GXBB

	select COMMON_CLK_GXBB

	select MESON_IRQ_GPIO

	help

	help

	  This enables support for the Amlogic S905 SoCs.

	  This enables support for the Amlogic S905 SoCs.

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -218,6 +218,15 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

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

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





			gpio_intc: interrupt-controller@9880 {

				compatible = "amlogic,meson-gpio-intc";

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

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

				status = "disabled";

			};



			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 0x20>;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,8 @@ 
		eth_phy0: ethernet-phy@0 {

		eth_phy0: ethernet-phy@0 {

			/* Realtek RTL8211F (0x001cc916) */

			/* Realtek RTL8211F (0x001cc916) */

			reg = <0>;

			reg = <0>;

			interrupt-parent = <&gpio_intc>;

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

		};

		};

	};

	};

};

};

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -157,6 +157,8 @@ 




		eth_phy0: ethernet-phy@0 {

		eth_phy0: ethernet-phy@0 {

			reg = <0>;

			reg = <0>;

			interrupt-parent = <&gpio_intc>;

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

			eee-broken-1000t;

			eee-broken-1000t;

		};

		};

	};

	};
@@ -301,6 +303,7 @@ 




&usb1_phy {

&usb1_phy {

	status = "okay";

	status = "okay";

	phy-supply = <&usb_otg_pwr>;

};

};





&usb0 {

&usb0 {

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,8 @@ 
		eth_phy0: ethernet-phy@3 {

		eth_phy0: ethernet-phy@3 {

			/* Micrel KSZ9031 (0x00221620) */

			/* Micrel KSZ9031 (0x00221620) */

			reg = <3>;

			reg = <3>;

			interrupt-parent = <&gpio_intc>;

			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

		};

		};

	};

	};

};

};