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

Commit 54c3cf65 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v4.3/fixes-rc1' of... 

Merge tag 'omap-for-v4.3/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v4.3-rc1" from Tony Lindgren:

Fixes for omaps against v4.3-rc1:

- Fix long time regression on beagle for tfp410 pin muxing

- Fix dm814x control base address typo and related Ethernet
  phy configuration

- Fix igepv2 Ethernet pinmuxing as only some boards have it

- Fix pbias regulator compatible values as a pending regulator
  fix needs those for MMC1 to work properly

- Fix beagle-x15 MMC1 regulator and make pcf857x built-in

- Fix omap5 and dra7 Kconfig options when built as the only
  SoCs selected

- Fix PM errata for omap5 and dra7 as they too need it

- Fix phycore mpu voltage

Also included are a few cosmetic fixes:

- Remove unused of_irq macros

- Fix dra7 ethernet name

* tag 'omap-for-v4.3/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  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
  ARM: dts: am57xx-beagle-x15: Fix regulator populated in MMC1 dt node
  ARM: dts: Fix dm814x control base to properly initialize Ethernet PHY
  ARM: dts: omap3-beagle: make i2c3, ddc and tfp410 gpio work again
parents 6ff33f39 60fdcb88

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

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

		};





		vdd1_reg: regulator@2 {

		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-name = "vdd_mpu";

			regulator-min-microvolt = <912500>;

			regulator-min-microvolt = <912500>;

			regulator-max-microvolt = <1312500>;

			regulator-max-microvolt = <1378000>;

			regulator-boot-on;

			regulator-boot-on;

			regulator-always-on;

			regulator-always-on;

		};

		};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -517,7 +517,8 @@ 
	mcp_rtc: rtc@6f {

	mcp_rtc: rtc@6f {

		compatible = "microchip,mcp7941x";

		compatible = "microchip,mcp7941x";

		reg = <0x6f>;

		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-names = "default";

		pinctrl-0 = <&mcp79410_pins_default>;

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

	pinctrl-0 = <&mmc1_pins_default>;





	vmmc-supply = <&ldo1_reg>;

	vmmc-supply = <&ldo1_reg>;

	vmmc_aux-supply = <&vdd_3v3>;

	bus-width = <4>;

	bus-width = <4>;

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

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

};

};

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

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




&cpsw_emac0 {

&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};

};





&cpsw_emac1 {

&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};
 
};

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

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

#include "dm814x.dtsi"





/ {

/ {

	model = "DM8148 EVM";

	model = "HP t410 Smart Zero Client";

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

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





	memory {

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




&cpsw_emac0 {

&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};

};





&cpsw_emac1 {

&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

	phy-mode = "rgmii";

};
 
};

arch/arm/boot/dts/dm814x.dtsi

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

				ti,hwmods = "timer3";

			};

			};





			control: control@160000 {

			control: control@140000 {

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

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

				reg = <0x160000 0x16d000>;

				reg = <0x140000 0x16d000>;

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x160000 0x16d000>;

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

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

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

				reg= <0x48160650 0x4>;

				reg= <0x48140650 0x4>;

				reg-names = "gmii-sel";

				reg-names = "gmii-sel";

			};

			};

		};

		};