Commit 7b76b46d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.12-arm-dt' of... 

Merge tag 'tegra-for-5.12-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.12-rc1

Fixes the pinmux configuration for the eMMC on the Ouya to fix issues
with certain bootloaders.

* tag 'tegra-for-5.12-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: ouya: Fix eMMC on specific bootloaders

Link: https://lore.kernel.org/r/20210129193254.3610492-3-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2226c894 3029a563

arch/arm/boot/dts/tegra30-ouya.dts

+2 −2
Original line number Diff line number Diff line
@@ -4352,8 +4352,8 @@ cam_mclk_pcc0 { 
		nvidia,pins = "cam_mclk_pcc0";

		nvidia,function = "vi_alt3";

		nvidia,pull = <TEGRA_PIN_PULL_NONE>;

		nvidia,tristate = <TEGRA_PIN_ENABLE>;

		nvidia,enable-input = <TEGRA_PIN_DISABLE>;

		nvidia,tristate = <TEGRA_PIN_DISABLE>;

		nvidia,enable-input = <TEGRA_PIN_ENABLE>;

	};

	pcc1 {

		nvidia,pins = "pcc1";