diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:40:38 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:40:38 -0500 |
| commit | 0dcd627896fb87b2e78a1ed78e469591208cffcd (patch) | |
| tree | e7cf361144599ac2e80c00268466e4308edf652b /arch/arm/boot | |
| parent | 72053353583230952c4b187e110e9da00dfc3afb (diff) | |
| parent | 0783a9bf4a5207e9d57b8c110022957f8dc88e2a (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
ARM: tegra: paz00: fix wrong SD1 power gpio
i2c: tegra: Add devexit_p() for remove
ARM: tegra: dma: fix buildbreak for !CONFIG_TEGRA_SYSTEM_DMA
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 1a1d7023b69b..825d2957da0b 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts | |||
| @@ -46,11 +46,11 @@ | |||
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | serial@70006200 { | 48 | serial@70006200 { |
| 49 | status = "disable"; | 49 | clock-frequency = <216000000>; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | serial@70006300 { | 52 | serial@70006300 { |
| 53 | clock-frequency = <216000000>; | 53 | status = "disable"; |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | serial@70006400 { | 56 | serial@70006400 { |
| @@ -60,7 +60,7 @@ | |||
| 60 | sdhci@c8000000 { | 60 | sdhci@c8000000 { |
| 61 | cd-gpios = <&gpio 173 0>; /* gpio PV5 */ | 61 | cd-gpios = <&gpio 173 0>; /* gpio PV5 */ |
| 62 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 62 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
| 63 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ | 63 | power-gpios = <&gpio 169 0>; /* gpio PV1 */ |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | sdhci@c8000200 { | 66 | sdhci@c8000200 { |