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

Commit d8491223 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 Olof Johansson:
 "A collection of fixes from the last few weeks. Most of them are
  smaller tweaks and fixes to DT and hardware descriptions for boards.
  Some of the more significant ones are:

   - eMMC and RGMII stability tweaks for rk3288

   - DDC fixes for Rock PI 4

   - Audio fixes for two TI am335x eval boards

   - D_CAN clock fix for am335x

   - Compilation fixes for clang

   - !HOTPLUG_CPU compilation fix for one of the new platforms this
     release (milbeaut)

   - A revert of a gpio fix for nomadik that instead was fixed in the
     gpio subsystem

   - Whitespace fix for the DT JSON schema (no tabs allowed)"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
  ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU
  ARM: iop: don't use using 64-bit DMA masks
  ARM: orion: don't use using 64-bit DMA masks
  Revert "ARM: dts: nomadik: Fix polarity of SPI CS"
  dt-bindings: cpu: Fix JSON schema
  arm/mach-at91/pm : fix possible object reference leak
  ARM: dts: at91: Fix typo in ISC_D0 on PC9
  ARM: dts: Fix dcan clkctrl clock for am3
  reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
  dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
  ARM: dts: rockchip: Fix gpu opp node names for rk3288
  ARM: dts: am335x-evmsk: Correct the regulators for the audio codec
  ARM: dts: am335x-evm: Correct the regulators for the audio codec
  ARM: OMAP2+: add missing of_node_put after of_device_is_available
  ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation
  arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's
  arm64: dts: rockchip: fix rk3328 sdmmc0 write errors
  arm64: dts: rockchip: fix rk3328 rgmii high tx error rate
  ...
parents 429fba10 9a8f3203

arch/arm/boot/dts/am335x-evm.dts

+22 −4
Original line number Diff line number Diff line
@@ -57,6 +57,24 @@ 
		enable-active-high;

	};



	/* TPS79501 */

	v1_8d_reg: fixedregulator-v1_8d {

		compatible = "regulator-fixed";

		regulator-name = "v1_8d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	/* TPS79501 */

	v3_3d_reg: fixedregulator-v3_3d {

		compatible = "regulator-fixed";

		regulator-name = "v3_3d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	matrix_keypad: matrix_keypad0 {

		compatible = "gpio-matrix-keypad";

		debounce-delay-ms = <5>;
@@ -499,10 +517,10 @@ 
		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

		AVDD-supply = <&v3_3d_reg>;

		IOVDD-supply = <&v3_3d_reg>;

		DRVDD-supply = <&v3_3d_reg>;

		DVDD-supply = <&v1_8d_reg>;

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+22 −4
Original line number Diff line number Diff line
@@ -73,6 +73,24 @@ 
		enable-active-high;

	};



	/* TPS79518 */

	v1_8d_reg: fixedregulator-v1_8d {

		compatible = "regulator-fixed";

		regulator-name = "v1_8d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	/* TPS78633 */

	v3_3d_reg: fixedregulator-v3_3d {

		compatible = "regulator-fixed";

		regulator-name = "v3_3d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;
@@ -501,10 +519,10 @@ 
		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

		AVDD-supply = <&v3_3d_reg>;

		IOVDD-supply = <&v3_3d_reg>;

		DRVDD-supply = <&v3_3d_reg>;

		DVDD-supply = <&v1_8d_reg>;

	};

};

arch/arm/boot/dts/am33xx-l4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ 
			reg = <0xcc000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -1785,7 +1785,7 @@ 
			reg = <0xd0000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

arch/arm/boot/dts/rk3288-tinker.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ 
			};



			vccio_sd: LDO_REG5 {

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_sd";
@@ -430,7 +431,7 @@ 
	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	broken-cd;

	disable-wp;			/* wp not hooked up */

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

arch/arm/boot/dts/rk3288-veyron.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


	gpio_keys: gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key_l>;