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

Commit 97c41a6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "A couple of minor fixes only for now

   - fix for incorrect DMA channels on Renesas R-Car

   - Broadcom bcm2835 error handling fixes

   - Kconfig dependency fixes for bcm2835 and davinci

   - CPU idle wakeup fix for i.MX6

   - MMC regression on Tegra186

   - fix incorrect phy settings on one imx board"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: tegra: Disable CQE Support for SDMMC4 on Tegra186
  ARM: dts: nomadik: Fix polarity of SPI CS
  ARM: davinci: fix build failure with allnoconfig
  ARM: imx_v4_v5_defconfig: enable PWM driver
  ARM: imx_v6_v7_defconfig: continue compiling the pwm driver
  ARM: dts: imx6dl-yapp4: Use correct pseudo PHY address for the switch
  ARM: dts: imx6qdl: Fix typo in imx6qdl-icore-rqs.dtsi
  ARM: dts: imx6ull: Use the correct style for SPDX License Identifier
  ARM: dts: pfla02: increase phy reset duration
  ARM: imx6q: cpuidle: fix bug that CPU might not wake up at expected time
  ARM: imx51: fix a leaked reference by adding missing of_node_put
  ARM: dts: imx6dl-yapp4: Use rgmii-id phy mode on the cpu port
  arm64: bcm2835: Add missing dependency on MFD_CORE.
  ARM: dts: bcm283x: Fix hdmi hpd gpio pull
  soc: bcm: bcm2835-pm: Fix error paths of initialization.
  soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain support.
  arm64: dts: renesas: r8a774c0: Fix SCIF5 DMA channels
  arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels
parents 1a9df9e2 93958742

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ config ARCH_DAVINCI 
	select HAVE_IDE

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO

	select RESET_CONTROLLER

	select SPARSE_IRQ

	select USE_OF

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};



&pwm {

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -114,9 +114,9 @@ 
			reg = <2>;

		};



		switch@0 {

		switch@10 {

			compatible = "qca,qca8334";

			reg = <0>;

			reg = <10>;



			switch_ports: ports {

				#address-cells = <1>;
@@ -125,7 +125,7 @@ 
				ethphy0: port@0 {

					reg = <0>;

					label = "cpu";

					phy-mode = "rgmii";

					phy-mode = "rgmii-id";

					ethernet = <&fec>;



					fixed-link {

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 
	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;

	vmcc-supply = <&reg_sd3_vmmc>;

	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

	bus-witdh = <4>;

	bus-width = <4>;

	no-1-8-v;

	status = "okay";

};
@@ -275,7 +275,7 @@ 
	pinctrl-1 = <&pinctrl_usdhc4_100mhz>;

	pinctrl-2 = <&pinctrl_usdhc4_200mhz>;

	vmcc-supply = <&reg_sd4_vmmc>;

	bus-witdh = <8>;

	bus-width = <8>;

	no-1-8-v;

	non-removable;

	status = "okay";

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
	pinctrl-0 = <&pinctrl_enet>;

	phy-handle = <&ethphy>;

	phy-mode = "rgmii";

	phy-reset-duration = <10>; /* in msecs */

	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;

	phy-supply = <&vdd_eth_io_reg>;

	status = "disabled";