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

Commit 545ea16f 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 Arnd Bergmann:
 "Here is another set of bugfixes for ARM SoCs, mostly harmless:

   - a boot regression fix on ux500

   - PCIe interrupts on NXP i.MX7 and on Marvell Armada 7K/8K were wired
     up wrong, in different ways

   - Armada XP support for large memory never worked

   - the socfpga reset controller now builds on 64-bit

   - minor device tree corrections on gemini, mvebu, r-pi 3, rockchip
     and at91"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: ux500: Fix regression while init PM domains
  ARM: dts: fix PCLK name on Gemini and MOXA ART
  arm64: dts: rockchip: fix typo in iommu nodes
  arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
  ARM: dts: imx7d: Invert legacy PCI irq mapping
  bus: mbus: fix window size calculation for 4GB windows
  ARM: dts: at91: sama5d2: add ADC hw trigger edge type
  ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
  ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
  ARM: dts: bcm283x: Fix console path on RPi3
  reset: socfpga: fix for 64-bit compilation
  ARM: dts: Fix I2C repeated start issue on Armada-38x
  arm64: dts: marvell: fix interrupt-map property for Armada CP110 PCIe controller
  arm64: dts: salvator-common: add 12V regulator to backlight
  ARM: dts: sun6i: Fix endpoint IDs in second display pipeline
  arm64: allwinner: a64: pine64: Use dcdc1 regulator for mmc0
parents 1c9fec47 6bf99a6c

arch/arm/boot/dts/armada-38x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;
@@ -189,7 +189,7 @@ 
			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

arch/arm/boot/dts/at91-sama5d27_som1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
				pinctrl-0 = <&pinctrl_macb0_default>;

				phy-mode = "rmii";



				ethernet-phy@1 {

					reg = <0x1>;

				ethernet-phy@0 {

					reg = <0x0>;

					interrupt-parent = <&pioA>;

					interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;

					pinctrl-names = "default";

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+15 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ 
				vddana-supply = <&vdd_3v3_lp_reg>;

				vref-supply = <&vdd_3v3_lp_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_adc_default>;

				pinctrl-0 = <&pinctrl_adc_default &pinctrl_adtrg_default>;

				status = "okay";

			};
@@ -340,6 +340,20 @@ 
					bias-disable;

				};



				/*

				 * The ADTRG pin can work on any edge type.

				 * In here it's being pulled up, so need to

				 * connect it to ground to get an edge e.g.

				 * Trigger can be configured on falling, rise

				 * or any edge, and the pull-up can be changed

				 * to pull-down or left floating according to

				 * needs.

				 */

				pinctrl_adtrg_default: adtrg_default {

					pinmux = <PIN_PD31__ADTRG>;

					bias-pull-up;

				};



				pinctrl_charger_chglev: charger_chglev {

					pinmux = <PIN_PA12__GPIO>;

					bias-disable;

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+3 −6
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ 
	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";

	model = "Raspberry Pi Zero W";



	/* Needed by firmware to properly init UARTs */

	aliases {

		uart0 = "/soc/serial@7e201000";

		uart1 = "/soc/serial@7e215040";

		serial0 = "/soc/serial@7e201000";

		serial1 = "/soc/serial@7e215040";

	chosen {

		/* 8250 auxiliary UART instead of pl011 */

		stdout-path = "serial1:115200n8";

	};



	leds {

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";

	model = "Raspberry Pi 3 Model B";



	chosen {

		/* 8250 auxiliary UART instead of pl011 */

		stdout-path = "serial1:115200n8";

	};



	memory {

		reg = <0 0x40000000>;

	};