diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2016-10-24 14:12:55 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-11-21 15:03:53 +0100 |
| commit | b2c56b7b17b250a5a3b714fedf4c79c6bbe4b658 (patch) | |
| tree | decf1f91cdc25dc7e5fecae49f94ff722432aff4 /arch | |
| parent | 3c204d1590b9fcead7169c7f066f6918bcbde55f (diff) | |
apalis_tk1: Enable UART4
Uncomment UART4 device tree node and enable support in machfile
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-apalis-tk1.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index 3adee39e0a4e..c8bc5319999a 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -65,12 +65,12 @@ status = "okay"; }; -/* TBD: Apalis UART4 + /* Apalis UART4 */ serial@70006300 { compatible = "nvidia,tegra114-hsuart"; status = "okay"; }; -*/ + /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */ i2c@7000d000 { nvidia,bit-banging-xfer-after-shutdown; diff --git a/arch/arm/mach-tegra/board-apalis-tk1.c b/arch/arm/mach-tegra/board-apalis-tk1.c index e30723a82505..b25f24567d5f 100644 --- a/arch/arm/mach-tegra/board-apalis-tk1.c +++ b/arch/arm/mach-tegra/board-apalis-tk1.c @@ -454,6 +454,8 @@ static struct of_dev_auxdata apalis_tk1_auxdata_lookup[] __initdata = { NULL), OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006200, "serial-tegra.2", NULL), + OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006300, "serial-tegra.3", + NULL), T124_I2C_OF_DEV_AUXDATA, OF_DEV_AUXDATA("nvidia,tegra124-xhci", 0x70090000, "tegra-xhci", &xusb_pdata), |