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

Commit 685b5f1d 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:
 "Our first real batch of fixes this release cycle.  Nothing really
  concerning, and diffstat is a bit inflated due to some DT contents
  moving around on STi platforms.

  There's a collection of them here:

   - A fixup for a build breakage that hits on arm64 allmodconfig in
     QCOM SCM firmware drivers
   - MMC fixes for OMAP that had quite a bit of breakage this merge
     window.
   - Misc build/warning fixes on PXA and OMAP
   - A couple of minor fixes for Beagleboard X15 which is now starting
     to see a few more users in the wild"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  ARM: sti: dt: adapt DT to fix probe/bind issues in DRM driver
  ARM: dts: fix omap2+ address translation for pbias
  firmware: qcom: scm: Add function stubs for ARM64
  ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
  ARM: omap2plus_defconfig: enable GPIO_PCA953X
  ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets
  ARM: OMAP2+: AM43XX: Enable autoidle for clks in am43xx_init_late
  ARM: dts: am57xx-beagle-x15: Update Phy supplies
  ARM: pxa: balloon3: Fix build error
  ARM: dts: Fixup model name for HP t410 dts
  ARM: dts: DRA7: fix a typo in ethernet
  ARM: omap2plus_defconfig: make PCF857x built-in
  ARM: dts: Use ti,pbias compatible string for pbias
  ARM: OMAP5: Cleanup options for SoC only build
  ARM: DRA7: Select missing options for SoC only build
  ARM: OMAP2+: board-generic: Remove stale of_irq macros
  ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
  ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
  ARM: dts: am57xx-beagle-x15: Add wakeup irq for mcp79410
  ARM: dts: am335x-phycore-som: Fix mpu voltage
  ...
parents 69ea8b85 e46fc90e

arch/arm/boot/dts/am335x-phycore-som.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -252,10 +252,10 @@ 
		};



		vdd1_reg: regulator@2 {

			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */

			/* VDD_MPU voltage limits 0.95V - 1.325V with +/-4% tolerance */

			regulator-name = "vdd_mpu";

			regulator-min-microvolt = <912500>;

			regulator-max-microvolt = <1312500>;

			regulator-max-microvolt = <1378000>;

			regulator-boot-on;

			regulator-always-on;

		};

arch/arm/boot/dts/am57xx-beagle-x15.dts

+29 −17
Original line number Diff line number Diff line
@@ -98,13 +98,6 @@ 
		pinctrl-0 = <&extcon_usb1_pins>;

	};



	extcon_usb2: extcon_usb2 {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&extcon_usb2_pins>;

	};



	hdmi0: connector {

		compatible = "hdmi-connector";

		label = "hdmi";
@@ -326,12 +319,6 @@ 
		>;

	};



	extcon_usb2_pins: extcon_usb2_pins {

		pinctrl-single,pins = <

			0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */

		>;

	};



	tpd12s015_pins: pinmux_tpd12s015_pins {

		pinctrl-single,pins = <

			0x3b0 (PIN_OUTPUT | MUX_MODE14)		/* gpio7_10 CT_CP_HPD */
@@ -432,7 +419,7 @@ 
				};



				ldo3_reg: ldo3 {

					/* VDDA_1V8_PHY */

					/* VDDA_1V8_PHYA */

					regulator-name = "ldo3";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -440,6 +427,15 @@ 
					regulator-boot-on;

				};



				ldo4_reg: ldo4 {

					/* VDDA_1V8_PHYB */

					regulator-name = "ldo4";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo9_reg: ldo9 {

					/* VDD_RTC */

					regulator-name = "ldo9";
@@ -495,6 +491,14 @@ 
			gpio-controller;

			#gpio-cells = <2>;

		};



		extcon_usb2: tps659038_usb {

			compatible = "ti,palmas-usb-vid";

			ti,enable-vbus-detection;

			ti,enable-id-detection;

			id-gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;

		};



	};



	tmp102: tmp102@48 {
@@ -517,7 +521,8 @@ 
	mcp_rtc: rtc@6f {

		compatible = "microchip,mcp7941x";

		reg = <0x6f>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>;  /* IRQ_SYS_1N */

		interrupts-extended = <&crossbar_mpu GIC_SPI 2 IRQ_TYPE_EDGE_RISING>,

				      <&dra7_pmx_core 0x424>;



		pinctrl-names = "default";

		pinctrl-0 = <&mcp79410_pins_default>;
@@ -579,7 +584,6 @@ 
	pinctrl-0 = <&mmc1_pins_default>;



	vmmc-supply = <&ldo1_reg>;

	vmmc_aux-supply = <&vdd_3v3>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 0>; /* gpio 219 */

};
@@ -623,6 +627,14 @@ 
};



&usb2 {

	/*

	 * Stand alone usage is peripheral only.

	 * However, with some resistor modifications

	 * this port can be used via expansion connectors

	 * as "host" or "dual-role". If so, provide

	 * the necessary dr_mode override in the expansion

	 * board's DT.

	 */

	dr_mode = "peripheral";

};
@@ -681,7 +693,7 @@ 


&hdmi {

	status = "ok";

	vdda-supply = <&ldo3_reg>;

	vdda-supply = <&ldo4_reg>;



	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_pins>;

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

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 


&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};

arch/arm/boot/dts/dm8148-t410.dts

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "dm814x.dtsi"



/ {

	model = "DM8148 EVM";

	model = "HP t410 Smart Zero Client";

	compatible = "hp,t410", "ti,dm8148";



	memory {
@@ -19,10 +19,10 @@ 


&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};

arch/arm/boot/dts/dm814x.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -181,9 +181,9 @@ 
				ti,hwmods = "timer3";

			};



			control: control@160000 {

			control: control@140000 {

				compatible = "ti,dm814-scm", "simple-bus";

				reg = <0x160000 0x16d000>;

				reg = <0x140000 0x16d000>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x160000 0x16d000>;
@@ -321,9 +321,9 @@ 
				mac-address = [ 00 00 00 00 00 00 ];

			};



			phy_sel: cpsw-phy-sel@0x48160650 {

			phy_sel: cpsw-phy-sel@48140650 {

				compatible = "ti,am3352-cpsw-phy-sel";

				reg= <0x48160650 0x4>;

				reg= <0x48140650 0x4>;

				reg-names = "gmii-sel";

			};

		};