diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 14:19:34 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 14:19:34 +0300 |
| commit | b2fc2640e875ca9a45bfd176689a4f632cade2a9 (patch) | |
| tree | 61d44bfea14b4beb7c4483ae03e8fa25770fd3ef /arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | |
| parent | 2d78b1dafc0b23fd04f27c6932b67f063ca0858d (diff) | |
| parent | 4957a2f1f2205214b2ca325872a7508fa91e1096 (diff) | |
| download | linux-b2fc2640e875ca9a45bfd176689a4f632cade2a9.tar.xz | |
Merge tag 'tegra-for-4.17-arm-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Pull "ARM: tegra: Device tree changes for v4.17-rc1" from Thierry Reding:
Support for the VDE is added on Tegra30 along with some general cleanup
and some improvements to the various Toradex boards.
* tag 'tegra-for-4.17-arm-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: apalis-tk1: Support v1.2 hardware revision
ARM: tegra: apalis-tk1: Copyright period, spurious newlines
ARM: tegra: apalis-tk1: Hog group for ethernet, PCIe, reset GPIOs
ARM: tegra: apalis-tk1: Add missing as3722 gpio0 configuration
ARM: tegra: apalis-tk1: Activate PWM pin muxing for pwm3
ARM: tegra: apalis-tk1: Set critical trips
ARM: tegra: apalis/colibri: Remove unneeded reg property
ARM: tegra: apalis/colibri: Use correct compatible for RTC
ARM: tegra: Fix I2C bus frequencies on Apalis/Colibri
ARM: tegra: venice2: Remove duplicate pcie-1 node
ARM: tegra: beaver: Remove invalid uses of rsvd1
ARM: tegra: Use proper IRQ type definitions
ARM: tegra: Fix ULPI regression on Tegra20
ARM: tegra: Add unit address to VDE IRAM area
ARM: tegra: Add video decoder node on Tegra30
ARM: tegra: Add IRAM node on Tegra30
Diffstat (limited to 'arch/arm/boot/dts/tegra30-colibri-eval-v3.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts index 3c5fb2430212..16e1f387aa6d 100644 --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts @@ -56,11 +56,11 @@ */ i2c@7000c000 { status = "okay"; - clock-frequency = <100000>; + clock-frequency = <400000>; /* M41T0M6 real time clock on carrier board */ rtc@68 { - compatible = "st,m41t00"; + compatible = "st,m41t0"; reg = <0x68>; }; }; @@ -79,7 +79,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; spidev0: spi@1 { |