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

Commit 08af78d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A smaller batch for the end of the week (let's see if I can keep the
  weekly cadence going for once).

  All medium-grade fixes here, nothing worrisome:

   - Fixes for some fairly old bugs around SD card write-protect
     detection and GPIO interrupt assignments on Davinci.

   - Wifi module suspend fix for Hikey.

   - Minor DT tweaks to fix inaccuracies for Amlogic platforms, one
     of which solves booting with third-party u-boot"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: dts: hikey960: Define wl1837 power capabilities
  arm64: dts: hikey: Define wl1835 power capabilities
  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
  ARM: dts: da850: Fix interrups property for gpio
  ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD
parents 22d3e0c3 4ca2f0b9

arch/arm/boot/dts/da850.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -549,11 +549,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			reg = <0x226000 0x1000>;

			interrupts = <42 IRQ_TYPE_EDGE_BOTH

				43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH

				45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH

				47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH

				49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;

			interrupts = <42 43 44 45 46 47 48 49 50>;

			ti,ngpio = <144>;

			ti,davinci-gpio-unbanked = <0>;

			status = "disabled";

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = { 
		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_HIGH),

	},

};

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";

			};