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

Commit 7ea696af authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.14/fixes-rc3' of... 

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

Fixes for omaps for v4.14-rc cycle

Few minor fixes for omaps, mostly just boot time warning fixes:

- Drop undocumented camera binding that got merged during the merge window by
  accident as I applied before Sakari's comments

- Fix soft reset warning for dra7 kexec boot for gpio1 as the optional clocks
  need to be enabled for reset

- Fix dra7 kexec boot clock rate for McASP as the rate is no longer the default
  rate after kexec

- Fix omap3 pandora MMC warning during boot

- Add am33xx SPI alias like we have on other SoCs

- Remove node for non-existing CPSW EMAC Ethernet on am43xx-epos-evm

* tag 'omap-for-v4.14/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: am43xx-epos-evm: Remove extra CPSW EMAC entry
  ARM: dts: am33xx: Add spi alias to match SOC schematics
  ARM: OMAP2+: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both
  ARM: dts: dra7: Set a default parent to mcasp3_ahclkx_mux
  ARM: OMAP2+: dra7xx: Set OPT_CLKS_IN_RESET flag for gpio1
  ARM: dts: nokia n900: drop unneeded/undocumented parts of the dts

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 081069ef 4afa616c

arch/arm/boot/dts/am33xx.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
		phy1 = &usb1_phy;

		ethernet0 = &cpsw_emac0;

		ethernet1 = &cpsw_emac1;

		spi0 = &spi0;

		spi1 = &spi1;

	};



	cpus {

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −5
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ 
	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

	slaves = <1>;

};



&davinci_mdio {
@@ -402,11 +403,6 @@ 
	phy-mode = "rmii";

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "rmii";

};



&phy_sel {

	rmii-clock-ext;

};

arch/arm/boot/dts/dra7xx-clocks.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -1817,6 +1817,8 @@ 
		clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;

		ti,bit-shift = <24>;

		reg = <0x1868>;

		assigned-clocks = <&mcasp3_ahclkx_mux>;

		assigned-clock-parents = <&abe_24m_fclk>;

	};



	mcasp3_aux_gfclk_mux: mcasp3_aux_gfclk_mux@1868 {

arch/arm/boot/dts/omap3-n900.dts

+0 −11
Original line number Diff line number Diff line
@@ -144,15 +144,6 @@ 
		io-channel-names = "temp", "bsi", "vbat";

	};



	rear_camera: camera@0 {

		compatible = "linux,camera";



		module {

			model = "TCM8341MD";

			sensor = <&cam1>;

		};

	};



	pwm9: dmtimer-pwm {

		compatible = "ti,omap-dmtimer-pwm";

		#pwm-cells = <3>;
@@ -189,10 +180,8 @@ 
				clock-lanes = <1>;

				data-lanes = <0>;

				lane-polarity = <0 0>;

				clock-inv = <0>;

				/* Select strobe = <1> for back camera, <0> for front camera */

				strobe = <1>;

				crc = <0>;

			};

		};

	};

arch/arm/mach-omap2/hsmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c) 
	struct platform_device *pdev;

	int res;



	if (omap_hsmmc_done != 1)

	if (omap_hsmmc_done)

		return;



	omap_hsmmc_done++;

	omap_hsmmc_done = 1;



	for (; c->mmc; c++) {

		pdev = c->pdev;