diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 17:12:31 +0200 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 17:12:31 +0200 |
| commit | de4fb176622d54a82ea3ceb7362392aaf5ff0b5a (patch) | |
| tree | 8b510763d14d89b97cd719e79834c84e095932d7 /arch/arm/boot/dts/tegra20-colibri-iris.dts | |
| parent | ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame() (diff) | |
| parent | ARM: 9189/1: decompressor: fix unneeded rebuilds of library objects (diff) | |
| download | linux-de4fb176622d54a82ea3ceb7362392aaf5ff0b5a.tar.xz linux-de4fb176622d54a82ea3ceb7362392aaf5ff0b5a.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/boot/dts/tegra20-colibri-iris.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-iris.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts index 425494b9ed54..00ecbbd5e9e1 100644 --- a/arch/arm/boot/dts/tegra20-colibri-iris.dts +++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts @@ -70,11 +70,11 @@ nvidia,tristate = <TEGRA_PIN_DISABLE>; }; - pwm-a-b { + sdc { nvidia,tristate = <TEGRA_PIN_DISABLE>; }; - pwm-c-d { + sdb_sdd { nvidia,tristate = <TEGRA_PIN_DISABLE>; }; |