diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2016-12-01 14:18:47 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-06-30 18:24:32 +0200 |
| commit | d52931aac9516724d3067516ca1c4ef762f0daea (patch) | |
| tree | 35f53a8e91616b8184c95b2ae6899a8c17186315 /arch/arm | |
| parent | e5ea4ac452f04e3d534567928b39afef7d11b94c (diff) | |
apalis-tk1-k20: can and spi improvements
This patch includes CAN driver and improvements in SPI communications
for Apalis TK1 k20 based MFD.
Requires firmware version 0.9.
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-eval.dts | 17 | ||||
| -rw-r--r-- | arch/arm/configs/apalis-tk1_defconfig | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index 9e32f873f949..a3f3f019a059 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -134,28 +134,33 @@ /* SPI2: MCU SPI */ spi@7000d600 { status = "okay"; - spi-max-frequency = <25000000>; + spi-max-frequency = <6000000>; k20mcu: apalis-tk1-k20@1 { compatible = "toradex,apalis-tk1-k20"; reg = <1>; - spi-max-frequency = <10000000>; + spi-max-frequency = <6000000>; interrupt-parent =<&gpio>; interrupts = <TEGRA_GPIO(K, 2) IRQ_TYPE_EDGE_FALLING>; rst-gpio = <&gpio TEGRA_GPIO(BB, 6) GPIO_ACTIVE_HIGH>; /* GPIO based CS used to enter K20 EzPort mode */ ezport-cs-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; - /* SPI CS under GPIO controll due to K20 quirks */ - spi-cs-gpio = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_HIGH>; /* extra INT lines between K20 and TK1 */ int2-gpio = <&gpio TEGRA_GPIO(J, 2) GPIO_ACTIVE_HIGH>; int3-gpio = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_HIGH>; int4-gpio = <&gpio TEGRA_GPIO(J, 0) GPIO_ACTIVE_HIGH>; - toradex,apalis-tk1-k20-uses-gpio; toradex,apalis-tk1-k20-uses-adc; + toradex,apalis-tk1-k20-uses-can; + toradex,apalis-tk1-k20-uses-gpio; toradex,apalis-tk1-k20-uses-tsc; + + controller-data { + nvidia,enable-hw-based-cs; + nvidia,cs-setup-clk-count = <12>; + nvidia,cs-hold-clk-count = <12>; + }; }; /* spidev on K20 bus, can be used with custom firmware for userspace @@ -163,7 +168,7 @@ spidev2: spidev@2 { compatible = "spidev"; reg = <2>; - spi-max-frequency = <3500000>; + spi-max-frequency = <2000000>; }; }; diff --git a/arch/arm/configs/apalis-tk1_defconfig b/arch/arm/configs/apalis-tk1_defconfig index bf53b49ea7fe..2a6c23a37d52 100644 --- a/arch/arm/configs/apalis-tk1_defconfig +++ b/arch/arm/configs/apalis-tk1_defconfig @@ -147,6 +147,7 @@ CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_CAN=y CONFIG_CAN_MCP251X=y +CONFIG_CAN_APALIS_TK1_K20=m CONFIG_BT=m CONFIG_BT_RFCOMM=m CONFIG_BT_BNEP=m |