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

Commit d2d369a9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Amlogic fixes for v4.18-rc
- minor 64-bit DT fixes

* tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: dts: meson-gxl: fix Mali GPU compatible string
  ARM64: dts: meson-axg: fix ethernet stability issue
  ARM64: dts: meson-gx: fix ATF reserved memory region
  ARM64: dts: meson-gxl-s905x-p212: Add phy-supply for usb0
  ARM64: dts: meson: fix register ranges for SD/eMMC
  ARM64: dts: meson: disable sd-uhs modes on the libretech-cc

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 86676c46 1c38f4af

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

+14 −1
Original line number Diff line number Diff line
@@ -66,9 +66,22 @@ 


&ethmac {

	status = "okay";

	phy-mode = "rgmii";

	pinctrl-0 = <&eth_rgmii_y_pins>;

	pinctrl-names = "default";

	phy-handle = <&eth_phy0>;

	phy-mode = "rgmii";



	mdio {

		compatible = "snps,dwmac-mdio";

		#address-cells = <1>;

		#size-cells = <0>;



		eth_phy0: ethernet-phy@0 {

			/* Realtek RTL8211F (0x001cc916) */

			reg = <0>;

			eee-broken-1000t;

		};

	};

};



&uart_A {

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

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 


			sd_emmc_b: sd@5000 {

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

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

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

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_B>,
@@ -144,7 +144,7 @@ 


			sd_emmc_c: mmc@7000 {

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

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

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

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_C>,

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

+9 −3
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ 
			no-map;

		};



		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */

		secmon_reserved_alt: secmon@5000000 {

			reg = <0x0 0x05000000 0x0 0x300000>;

			no-map;

		};



		linux,cma {

			compatible = "shared-dma-pool";

			reusable;
@@ -457,21 +463,21 @@ 


			sd_emmc_a: mmc@70000 {

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

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

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

				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			sd_emmc_b: mmc@72000 {

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

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

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

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			sd_emmc_c: mmc@74000 {

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

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

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

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};

arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


&apb {

	mali: gpu@c0000 {

		compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";

		compatible = "amlogic,meson-gxl-mali", "arm,mali-450";

		reg = <0x0 0xc0000 0x0 0x40000>;

		interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

+0 −3
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ 


	bus-width = <4>;

	cap-sd-highspeed;

	sd-uhs-sdr12;

	sd-uhs-sdr25;

	sd-uhs-sdr50;

	max-frequency = <100000000>;

	disable-wp;