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

Commit e47a8b17 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.10/fixes-rc4' of... 

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

Fixes for omaps for v4.10-rc cycle. Mostly a DMA regression fix for
omap1, and then a handful of trivial fixes for boards and devices to
work:

- Fixes TI wilink bluetooth strange platform data baud rate
- Remove duplicate pinmux line for am335x-icev2
- Fix omap1 dma regression
- Fix uninitialized return value for wkup_m3_ipc_probe()
- Fix Ethernet PHY binding typo for dra72-evm
- Fix init for omap5 and dra7 sata ports
- Fix mmc card detect pin for Logic PD SOM-LV

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

:
  ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV
  ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available.
  ARM: dts: dra72-evm-revc: fix typo in ethernet-phy node
  soc: ti: wkup_m3_ipc: Fix error return code in wkup_m3_ipc_probe()
  ARM: OMAP1: DMA: Correct the number of logical channels
  ARM: dts: am335x-icev2: Remove the duplicated pinmux setting
  ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f7bcd4b6 1ea6af32

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

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
			AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */

			AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */

			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */

			AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE5) /* (C15) spi0_cs1.mmc0_sdcd */

		>;

	};

arch/arm/boot/dts/dra7.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,7 @@ 
			phy-names = "sata-phy";

			clocks = <&sata_ref_clk>;

			ti,hwmods = "sata";

			ports-implemented = <0x1>;

		};



		rtc: rtc@48838000 {

arch/arm/boot/dts/dra72-evm-revc.dts

+1 −1
Original line number Diff line number Diff line
@@ -75,6 +75,6 @@ 
		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;

		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;

		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;

		ti,min-output-imepdance;

		ti,min-output-impedance;

	};

};

arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts

+3 −8
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 
&mmc1 {

	interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins &mmc1_cd>;

	pinctrl-0 = <&mmc1_pins>;

	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;		/* gpio_126 */

	cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>;		/* gpio_110 */

	vmmc-supply = <&vmmc1>;
@@ -193,7 +193,8 @@ 
			OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat1.sdmmc1_dat1 */

			OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat2.sdmmc1_dat2 */

			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat3.sdmmc1_dat3 */

			OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_strobe.gpio_126 sdmmc1_wp*/

			OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_strobe.gpio_126 */

			OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_d11.gpio_110 */

		>;

	};
@@ -242,12 +243,6 @@ 
			OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4)       /* sys_boot6.gpio_8 */

		>;

	};



	mmc1_cd: pinmux_mmc1_cd {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_d11.gpio_110 */

		>;

	};

};

arch/arm/boot/dts/omap5.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -988,6 +988,7 @@ 
			phy-names = "sata-phy";

			clocks = <&sata_ref_clk>;

			ti,hwmods = "sata";

			ports-implemented = <0x1>;

		};



		dss: dss@58000000 {