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

Commit 83d36515 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes-2.1' of... 

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

Amlogic fixes for v5.0-rc, round 2
- several fixups for the GPIO cd-inverted change
- IRQ trigger fixes for MAC IRQ

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

:
  arm64: dts: meson: Fix mmc cd-gpios polarity
  ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low
  ARM: dts: meson8b: ec100: mark the SD card detection GPIO active-low
  ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO active-low
  arm: dts: meson: Fix IRQ trigger type for macirq

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 46edb8d1 f29200c8

arch/arm/boot/dts/meson.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ 
			compatible = "amlogic,meson6-dwmac", "snps,dwmac";

			reg = <0xc9410000 0x10000

			       0xc1108108 0x4>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			status = "disabled";

		};

arch/arm/boot/dts/meson8b-ec100.dts

+1 −2
Original line number Diff line number Diff line
@@ -205,8 +205,7 @@ 
		cap-sd-highspeed;

		disable-wp;



		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

		cd-inverted;

		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



		vmmc-supply = <&vcc_3v3>;

	};

arch/arm/boot/dts/meson8b-odroidc1.dts

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

		eth_phy: ethernet-phy@0 {

			reg = <0>;

			eee-broken-1000t;

			interrupt-parent = <&gpio_intc>;

			/* GPIOH_3 */

			interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
@@ -273,8 +272,7 @@ 
		cap-sd-highspeed;

		disable-wp;



		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

		cd-inverted;

		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



		vmmc-supply = <&tflash_vdd>;

		vqmmc-supply = <&tf_io>;

arch/arm/boot/dts/meson8m2-mxiii-plus.dts

+1 −2
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ 
		cap-sd-highspeed;

		disable-wp;



		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

		cd-inverted;

		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



		vmmc-supply = <&vcc_3v3>;

	};

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

+1 −2
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ 
	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;