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

Commit 6abb0576 authored Apr 09, 2013 by Arnd Bergmann

Merge tag 'tegra-for-3.10-fixes' of...

Merge tag 'tegra-for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes-non-critical

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: minor fixes

This branch contains a variety of small build and run-time fixes that
weren't important enough for 3.9.

* Enable CPU errata WARs in secondary reset handler as a preparation
  for multi-platform support, and a related fix.
* Don't touch DBLGAR in reset/resume handlers, so enable the code to
  run on A15 cores.
* Minor build fixes.
* A fix to the Tegra clock driver.
* Some error-handling fixes.

This branch is based on the previous fixes-for-mmc pull request.

* tag 'tegra-for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: powergate: Don't error out if new state == old state
  ARM: tegra: Export tegra_powergate_sequence_power_up()
  memory: tegra30: Fix build error w/o PM
  ARM: tegra: fix ignored return value of regulator_enable
  ARM: tegra: fix the logical detection of power on sequence of warm boot CPUs
  ARM: tegra: Fix unchecked return value
  ARM: tegra: don't unlock MMIO access to DBGLAR
  clk: tegra: No 7.1 super clk dividers on Tegra20
  ARM: tegra: remove save/restore of CPU diag register
  ARM: tegra: add CPU errata WARs to Tegra reset handler
  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 8bd2bcf3 eebd1fda

arch/arm/boot/dts/tegra20-colibri-512.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@
		};

		sdhci@c8000600 {
		cd-gpios = <&gpio 23 0>; /* gpio PC7 */
		cd-gpios = <&gpio 23 1>; /* gpio PC7 */
		};

		sound {

arch/arm/boot/dts/tegra20-harmony.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -437,7 +437,7 @@

		sdhci@c8000200 {
		status = "okay";
		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
		power-gpios = <&gpio 155 0>; /* gpio PT3 */
		bus-width = <4>;
		@@ -445,7 +445,7 @@

		sdhci@c8000600 {
		status = "okay";
		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
		cd-gpios = <&gpio 58 1>; /* gpio PH2 */
		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
		power-gpios = <&gpio 70 0>; /* gpio PI6 */
		bus-width = <8>;

arch/arm/boot/dts/tegra20-paz00.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@

		sdhci@c8000000 {
		status = "okay";
		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
		cd-gpios = <&gpio 173 1>; /* gpio PV5 */
		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
		power-gpios = <&gpio 169 0>; /* gpio PV1 */
		bus-width = <4>;

arch/arm/boot/dts/tegra20-seaboard.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@

		sdhci@c8000400 {
		status = "okay";
		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
		power-gpios = <&gpio 70 0>; /* gpio PI6 */
		bus-width = <4>;

arch/arm/boot/dts/tegra20-tamonten.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@
		};

		sdhci@c8000600 {
		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
		cd-gpios = <&gpio 58 1>; /* gpio PH2 */
		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
		bus-width = <4>;
		status = "okay";