diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-eval.dts | 26 | ||||
| -rw-r--r-- | arch/arm/configs/apalis-tk1_defconfig | 8 |
2 files changed, 27 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index 231d0913e92e..c5ecf9301229 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -136,16 +136,34 @@ status = "okay"; spi-max-frequency = <25000000>; - spidev1: spidev@1 { - compatible = "spidev"; + k20mcu: apalis-tk1-k20@1 { + compatible = "toradex,apalis-tk1-k20"; reg = <1>; - spi-max-frequency = <12000000>; + spi-max-frequency = <10000000>; + 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-tsc; }; + /* spidev on K20 bus, can be used with custom firmware for userspace + * K20 applications */ spidev2: spidev@2 { compatible = "spidev"; reg = <2>; - spi-max-frequency = <2000000>; + spi-max-frequency = <3500000>; }; }; diff --git a/arch/arm/configs/apalis-tk1_defconfig b/arch/arm/configs/apalis-tk1_defconfig index 87a3d3901fbc..bf53b49ea7fe 100644 --- a/arch/arm/configs/apalis-tk1_defconfig +++ b/arch/arm/configs/apalis-tk1_defconfig @@ -225,7 +225,7 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=m CONFIG_INPUT_TOUCHSCREEN=y -#TBD: K20 Touch +CONFIG_TOUCHSCREEN_APALIS_TK1_K20=m CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_INPUT_MISC=y CONFIG_INPUT_KEYCHORD=y @@ -252,6 +252,7 @@ CONFIG_SPI_SPIDEV=y CONFIG_PINCTRL_AS3722=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_APALIS_TK1_K20=m CONFIG_POWER_RESET_AS3722=y CONFIG_THERMAL_GOV_PID=y CONFIG_GENERIC_ADC_THERMAL=y @@ -262,8 +263,9 @@ CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_TEGRA_WATCHDOG=y CONFIG_TEGRA_WATCHDOG_ENABLE_ON_PROBE=y +CONFIG_MFD_APALIS_TK1_K20=m +CONFIG_APALIS_TK1_K20_EZP=y CONFIG_MFD_AS3722=y -#TBD: MFD K20 CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_VIRTUAL_CONSUMER=y @@ -384,7 +386,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_PM_DEVFREQ=y CONFIG_EXTCON=y CONFIG_IIO=y -#TBD: K20 ADC +CONFIG_APALIS_TK1_K20_ADC=m CONFIG_PWM=y CONFIG_PWM_TEGRA=y CONFIG_GK20A_PMU=y |