From 20bb0324e532863cafc5dc41e8cd5a6ec28413d8 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 14 Sep 2017 10:51:18 -0600 Subject: nvidia: use kernel overlay features Update all Kconfig files and Makefiles to rely on the kernel overlay feature. In particular, don't include any Kconfig files or Makefiles from other overlays. -I directives in CFLAGS are not yet cleaned up. Bug 1978395 Change-Id: I425d37d55f8ea61fb3a082a1504f994ff30cec03 Signed-off-by: Stephen Warren Reviewed-on: https://git-master.nvidia.com/r/1561187 Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- arch/arm64/Kconfig | 18 ++ arch/arm64/Kconfig.nvidia | 18 -- drivers/Kconfig | 6 + drivers/Makefile | 14 + drivers/Makefile.nvidia | 39 --- drivers/ata/Kconfig | 9 + drivers/ata/Kconfig.nvidia | 9 - drivers/ata/Makefile | 1 + drivers/ata/Makefile.nvidia | 1 - drivers/ata/tegra/Makefile | 6 + drivers/ata/tegra/Makefile.nvidia | 6 - drivers/clocksource/Kconfig | 6 + drivers/clocksource/Kconfig.nvidia | 6 - drivers/clocksource/Makefile | 1 + drivers/clocksource/Makefile.nvidia | 1 - drivers/cpufreq/Makefile | 10 + drivers/cpufreq/Makefile.nvidia | 10 - drivers/cpuidle/Makefile | 3 + drivers/cpuidle/Makefile.nvidia | 3 - drivers/crypto/Kconfig | 40 +++ drivers/crypto/Kconfig.nvidia | 37 --- drivers/crypto/Makefile | 11 + drivers/crypto/Makefile.nvidia | 11 - drivers/dma/Kconfig | 15 + drivers/dma/Kconfig.nvidia | 12 - drivers/dma/Makefile | 9 + drivers/dma/Makefile.nvidia | 9 - drivers/gpio/Kconfig | 9 + drivers/gpio/Kconfig.nvidia | 5 - drivers/gpio/Makefile | 3 + drivers/gpio/Makefile.nvidia | 3 - drivers/gpu/drm/tegra/Makefile | 13 + drivers/gpu/drm/tegra/Makefile.nvidia | 11 - drivers/gpu/host1x/Makefile | 8 + drivers/gpu/host1x/Makefile.nvidia | 8 - drivers/i2c/Makefile | 1 + drivers/i2c/Makefile.nvidia | 1 - drivers/i2c/busses/Kconfig | 40 +++ drivers/i2c/busses/Kconfig.nvidia | 37 --- drivers/i2c/busses/Makefile | 6 + drivers/i2c/busses/Makefile.nvidia | 6 - drivers/iio/Kconfig | 3 + drivers/iio/Makefile | 1 + drivers/iio/accel/Kconfig | 15 + drivers/iio/accel/Kconfig.nvidia | 11 - drivers/iio/accel/Makefile | 7 + drivers/iio/accel/Makefile.nvidia | 7 - drivers/iio/generic/Kconfig | 14 + drivers/iio/generic/Kconfig.nvidia | 14 - drivers/iio/generic/Makefile | 7 + drivers/iio/generic/Makefile.nvidia | 7 - drivers/iio/gyro/Kconfig | 15 + drivers/iio/gyro/Kconfig.nvidia | 12 - drivers/iio/gyro/Makefile | 7 + drivers/iio/gyro/Makefile.nvidia | 7 - drivers/iio/imu/Kconfig | 3 + drivers/iio/imu/Makefile | 1 + drivers/iio/imu/nvi_mpu/Kconfig | 14 + drivers/iio/imu/nvi_mpu/Kconfig.nvidia | 14 - drivers/iio/imu/nvi_mpu/Makefile | 21 ++ drivers/iio/imu/nvi_mpu/Makefile.nvidia | 21 -- drivers/iio/light/Kconfig | 77 +++++ drivers/iio/light/Kconfig.nvidia | 73 ----- drivers/iio/light/Makefile | 13 + drivers/iio/light/Makefile.nvidia | 13 - drivers/iio/magnetometer/Kconfig | 19 ++ drivers/iio/magnetometer/Kconfig.nvidia | 16 - drivers/iio/magnetometer/Makefile | 19 ++ drivers/iio/magnetometer/Makefile.nvidia | 19 -- drivers/iio/pressure/Kconfig | 18 ++ drivers/iio/pressure/Kconfig.nvidia | 15 - drivers/iio/pressure/Makefile | 11 + drivers/iio/pressure/Makefile.nvidia | 11 - drivers/iio/proximity/Kconfig | 16 + drivers/iio/proximity/Kconfig.nvidia | 13 - drivers/iio/proximity/Makefile | 8 + drivers/iio/proximity/Makefile.nvidia | 8 - drivers/input/Makefile | 3 + drivers/input/Makefile.nvidia | 3 - drivers/input/touchscreen/Kconfig | 44 +++ drivers/input/touchscreen/Kconfig.nvidia | 40 --- drivers/input/touchscreen/Makefile | 3 + drivers/input/touchscreen/Makefile.nvidia | 3 - drivers/media/Makefile | 3 + drivers/media/Makefile.nvidia | 3 - drivers/media/i2c/Kconfig | 104 +++++++ drivers/media/i2c/Kconfig.nvidia | 96 ------ drivers/media/i2c/Makefile | 15 + drivers/media/i2c/Makefile.nvidia | 15 - drivers/media/platform/Kconfig | 3 + drivers/media/platform/Makefile | 1 + drivers/media/platform/Makefile.nvidia | 1 - drivers/media/platform/tegra/Kconfig | 44 +++ drivers/media/platform/tegra/Kconfig.nvidia | 45 --- drivers/media/platform/tegra/Makefile | 12 + drivers/media/platform/tegra/Makefile.nvidia | 12 - drivers/media/platform/tegra/camera/Makefile | 14 + .../media/platform/tegra/camera/Makefile.nvidia | 14 - drivers/media/platform/tegra/camera/csi/Makefile | 8 + .../platform/tegra/camera/csi/Makefile.nvidia | 8 - drivers/media/platform/tegra/camera/vi/Makefile | 25 ++ .../media/platform/tegra/camera/vi/Makefile.nvidia | 25 -- drivers/media/platform/tegra/isc/Makefile | 6 + drivers/media/platform/tegra/isc/Makefile.nvidia | 6 - drivers/media/platform/tegra/mipical/Kconfig | 11 + .../media/platform/tegra/mipical/Kconfig.nvidia | 11 - drivers/media/platform/tegra/mipical/Makefile | 6 + .../media/platform/tegra/mipical/Makefile.nvidia | 6 - drivers/media/platform/tegra/tpg/Makefile | 20 ++ drivers/media/platform/tegra/tpg/Makefile.nvidia | 20 -- drivers/media/platform/tegra/vi/Makefile | 13 + drivers/media/platform/tegra/vi/Makefile.nvidia | 13 - drivers/media/spi/Kconfig | 12 + drivers/media/spi/Kconfig.nvidia | 12 - drivers/media/spi/Makefile | 6 + drivers/media/spi/Makefile.nvidia | 6 - drivers/misc/Kconfig | 85 +++++ drivers/misc/Kconfig.nvidia | 78 ----- drivers/misc/Makefile | 15 + drivers/misc/Makefile.nvidia | 11 - drivers/misc/eqos_ape/Makefile | 20 ++ drivers/misc/eqos_ape/Makefile.nvidia | 20 -- drivers/misc/eqos_ape/eqos_ape_ioctl.h | 2 +- drivers/misc/mods/Makefile | 15 + drivers/misc/mods/Makefile.nvidia | 15 - drivers/misc/nvs-aonsh/Kconfig | 10 + drivers/misc/nvs-aonsh/Kconfig.nvidia | 10 - drivers/misc/nvs-aonsh/Makefile | 4 + drivers/misc/nvs-aonsh/Makefile.nvidia | 4 - drivers/misc/nvs-aonsh/nvs_aon_shub.c | 2 +- drivers/misc/nvs-dfsh/Kconfig | 11 + drivers/misc/nvs-dfsh/Kconfig.nvidia | 11 - drivers/misc/nvs-dfsh/Makefile | 5 + drivers/misc/nvs-dfsh/Makefile.nvidia | 5 - drivers/misc/nvs/Kconfig | 66 ++++ drivers/misc/nvs/Kconfig.nvidia | 66 ---- drivers/misc/nvs/Makefile | 34 ++ drivers/misc/nvs/Makefile.nvidia | 34 -- drivers/misc/saf775x/Makefile | 15 + drivers/misc/saf775x/Makefile.nvidia | 15 - drivers/misc/tegra-cec/Kconfig | 9 + drivers/misc/tegra-cec/Kconfig.nvidia | 6 - drivers/misc/tegra-profiler/Kconfig | 8 + drivers/misc/tegra-profiler/Kconfig.nvidia | 8 - drivers/misc/tegra-profiler/Makefile | 38 +++ drivers/misc/tegra-profiler/Makefile.nvidia | 38 --- drivers/misc/tegra186-ahc/Kconfig | 3 + drivers/misc/tegra186-ahc/Kconfig.nvidia | 3 - drivers/misc/tegra186-ahc/Makefile | 1 + drivers/misc/tegra186-ahc/Makefile.nvidia | 1 - drivers/net/Makefile | 2 + drivers/net/Makefile.nvidia | 2 - drivers/net/can/Kconfig | 5 + drivers/net/can/Kconfig.nvidia | 3 - drivers/net/can/Makefile | 3 + drivers/net/can/Makefile.nvidia | 3 - drivers/net/can/mttcan/Makefile | 3 + drivers/net/can/mttcan/Makefile.nvidia | 3 - drivers/net/can/mttcan/ivc/Kconfig | 11 + drivers/net/can/mttcan/ivc/Kconfig.nvidia | 11 - drivers/net/can/mttcan/ivc/Makefile | 23 ++ drivers/net/can/mttcan/ivc/Makefile.nvidia | 23 -- drivers/net/can/mttcan/native/Kconfig | 9 + drivers/net/can/mttcan/native/Kconfig.nvidia | 9 - drivers/net/can/mttcan/native/Makefile | 24 ++ drivers/net/can/mttcan/native/Makefile.nvidia | 24 -- drivers/net/can/nvsec/Kconfig | 9 + drivers/net/can/nvsec/Kconfig.nvidia | 9 - drivers/net/can/nvsec/Makefile | 20 ++ drivers/net/can/nvsec/Makefile.nvidia | 20 -- drivers/nvpmodel/Kconfig | 14 + drivers/nvpmodel/Kconfig.nvidia | 14 - drivers/nvpmodel/Makefile | 5 + drivers/nvpmodel/Makefile.nvidia | 5 - drivers/padctrl/Kconfig | 12 + drivers/padctrl/Kconfig.nvidia | 10 - drivers/padctrl/Makefile | 6 + drivers/padctrl/Makefile.nvidia | 6 - drivers/pinctrl/Kconfig | 23 ++ drivers/pinctrl/Kconfig.nvidia | 19 -- drivers/pinctrl/Makefile | 12 + drivers/pinctrl/Makefile.nvidia | 12 - drivers/platform/Makefile | 1 + drivers/platform/Makefile.nvidia | 1 - drivers/platform/tegra/Kconfig | 134 ++++++++ drivers/platform/tegra/Kconfig.nvidia | 132 -------- drivers/platform/tegra/Makefile | 47 +++ drivers/platform/tegra/Makefile.nvidia | 45 --- drivers/platform/tegra/nvadsp/Kconfig | 80 +++++ drivers/platform/tegra/nvadsp/Kconfig.nvidia | 80 ----- drivers/platform/tegra/nvadsp/Makefile | 35 +++ drivers/platform/tegra/nvadsp/Makefile.nvidia | 35 --- drivers/platform/tegra/powergate/Makefile | 1 + drivers/platform/tegra/powergate/Makefile.nvidia | 1 - drivers/platform/tegra/rtcpu/Makefile | 17 + drivers/platform/tegra/rtcpu/Makefile.nvidia | 17 - drivers/regulator/Kconfig | 11 + drivers/regulator/Kconfig.nvidia | 11 - drivers/regulator/Makefile | 5 + drivers/regulator/Makefile.nvidia | 5 - drivers/reset/Makefile | 2 + drivers/reset/Makefile.nvidia | 2 - drivers/reset/tegra/Makefile | 16 + drivers/reset/tegra/Makefile.nvidia | 16 - drivers/scsi/ufs/Kconfig | 11 + drivers/scsi/ufs/Kconfig.nvidia | 11 - drivers/scsi/ufs/Makefile | 2 + drivers/scsi/ufs/Makefile.nvidia | 2 - drivers/spi/Kconfig | 12 + drivers/spi/Kconfig.nvidia | 6 - drivers/spi/Makefile | 7 + drivers/spi/Makefile.nvidia | 7 - drivers/staging/iio/meter/Kconfig | 27 ++ drivers/staging/iio/meter/Kconfig.nvidia | 23 -- drivers/staging/iio/meter/Makefile | 7 + drivers/staging/iio/meter/Makefile.nvidia | 7 - drivers/thermal/Makefile | 1 + drivers/thermal/Makefile.nvidia | 1 - drivers/thermal/tegra/Kconfig | 32 ++ drivers/thermal/tegra/Kconfig.nvidia | 28 -- drivers/thermal/tegra/Makefile | 4 + drivers/thermal/tegra/Makefile.nvidia | 4 - drivers/tty/Makefile | 1 + drivers/tty/Makefile.nvidia | 1 - drivers/tty/serial/Kconfig | 28 ++ drivers/tty/serial/Kconfig.nvidia | 24 -- drivers/tty/serial/Makefile | 2 + drivers/tty/serial/Makefile.nvidia | 2 - drivers/video/Makefile | 4 + drivers/video/Makefile.nvidia | 4 - drivers/video/backlight/Kconfig | 18 ++ drivers/video/backlight/Kconfig.nvidia | 19 -- drivers/video/backlight/Makefile | 3 + drivers/video/backlight/Makefile.nvidia | 3 - drivers/video/tegra/Kconfig | 346 +++++++++++++++++++++ drivers/video/tegra/Kconfig.nvidia | 341 -------------------- drivers/video/tegra/Makefile | 9 + drivers/video/tegra/Makefile.nvidia | 9 - drivers/video/tegra/camera/Makefile | 5 +- drivers/video/tegra/camera/Makefile.nvidia | 7 - drivers/video/tegra/dc/Makefile | 11 +- drivers/video/tegra/dc/Makefile.nvidia | 2 - drivers/video/tegra/dc/nvdisp/Makefile | 22 ++ drivers/video/tegra/dc/nvdisp/Makefile.nvidia | 22 -- drivers/video/tegra/host/Makefile | 44 +++ drivers/video/tegra/host/Makefile.nvidia | 48 --- drivers/video/tegra/host/flcn/Makefile | 12 + drivers/video/tegra/host/flcn/Makefile.nvidia | 12 - drivers/video/tegra/host/host1x/Makefile | 13 + drivers/video/tegra/host/host1x/Makefile.nvidia | 13 - drivers/video/tegra/host/isp/Makefile | 18 ++ drivers/video/tegra/host/isp/Makefile.nvidia | 18 -- drivers/video/tegra/host/nvcsi/Makefile | 11 + drivers/video/tegra/host/nvcsi/Makefile.nvidia | 11 - drivers/video/tegra/host/nvdec/Makefile | 13 + drivers/video/tegra/host/nvdec/Makefile.nvidia | 13 - drivers/video/tegra/host/t124/Makefile | 11 + drivers/video/tegra/host/t124/Makefile.nvidia | 11 - drivers/video/tegra/host/t186/Makefile | 15 + drivers/video/tegra/host/t186/Makefile.nvidia | 15 - drivers/video/tegra/host/t210/Makefile | 13 + drivers/video/tegra/host/t210/Makefile.nvidia | 13 - drivers/video/tegra/host/tsec/Makefile | 15 + drivers/video/tegra/host/tsec/Makefile.nvidia | 15 - drivers/video/tegra/host/vhost/Makefile | 18 ++ drivers/video/tegra/host/vhost/Makefile.nvidia | 18 -- drivers/video/tegra/host/vi/Makefile | 8 + drivers/video/tegra/host/vi/Makefile.nvidia | 8 - drivers/video/tegra/nvmap/Kconfig | 138 ++++++++ drivers/video/tegra/nvmap/Kconfig.nvidia | 138 -------- drivers/video/tegra/nvmap/Makefile | 29 ++ drivers/video/tegra/nvmap/Makefile.nvidia | 35 --- drivers/watchdog/Kconfig | 23 ++ drivers/watchdog/Kconfig.nvidia | 20 -- drivers/watchdog/Makefile | 3 + drivers/watchdog/Makefile.nvidia | 3 - sound/pci/Kconfig.nvidia | 1 - sound/pci/Makefile | 1 + sound/pci/Makefile.nvidia | 1 - sound/pci/hda/Kconfig | 18 ++ sound/pci/hda/Kconfig.nvidia | 15 - sound/pci/hda/Makefile | 4 + sound/pci/hda/Makefile.nvidia | 4 - sound/soc/Kconfig | 6 + sound/soc/Kconfig.nvidia | 2 - sound/soc/Makefile | 2 + sound/soc/Makefile.nvidia | 2 - sound/soc/tegra-alt/Kconfig | 308 ++++++++++++++++++ sound/soc/tegra-alt/Kconfig.nvidia | 304 ------------------ sound/soc/tegra-alt/Makefile | 94 ++++++ sound/soc/tegra-alt/Makefile.nvidia | 94 ------ sound/soc/tegra-virt-alt/Kconfig | 31 ++ sound/soc/tegra-virt-alt/Kconfig.nvidia | 27 -- sound/soc/tegra-virt-alt/Makefile | 22 ++ sound/soc/tegra-virt-alt/Makefile.nvidia | 22 -- 295 files changed, 3155 insertions(+), 3073 deletions(-) create mode 100644 arch/arm64/Kconfig delete mode 100644 arch/arm64/Kconfig.nvidia create mode 100644 drivers/Kconfig create mode 100644 drivers/Makefile delete mode 100644 drivers/Makefile.nvidia create mode 100644 drivers/ata/Kconfig delete mode 100644 drivers/ata/Kconfig.nvidia create mode 100644 drivers/ata/Makefile delete mode 100644 drivers/ata/Makefile.nvidia create mode 100644 drivers/ata/tegra/Makefile delete mode 100644 drivers/ata/tegra/Makefile.nvidia create mode 100644 drivers/clocksource/Kconfig delete mode 100644 drivers/clocksource/Kconfig.nvidia create mode 100644 drivers/clocksource/Makefile delete mode 100644 drivers/clocksource/Makefile.nvidia create mode 100644 drivers/cpufreq/Makefile delete mode 100644 drivers/cpufreq/Makefile.nvidia create mode 100644 drivers/cpuidle/Makefile delete mode 100644 drivers/cpuidle/Makefile.nvidia create mode 100644 drivers/crypto/Kconfig delete mode 100644 drivers/crypto/Kconfig.nvidia create mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/Makefile.nvidia create mode 100644 drivers/dma/Kconfig delete mode 100644 drivers/dma/Kconfig.nvidia create mode 100644 drivers/dma/Makefile delete mode 100644 drivers/dma/Makefile.nvidia create mode 100644 drivers/gpio/Kconfig delete mode 100644 drivers/gpio/Kconfig.nvidia create mode 100644 drivers/gpio/Makefile delete mode 100644 drivers/gpio/Makefile.nvidia create mode 100644 drivers/gpu/drm/tegra/Makefile delete mode 100644 drivers/gpu/drm/tegra/Makefile.nvidia create mode 100644 drivers/gpu/host1x/Makefile delete mode 100644 drivers/gpu/host1x/Makefile.nvidia create mode 100644 drivers/i2c/Makefile delete mode 100644 drivers/i2c/Makefile.nvidia create mode 100644 drivers/i2c/busses/Kconfig delete mode 100644 drivers/i2c/busses/Kconfig.nvidia create mode 100644 drivers/i2c/busses/Makefile delete mode 100644 drivers/i2c/busses/Makefile.nvidia create mode 100644 drivers/iio/Kconfig create mode 100644 drivers/iio/Makefile create mode 100644 drivers/iio/accel/Kconfig delete mode 100644 drivers/iio/accel/Kconfig.nvidia create mode 100644 drivers/iio/accel/Makefile delete mode 100644 drivers/iio/accel/Makefile.nvidia create mode 100644 drivers/iio/generic/Kconfig delete mode 100644 drivers/iio/generic/Kconfig.nvidia create mode 100644 drivers/iio/generic/Makefile delete mode 100644 drivers/iio/generic/Makefile.nvidia create mode 100644 drivers/iio/gyro/Kconfig delete mode 100644 drivers/iio/gyro/Kconfig.nvidia create mode 100644 drivers/iio/gyro/Makefile delete mode 100644 drivers/iio/gyro/Makefile.nvidia create mode 100644 drivers/iio/imu/Kconfig create mode 100644 drivers/iio/imu/Makefile create mode 100644 drivers/iio/imu/nvi_mpu/Kconfig delete mode 100644 drivers/iio/imu/nvi_mpu/Kconfig.nvidia create mode 100644 drivers/iio/imu/nvi_mpu/Makefile delete mode 100644 drivers/iio/imu/nvi_mpu/Makefile.nvidia create mode 100644 drivers/iio/light/Kconfig delete mode 100644 drivers/iio/light/Kconfig.nvidia create mode 100644 drivers/iio/light/Makefile delete mode 100644 drivers/iio/light/Makefile.nvidia create mode 100644 drivers/iio/magnetometer/Kconfig delete mode 100644 drivers/iio/magnetometer/Kconfig.nvidia create mode 100644 drivers/iio/magnetometer/Makefile delete mode 100644 drivers/iio/magnetometer/Makefile.nvidia create mode 100644 drivers/iio/pressure/Kconfig delete mode 100644 drivers/iio/pressure/Kconfig.nvidia create mode 100644 drivers/iio/pressure/Makefile delete mode 100644 drivers/iio/pressure/Makefile.nvidia create mode 100644 drivers/iio/proximity/Kconfig delete mode 100644 drivers/iio/proximity/Kconfig.nvidia create mode 100644 drivers/iio/proximity/Makefile delete mode 100644 drivers/iio/proximity/Makefile.nvidia create mode 100644 drivers/input/Makefile delete mode 100644 drivers/input/Makefile.nvidia create mode 100644 drivers/input/touchscreen/Kconfig delete mode 100644 drivers/input/touchscreen/Kconfig.nvidia create mode 100644 drivers/input/touchscreen/Makefile delete mode 100644 drivers/input/touchscreen/Makefile.nvidia create mode 100644 drivers/media/Makefile delete mode 100644 drivers/media/Makefile.nvidia create mode 100644 drivers/media/i2c/Kconfig delete mode 100644 drivers/media/i2c/Kconfig.nvidia create mode 100644 drivers/media/i2c/Makefile delete mode 100644 drivers/media/i2c/Makefile.nvidia create mode 100644 drivers/media/platform/Kconfig create mode 100644 drivers/media/platform/Makefile delete mode 100644 drivers/media/platform/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/Kconfig delete mode 100644 drivers/media/platform/tegra/Kconfig.nvidia create mode 100644 drivers/media/platform/tegra/Makefile delete mode 100644 drivers/media/platform/tegra/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/camera/Makefile delete mode 100644 drivers/media/platform/tegra/camera/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/camera/csi/Makefile delete mode 100644 drivers/media/platform/tegra/camera/csi/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/camera/vi/Makefile delete mode 100644 drivers/media/platform/tegra/camera/vi/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/isc/Makefile delete mode 100644 drivers/media/platform/tegra/isc/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/mipical/Kconfig delete mode 100644 drivers/media/platform/tegra/mipical/Kconfig.nvidia create mode 100644 drivers/media/platform/tegra/mipical/Makefile delete mode 100644 drivers/media/platform/tegra/mipical/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/tpg/Makefile delete mode 100644 drivers/media/platform/tegra/tpg/Makefile.nvidia create mode 100644 drivers/media/platform/tegra/vi/Makefile delete mode 100644 drivers/media/platform/tegra/vi/Makefile.nvidia create mode 100644 drivers/media/spi/Kconfig delete mode 100644 drivers/media/spi/Kconfig.nvidia create mode 100644 drivers/media/spi/Makefile delete mode 100644 drivers/media/spi/Makefile.nvidia create mode 100644 drivers/misc/Kconfig delete mode 100644 drivers/misc/Kconfig.nvidia create mode 100644 drivers/misc/Makefile delete mode 100644 drivers/misc/Makefile.nvidia create mode 100644 drivers/misc/eqos_ape/Makefile delete mode 100644 drivers/misc/eqos_ape/Makefile.nvidia create mode 100644 drivers/misc/mods/Makefile delete mode 100644 drivers/misc/mods/Makefile.nvidia create mode 100644 drivers/misc/nvs-aonsh/Kconfig delete mode 100644 drivers/misc/nvs-aonsh/Kconfig.nvidia create mode 100644 drivers/misc/nvs-aonsh/Makefile delete mode 100644 drivers/misc/nvs-aonsh/Makefile.nvidia create mode 100644 drivers/misc/nvs-dfsh/Kconfig delete mode 100644 drivers/misc/nvs-dfsh/Kconfig.nvidia create mode 100644 drivers/misc/nvs-dfsh/Makefile delete mode 100644 drivers/misc/nvs-dfsh/Makefile.nvidia create mode 100644 drivers/misc/nvs/Kconfig delete mode 100644 drivers/misc/nvs/Kconfig.nvidia create mode 100644 drivers/misc/nvs/Makefile delete mode 100644 drivers/misc/nvs/Makefile.nvidia create mode 100644 drivers/misc/saf775x/Makefile delete mode 100644 drivers/misc/saf775x/Makefile.nvidia create mode 100644 drivers/misc/tegra-cec/Kconfig delete mode 100644 drivers/misc/tegra-cec/Kconfig.nvidia create mode 100644 drivers/misc/tegra-profiler/Kconfig delete mode 100644 drivers/misc/tegra-profiler/Kconfig.nvidia create mode 100644 drivers/misc/tegra-profiler/Makefile delete mode 100644 drivers/misc/tegra-profiler/Makefile.nvidia create mode 100644 drivers/misc/tegra186-ahc/Kconfig delete mode 100644 drivers/misc/tegra186-ahc/Kconfig.nvidia create mode 100644 drivers/misc/tegra186-ahc/Makefile delete mode 100644 drivers/misc/tegra186-ahc/Makefile.nvidia create mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/Makefile.nvidia create mode 100644 drivers/net/can/Kconfig delete mode 100644 drivers/net/can/Kconfig.nvidia create mode 100644 drivers/net/can/Makefile delete mode 100644 drivers/net/can/Makefile.nvidia create mode 100644 drivers/net/can/mttcan/Makefile delete mode 100644 drivers/net/can/mttcan/Makefile.nvidia create mode 100644 drivers/net/can/mttcan/ivc/Kconfig delete mode 100644 drivers/net/can/mttcan/ivc/Kconfig.nvidia create mode 100644 drivers/net/can/mttcan/ivc/Makefile delete mode 100644 drivers/net/can/mttcan/ivc/Makefile.nvidia create mode 100644 drivers/net/can/mttcan/native/Kconfig delete mode 100644 drivers/net/can/mttcan/native/Kconfig.nvidia create mode 100644 drivers/net/can/mttcan/native/Makefile delete mode 100644 drivers/net/can/mttcan/native/Makefile.nvidia create mode 100644 drivers/net/can/nvsec/Kconfig delete mode 100644 drivers/net/can/nvsec/Kconfig.nvidia create mode 100644 drivers/net/can/nvsec/Makefile delete mode 100644 drivers/net/can/nvsec/Makefile.nvidia create mode 100644 drivers/nvpmodel/Kconfig delete mode 100644 drivers/nvpmodel/Kconfig.nvidia create mode 100644 drivers/nvpmodel/Makefile delete mode 100644 drivers/nvpmodel/Makefile.nvidia create mode 100644 drivers/padctrl/Kconfig delete mode 100644 drivers/padctrl/Kconfig.nvidia create mode 100644 drivers/padctrl/Makefile delete mode 100644 drivers/padctrl/Makefile.nvidia create mode 100644 drivers/pinctrl/Kconfig delete mode 100644 drivers/pinctrl/Kconfig.nvidia create mode 100644 drivers/pinctrl/Makefile delete mode 100644 drivers/pinctrl/Makefile.nvidia create mode 100644 drivers/platform/Makefile delete mode 100644 drivers/platform/Makefile.nvidia create mode 100644 drivers/platform/tegra/Kconfig delete mode 100644 drivers/platform/tegra/Kconfig.nvidia create mode 100644 drivers/platform/tegra/Makefile delete mode 100644 drivers/platform/tegra/Makefile.nvidia create mode 100644 drivers/platform/tegra/nvadsp/Kconfig delete mode 100644 drivers/platform/tegra/nvadsp/Kconfig.nvidia create mode 100644 drivers/platform/tegra/nvadsp/Makefile delete mode 100644 drivers/platform/tegra/nvadsp/Makefile.nvidia create mode 100644 drivers/platform/tegra/powergate/Makefile delete mode 100644 drivers/platform/tegra/powergate/Makefile.nvidia create mode 100644 drivers/platform/tegra/rtcpu/Makefile delete mode 100644 drivers/platform/tegra/rtcpu/Makefile.nvidia create mode 100644 drivers/regulator/Kconfig delete mode 100644 drivers/regulator/Kconfig.nvidia create mode 100644 drivers/regulator/Makefile delete mode 100644 drivers/regulator/Makefile.nvidia create mode 100644 drivers/reset/Makefile delete mode 100644 drivers/reset/Makefile.nvidia create mode 100644 drivers/reset/tegra/Makefile delete mode 100644 drivers/reset/tegra/Makefile.nvidia create mode 100644 drivers/scsi/ufs/Kconfig delete mode 100644 drivers/scsi/ufs/Kconfig.nvidia create mode 100644 drivers/scsi/ufs/Makefile delete mode 100644 drivers/scsi/ufs/Makefile.nvidia create mode 100644 drivers/spi/Kconfig delete mode 100644 drivers/spi/Kconfig.nvidia create mode 100644 drivers/spi/Makefile delete mode 100644 drivers/spi/Makefile.nvidia create mode 100644 drivers/staging/iio/meter/Kconfig delete mode 100644 drivers/staging/iio/meter/Kconfig.nvidia create mode 100644 drivers/staging/iio/meter/Makefile delete mode 100644 drivers/staging/iio/meter/Makefile.nvidia create mode 100644 drivers/thermal/Makefile delete mode 100644 drivers/thermal/Makefile.nvidia create mode 100644 drivers/thermal/tegra/Kconfig delete mode 100644 drivers/thermal/tegra/Kconfig.nvidia create mode 100644 drivers/thermal/tegra/Makefile delete mode 100644 drivers/thermal/tegra/Makefile.nvidia create mode 100644 drivers/tty/Makefile delete mode 100644 drivers/tty/Makefile.nvidia create mode 100644 drivers/tty/serial/Kconfig delete mode 100644 drivers/tty/serial/Kconfig.nvidia create mode 100644 drivers/tty/serial/Makefile delete mode 100644 drivers/tty/serial/Makefile.nvidia create mode 100644 drivers/video/Makefile delete mode 100644 drivers/video/Makefile.nvidia create mode 100644 drivers/video/backlight/Kconfig delete mode 100644 drivers/video/backlight/Kconfig.nvidia create mode 100644 drivers/video/backlight/Makefile delete mode 100644 drivers/video/backlight/Makefile.nvidia create mode 100644 drivers/video/tegra/Kconfig delete mode 100644 drivers/video/tegra/Kconfig.nvidia create mode 100644 drivers/video/tegra/Makefile delete mode 100644 drivers/video/tegra/Makefile.nvidia delete mode 100644 drivers/video/tegra/camera/Makefile.nvidia delete mode 100644 drivers/video/tegra/dc/Makefile.nvidia create mode 100644 drivers/video/tegra/dc/nvdisp/Makefile delete mode 100644 drivers/video/tegra/dc/nvdisp/Makefile.nvidia create mode 100644 drivers/video/tegra/host/Makefile delete mode 100644 drivers/video/tegra/host/Makefile.nvidia create mode 100644 drivers/video/tegra/host/flcn/Makefile delete mode 100644 drivers/video/tegra/host/flcn/Makefile.nvidia create mode 100644 drivers/video/tegra/host/host1x/Makefile delete mode 100644 drivers/video/tegra/host/host1x/Makefile.nvidia create mode 100644 drivers/video/tegra/host/isp/Makefile delete mode 100644 drivers/video/tegra/host/isp/Makefile.nvidia create mode 100644 drivers/video/tegra/host/nvcsi/Makefile delete mode 100644 drivers/video/tegra/host/nvcsi/Makefile.nvidia create mode 100644 drivers/video/tegra/host/nvdec/Makefile delete mode 100644 drivers/video/tegra/host/nvdec/Makefile.nvidia create mode 100644 drivers/video/tegra/host/t124/Makefile delete mode 100644 drivers/video/tegra/host/t124/Makefile.nvidia create mode 100644 drivers/video/tegra/host/t186/Makefile delete mode 100644 drivers/video/tegra/host/t186/Makefile.nvidia create mode 100644 drivers/video/tegra/host/t210/Makefile delete mode 100644 drivers/video/tegra/host/t210/Makefile.nvidia create mode 100644 drivers/video/tegra/host/tsec/Makefile delete mode 100644 drivers/video/tegra/host/tsec/Makefile.nvidia create mode 100644 drivers/video/tegra/host/vhost/Makefile delete mode 100644 drivers/video/tegra/host/vhost/Makefile.nvidia create mode 100644 drivers/video/tegra/host/vi/Makefile delete mode 100644 drivers/video/tegra/host/vi/Makefile.nvidia create mode 100644 drivers/video/tegra/nvmap/Kconfig delete mode 100644 drivers/video/tegra/nvmap/Kconfig.nvidia create mode 100644 drivers/video/tegra/nvmap/Makefile delete mode 100644 drivers/video/tegra/nvmap/Makefile.nvidia create mode 100644 drivers/watchdog/Kconfig delete mode 100644 drivers/watchdog/Kconfig.nvidia create mode 100644 drivers/watchdog/Makefile delete mode 100644 drivers/watchdog/Makefile.nvidia delete mode 100644 sound/pci/Kconfig.nvidia create mode 100644 sound/pci/Makefile delete mode 100644 sound/pci/Makefile.nvidia create mode 100644 sound/pci/hda/Kconfig delete mode 100644 sound/pci/hda/Kconfig.nvidia create mode 100644 sound/pci/hda/Makefile delete mode 100644 sound/pci/hda/Makefile.nvidia create mode 100644 sound/soc/Kconfig delete mode 100644 sound/soc/Kconfig.nvidia create mode 100644 sound/soc/Makefile delete mode 100644 sound/soc/Makefile.nvidia create mode 100644 sound/soc/tegra-alt/Kconfig delete mode 100644 sound/soc/tegra-alt/Kconfig.nvidia create mode 100644 sound/soc/tegra-alt/Makefile delete mode 100644 sound/soc/tegra-alt/Makefile.nvidia create mode 100644 sound/soc/tegra-virt-alt/Kconfig delete mode 100644 sound/soc/tegra-virt-alt/Kconfig.nvidia create mode 100644 sound/soc/tegra-virt-alt/Makefile delete mode 100644 sound/soc/tegra-virt-alt/Makefile.nvidia diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig new file mode 100644 index 000000000..81558a81b --- /dev/null +++ b/arch/arm64/Kconfig @@ -0,0 +1,18 @@ +config ARCH_TEGRA_18x_SOC_PRIVATE + bool "Tegra 18x family SOC" + select CPU_V8 + select ARM_GIC + select COMMON_CLK + select SOC_BUS + select ARCH_REQUIRE_GPIOLIB + select PINCTRL + select PINCTRL_TEGRA186 + select ARCH_SUPPORTS_MSI if PCI_TEGRA + select PCI_MSI if PCI_TEGRA + select ARCH_TEGRA_APE + select GPIO_TEGRA186 + select ARCH_HAS_RESET_CONTROLLER + select ARM64_CPU_SUSPEND + default n + help + Support for NVIDIA Tegra 18x family of SoCs diff --git a/arch/arm64/Kconfig.nvidia b/arch/arm64/Kconfig.nvidia deleted file mode 100644 index 81558a81b..000000000 --- a/arch/arm64/Kconfig.nvidia +++ /dev/null @@ -1,18 +0,0 @@ -config ARCH_TEGRA_18x_SOC_PRIVATE - bool "Tegra 18x family SOC" - select CPU_V8 - select ARM_GIC - select COMMON_CLK - select SOC_BUS - select ARCH_REQUIRE_GPIOLIB - select PINCTRL - select PINCTRL_TEGRA186 - select ARCH_SUPPORTS_MSI if PCI_TEGRA - select PCI_MSI if PCI_TEGRA - select ARCH_TEGRA_APE - select GPIO_TEGRA186 - select ARCH_HAS_RESET_CONTROLLER - select ARM64_CPU_SUSPEND - default n - help - Support for NVIDIA Tegra 18x family of SoCs diff --git a/drivers/Kconfig b/drivers/Kconfig new file mode 100644 index 000000000..edfd0ea6f --- /dev/null +++ b/drivers/Kconfig @@ -0,0 +1,6 @@ +append_menu "Device Drivers" + +source "drivers/misc/tegra186-ahc/Kconfig" +source "drivers/nvpmodel/Kconfig" + +endmenu diff --git a/drivers/Makefile b/drivers/Makefile new file mode 100644 index 000000000..c60307d97 --- /dev/null +++ b/drivers/Makefile @@ -0,0 +1,14 @@ +# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. + +subdir-ccflags-y += -Werror + +obj-$(CONFIG_NVPMODEL_EMC) += nvpmodel/ diff --git a/drivers/Makefile.nvidia b/drivers/Makefile.nvidia deleted file mode 100644 index 1b97a24fd..000000000 --- a/drivers/Makefile.nvidia +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. - -subdir-ccflags-y += -Werror - -KBUILD_CFLAGS += -I$(srctree)/../nvidia/include - -obj-y += i2c/ -obj-y += media/ -obj-y += misc/ -obj-y += video/ -obj-y += platform/ -obj-$(CONFIG_CLK_SRC_TEGRA18_TIMER) += clocksource/ -obj-$(CONFIG_CRYPTO) += crypto/ -obj-y += dma/ -obj-y += spi/ -obj-$(CONFIG_CPU_FREQ) += cpufreq/ -obj-y += pinctrl/ -obj-y += gpio/ -obj-y += watchdog/ -obj-y += reset/ -obj-$(CONFIG_THERMAL) += thermal/ -obj-y += net/ -obj-y += i2c/ -obj-$(CONFIG_CPU_IDLE) += cpuidle/ -obj-$(CONFIG_TEGRA186_AHC) += misc/tegra186-ahc/ -obj-y += tty/ -obj-y += input/ -obj-$(CONFIG_PADCTRL) += padctrl/ -obj-$(CONFIG_NVPMODEL_EMC) += nvpmodel/ -obj-$(CONFIG_REGULATOR) += regulator/ diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig new file mode 100644 index 000000000..fd57a0458 --- /dev/null +++ b/drivers/ata/Kconfig @@ -0,0 +1,9 @@ +if ATA +config AHCI_TEGRA_DOWNSTREAM + tristate "TEGRA AHCI SATA support" + select ARCH_TEGRA_HAS_SATA + help + This option enables support for TEGRA AHCI Serial ATA. + + If unsure, say N. +endif # ATA diff --git a/drivers/ata/Kconfig.nvidia b/drivers/ata/Kconfig.nvidia deleted file mode 100644 index fd57a0458..000000000 --- a/drivers/ata/Kconfig.nvidia +++ /dev/null @@ -1,9 +0,0 @@ -if ATA -config AHCI_TEGRA_DOWNSTREAM - tristate "TEGRA AHCI SATA support" - select ARCH_TEGRA_HAS_SATA - help - This option enables support for TEGRA AHCI Serial ATA. - - If unsure, say N. -endif # ATA diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile new file mode 100644 index 000000000..f2ad55db4 --- /dev/null +++ b/drivers/ata/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_AHCI_TEGRA_DOWNSTREAM) += tegra/ diff --git a/drivers/ata/Makefile.nvidia b/drivers/ata/Makefile.nvidia deleted file mode 100644 index f2ad55db4..000000000 --- a/drivers/ata/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_AHCI_TEGRA_DOWNSTREAM) += tegra/ diff --git a/drivers/ata/tegra/Makefile b/drivers/ata/tegra/Makefile new file mode 100644 index 000000000..f8276eb50 --- /dev/null +++ b/drivers/ata/tegra/Makefile @@ -0,0 +1,6 @@ +GCOV_PROFILE := y +KBUILD_CFLAGS += -I$(srctree)/drivers/ata/ + +CFLAGS_ahci_tegra.o = -Werror + +obj-$(CONFIG_AHCI_TEGRA_DOWNSTREAM) += ahci_tegra.o diff --git a/drivers/ata/tegra/Makefile.nvidia b/drivers/ata/tegra/Makefile.nvidia deleted file mode 100644 index f8276eb50..000000000 --- a/drivers/ata/tegra/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -GCOV_PROFILE := y -KBUILD_CFLAGS += -I$(srctree)/drivers/ata/ - -CFLAGS_ahci_tegra.o = -Werror - -obj-$(CONFIG_AHCI_TEGRA_DOWNSTREAM) += ahci_tegra.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig new file mode 100644 index 000000000..f2e4dde89 --- /dev/null +++ b/drivers/clocksource/Kconfig @@ -0,0 +1,6 @@ +config CLK_SRC_TEGRA18_TIMER + bool "Clocksource for tegra18 based SOC's" + depends on ARCH_TEGRA + help + This is the tegra18 SOC timer driver. + diff --git a/drivers/clocksource/Kconfig.nvidia b/drivers/clocksource/Kconfig.nvidia deleted file mode 100644 index f2e4dde89..000000000 --- a/drivers/clocksource/Kconfig.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -config CLK_SRC_TEGRA18_TIMER - bool "Clocksource for tegra18 based SOC's" - depends on ARCH_TEGRA - help - This is the tegra18 SOC timer driver. - diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile new file mode 100644 index 000000000..7a169c183 --- /dev/null +++ b/drivers/clocksource/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_CLK_SRC_TEGRA18_TIMER) += tegra186_timer.o diff --git a/drivers/clocksource/Makefile.nvidia b/drivers/clocksource/Makefile.nvidia deleted file mode 100644 index 7a169c183..000000000 --- a/drivers/clocksource/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_CLK_SRC_TEGRA18_TIMER) += tegra186_timer.o diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile new file mode 100644 index 000000000..76d8d6f2a --- /dev/null +++ b/drivers/cpufreq/Makefile @@ -0,0 +1,10 @@ +GCOV_PROFILE := y + +subdir-ccflags-y += -Werror + +################################################################################ +# tegra platform drivers +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cpufreq.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cluster_clk.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cpufreq_hv.o +################################################################################ diff --git a/drivers/cpufreq/Makefile.nvidia b/drivers/cpufreq/Makefile.nvidia deleted file mode 100644 index 76d8d6f2a..000000000 --- a/drivers/cpufreq/Makefile.nvidia +++ /dev/null @@ -1,10 +0,0 @@ -GCOV_PROFILE := y - -subdir-ccflags-y += -Werror - -################################################################################ -# tegra platform drivers -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cpufreq.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cluster_clk.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra_cpufreq_hv.o -################################################################################ diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile new file mode 100644 index 000000000..24c000c34 --- /dev/null +++ b/drivers/cpuidle/Makefile @@ -0,0 +1,3 @@ +subdir-ccflags-y += -Werror + +obj-$(CONFIG_CPU_IDLE_TEGRA18X) += cpuidle-tegra18x.o diff --git a/drivers/cpuidle/Makefile.nvidia b/drivers/cpuidle/Makefile.nvidia deleted file mode 100644 index 24c000c34..000000000 --- a/drivers/cpuidle/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -subdir-ccflags-y += -Werror - -obj-$(CONFIG_CPU_IDLE_TEGRA18X) += cpuidle-tegra18x.o diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig new file mode 100644 index 000000000..c71a21cfc --- /dev/null +++ b/drivers/crypto/Kconfig @@ -0,0 +1,40 @@ +if CRYPTO_HW + +config TEGRA_CRYPTO_DEV + tristate "Device node to access tegra aes hardware" + depends on CRYPTO_DEV_TEGRA_ELLIPTIC_SE + help + Dev node /dev/tegra-crypto in order to get access to tegra aes + hardware from user space + +config CRYPTO_DEV_TEGRA_SE + tristate "Tegra SE driver for crypto algorithms" + select CRYPTO_AES + help + This option allows you to have support of Security Engine for crypto acceleration. + +config CRYPTO_DEV_TEGRA_ELLIPTIC_SE + tristate "Tegra SE for Elliptic crypto algorithms" + select CRYPTO_ECDH + select CRYPTO_ECDSA + help + This option allows you to have support of Security Engine + for Elliptic PKA1 and RNG1 Crypto Algorithms. PKA1 supports + Public Key Algorithms, RSA (upto 4K bits) and ECC (Elliptic + Curve Cryptography, upto 521 bits) features internally. RNG1 + supports random number generation. + +config CRYPTO_DEV_TEGRA_SE_USE_HOST1X_INTERFACE + tristate "Use Host1x Interface for Tegra SE crypto algorithms" + depends on ARCH_TEGRA_18x_SOC + help + This allows you to use Host1x Memory Interface for Tegra SE Driver + Crypto algorithms. + +config CRYPTO_DEV_TEGRA_VIRTUAL_SE_INTERFACE + tristate "Virtual SE interface for Tegra SE crypto algorithms" + depends on ARCH_TEGRA_18x_SOC && CRYPTO_DEV_TEGRA_SE + help + This allows you to use Virtual SE interface for Tegra Crypto algorithms. + +endif diff --git a/drivers/crypto/Kconfig.nvidia b/drivers/crypto/Kconfig.nvidia deleted file mode 100644 index 39ad143e6..000000000 --- a/drivers/crypto/Kconfig.nvidia +++ /dev/null @@ -1,37 +0,0 @@ - -config TEGRA_CRYPTO_DEV - tristate "Device node to access tegra aes hardware" - depends on CRYPTO_DEV_TEGRA_ELLIPTIC_SE - help - Dev node /dev/tegra-crypto in order to get access to tegra aes - hardware from user space - -config CRYPTO_DEV_TEGRA_SE - tristate "Tegra SE driver for crypto algorithms" - select CRYPTO_AES - help - This option allows you to have support of Security Engine for crypto acceleration. - -config CRYPTO_DEV_TEGRA_ELLIPTIC_SE - tristate "Tegra SE for Elliptic crypto algorithms" - select CRYPTO_ECDH - select CRYPTO_ECDSA - help - This option allows you to have support of Security Engine - for Elliptic PKA1 and RNG1 Crypto Algorithms. PKA1 supports - Public Key Algorithms, RSA (upto 4K bits) and ECC (Elliptic - Curve Cryptography, upto 521 bits) features internally. RNG1 - supports random number generation. - -config CRYPTO_DEV_TEGRA_SE_USE_HOST1X_INTERFACE - tristate "Use Host1x Interface for Tegra SE crypto algorithms" - depends on ARCH_TEGRA_18x_SOC - help - This allows you to use Host1x Memory Interface for Tegra SE Driver - Crypto algorithms. - -config CRYPTO_DEV_TEGRA_VIRTUAL_SE_INTERFACE - tristate "Virtual SE interface for Tegra SE crypto algorithms" - depends on ARCH_TEGRA_18x_SOC && CRYPTO_DEV_TEGRA_SE - help - This allows you to use Virtual SE interface for Tegra Crypto algorithms. diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile new file mode 100644 index 000000000..56bd62591 --- /dev/null +++ b/drivers/crypto/Makefile @@ -0,0 +1,11 @@ +GCOV_PROFILE := y + +ccflags-y += -I$(srctree)/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -I$(srctree)/include +obj-$(CONFIG_TEGRA_CRYPTO_DEV) += tegra-cryptodev.o +obj-$(CONFIG_CRYPTO_DEV_TEGRA_SE) += tegra-se.o +obj-$(CONFIG_CRYPTO_DEV_TEGRA_ELLIPTIC_SE) += tegra-se-elp.o +obj-$(CONFIG_CRYPTO_DEV_TEGRA_SE_USE_HOST1X_INTERFACE) += tegra-se-nvhost.o +obj-$(CONFIG_CRYPTO_DEV_TEGRA_VIRTUAL_SE_INTERFACE) += tegra-hv-vse.o diff --git a/drivers/crypto/Makefile.nvidia b/drivers/crypto/Makefile.nvidia deleted file mode 100644 index 56bd62591..000000000 --- a/drivers/crypto/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -GCOV_PROFILE := y - -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -I$(srctree)/include -obj-$(CONFIG_TEGRA_CRYPTO_DEV) += tegra-cryptodev.o -obj-$(CONFIG_CRYPTO_DEV_TEGRA_SE) += tegra-se.o -obj-$(CONFIG_CRYPTO_DEV_TEGRA_ELLIPTIC_SE) += tegra-se-elp.o -obj-$(CONFIG_CRYPTO_DEV_TEGRA_SE_USE_HOST1X_INTERFACE) += tegra-se-nvhost.o -obj-$(CONFIG_CRYPTO_DEV_TEGRA_VIRTUAL_SE_INTERFACE) += tegra-hv-vse.o diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig new file mode 100644 index 000000000..7d44c9284 --- /dev/null +++ b/drivers/dma/Kconfig @@ -0,0 +1,15 @@ +if DMADEVICES + +config TEGRA186_GPC_DMA + bool "NVIDIA Tegra186 GPC DMA support" + depends on ARCH_TEGRA_18x_SOC + select DMA_ENGINE + help + Support for the NVIDIA Tegra186 GPC DMA controller driver. The + DMA controller is having multiple DMA channel which can be + configured for different peripherals like UART, SPI, etc which + are on APB bus. + This DMA controller transfers data from memory to peripheral fifo + or vice versa. It also supports memory to memory data transfer. + +endif diff --git a/drivers/dma/Kconfig.nvidia b/drivers/dma/Kconfig.nvidia deleted file mode 100644 index 90487df10..000000000 --- a/drivers/dma/Kconfig.nvidia +++ /dev/null @@ -1,12 +0,0 @@ -config TEGRA186_GPC_DMA - bool "NVIDIA Tegra186 GPC DMA support" - depends on ARCH_TEGRA_18x_SOC - select DMA_ENGINE - help - Support for the NVIDIA Tegra186 GPC DMA controller driver. The - DMA controller is having multiple DMA channel which can be - configured for different peripherals like UART, SPI, etc which - are on APB bus. - This DMA controller transfers data from memory to peripheral fifo - or vice versa. It also supports memory to memory data transfer. - diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile new file mode 100644 index 000000000..3fb8c670c --- /dev/null +++ b/drivers/dma/Makefile @@ -0,0 +1,9 @@ +ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG +ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG + +ccflags-y += -Werror +ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/drivers/dma +ccflags-$(CONFIG_DMADEVICES) += -I$(srctree) +ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/../nvidia + +obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o diff --git a/drivers/dma/Makefile.nvidia b/drivers/dma/Makefile.nvidia deleted file mode 100644 index 3fb8c670c..000000000 --- a/drivers/dma/Makefile.nvidia +++ /dev/null @@ -1,9 +0,0 @@ -ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG -ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG - -ccflags-y += -Werror -ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/drivers/dma -ccflags-$(CONFIG_DMADEVICES) += -I$(srctree) -ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/../nvidia - -obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig new file mode 100644 index 000000000..aced6473f --- /dev/null +++ b/drivers/gpio/Kconfig @@ -0,0 +1,9 @@ +if GPIOLIB + +config GPIO_TEGRA186 + bool "NVIDIA Tegra186 GPIO support" + select GPIO_SYSFS + help + Support for the NVIDIA Tegra186 GPIO controller driver. + +endif diff --git a/drivers/gpio/Kconfig.nvidia b/drivers/gpio/Kconfig.nvidia deleted file mode 100644 index 9ebf3f440..000000000 --- a/drivers/gpio/Kconfig.nvidia +++ /dev/null @@ -1,5 +0,0 @@ -config GPIO_TEGRA186 - bool "NVIDIA Tegra186 GPIO support" - select GPIO_SYSFS - help - Support for the NVIDIA Tegra186 GPIO controller driver. diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile new file mode 100644 index 000000000..d1a1e6788 --- /dev/null +++ b/drivers/gpio/Makefile @@ -0,0 +1,3 @@ +ccflags-y += -Werror +ccflags-y += -I$(srctree)/../nvidia/include +obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o diff --git a/drivers/gpio/Makefile.nvidia b/drivers/gpio/Makefile.nvidia deleted file mode 100644 index d1a1e6788..000000000 --- a/drivers/gpio/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -ccflags-y += -Werror -ccflags-y += -I$(srctree)/../nvidia/include -obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile new file mode 100644 index 000000000..601d67886 --- /dev/null +++ b/drivers/gpu/drm/tegra/Makefile @@ -0,0 +1,13 @@ +ccflags-y += -Idrivers/gpu/drm/tegra +ccflags-y += -I../nvidia/drivers/gpu/drm/tegra + +tegra-drm-t186-y = \ + vic_t186.o \ + nvenc_t186.o \ + nvdec_t186.o \ + nvjpg_t186.o \ + tsec_t186.o + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +obj-$(CONFIG_TEGRA_HOST1X) += tegra-drm-t186.o +endif diff --git a/drivers/gpu/drm/tegra/Makefile.nvidia b/drivers/gpu/drm/tegra/Makefile.nvidia deleted file mode 100644 index 98d4ee3c8..000000000 --- a/drivers/gpu/drm/tegra/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -ccflags-y += -Idrivers/gpu/drm/tegra -ccflags-y += -I../nvidia/drivers/gpu/drm/tegra - -tegra-drm-t186-y = \ - vic_t186.o \ - nvenc_t186.o \ - nvdec_t186.o \ - nvjpg_t186.o \ - tsec_t186.o - -obj-$(CONFIG_TEGRA_HOST1X) += tegra-drm-t186.o diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile new file mode 100644 index 000000000..0d61d12a6 --- /dev/null +++ b/drivers/gpu/host1x/Makefile @@ -0,0 +1,8 @@ +ccflags-y += -Idrivers/gpu/host1x +ccflags-y += -I../nvidia/drivers/gpu/host1x + +host1x-t186-y = \ + dev_t186.o \ + hw/host1x05.o + +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += host1x-t186.o diff --git a/drivers/gpu/host1x/Makefile.nvidia b/drivers/gpu/host1x/Makefile.nvidia deleted file mode 100644 index 00744ed9f..000000000 --- a/drivers/gpu/host1x/Makefile.nvidia +++ /dev/null @@ -1,8 +0,0 @@ -ccflags-y += -Idrivers/gpu/host1x -ccflags-y += -I../nvidia/drivers/gpu/host1x - -host1x-t186-y = \ - dev_t186.o \ - hw/host1x05.o - -obj-$(CONFIG_TEGRA_HOST1X) += host1x-t186.o diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile new file mode 100644 index 000000000..0717b752f --- /dev/null +++ b/drivers/i2c/Makefile @@ -0,0 +1 @@ +obj-y += busses/ diff --git a/drivers/i2c/Makefile.nvidia b/drivers/i2c/Makefile.nvidia deleted file mode 100644 index 0717b752f..000000000 --- a/drivers/i2c/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-y += busses/ diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig new file mode 100644 index 000000000..f800b3cdd --- /dev/null +++ b/drivers/i2c/busses/Kconfig @@ -0,0 +1,40 @@ +append_menu "I2C Hardware Bus support" + +config I2C_TEGRA_VI + tristate "NVIDIA Tegra internal VII2C controller" + depends on ARCH_TEGRA + default y + select I2C_ALGOBIT + help + If you say yes to this option, support will be included for the + I2C controller embedded in NVIDIA Tegra SOCs + +config I2C_BPMP_TEGRA + tristate "NVIDIA Tegra internal BPMP I2C controller" + depends on TEGRA_BPMP + default y + select I2C_ALGO_BUSCLEAR + select I2C_ALGOBIT + help + If you say yes to this option, support will be included for the + I2C controller embedded in NVIDIA Tegra SOCs accessed via BPMP. + This I2C driver is a 'virtual' I2C driver. The real driver is + embedded in the BPMP firmware, and this driver merely communicates + with that real driver. +config TEGRA_I2CSLV_T186 + bool "Tegra i2c slave controller driver" + default y + help + Enable on-chip i2c slave controller. +config I2C_TEGRA_CAMRTC + bool "Tegra I2C Camera RTCPU driver" + depends on TEGRA_CAMERA_RTCPU + help + If you say yes to this option, support will be included for the + I2C controller embedded in NVIDIA Tegra SOCs accessed via Camera + RTCPU processor. This I2C driver is a 'virtual' I2C driver + compatible with I2C bus driver. The real driver is embedded in the + Camera RTCPU firmware, and this driver merely communicates with + that real driver. + +endmenu diff --git a/drivers/i2c/busses/Kconfig.nvidia b/drivers/i2c/busses/Kconfig.nvidia deleted file mode 100644 index 309587723..000000000 --- a/drivers/i2c/busses/Kconfig.nvidia +++ /dev/null @@ -1,37 +0,0 @@ - -config I2C_TEGRA_VI - tristate "NVIDIA Tegra internal VII2C controller" - depends on ARCH_TEGRA - default y - select I2C_ALGOBIT - help - If you say yes to this option, support will be included for the - I2C controller embedded in NVIDIA Tegra SOCs - -config I2C_BPMP_TEGRA - tristate "NVIDIA Tegra internal BPMP I2C controller" - depends on TEGRA_BPMP - default y - select I2C_ALGO_BUSCLEAR - select I2C_ALGOBIT - help - If you say yes to this option, support will be included for the - I2C controller embedded in NVIDIA Tegra SOCs accessed via BPMP. - This I2C driver is a 'virtual' I2C driver. The real driver is - embedded in the BPMP firmware, and this driver merely communicates - with that real driver. -config TEGRA_I2CSLV_T186 - bool "Tegra i2c slave controller driver" - default y - help - Enable on-chip i2c slave controller. -config I2C_TEGRA_CAMRTC - bool "Tegra I2C Camera RTCPU driver" - depends on TEGRA_CAMERA_RTCPU - help - If you say yes to this option, support will be included for the - I2C controller embedded in NVIDIA Tegra SOCs accessed via Camera - RTCPU processor. This I2C driver is a 'virtual' I2C driver - compatible with I2C bus driver. The real driver is embedded in the - Camera RTCPU firmware, and this driver merely communicates with - that real driver. diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile new file mode 100644 index 000000000..2b0356f7c --- /dev/null +++ b/drivers/i2c/busses/Makefile @@ -0,0 +1,6 @@ +obj-$(CONFIG_I2C_TEGRA_VI) += i2c-tegra-vi.o +#CFLAGS_i2c-bpmp-tegra.o = -Werror +ccflags-y += -I$(srctree)/../nvidia/include +obj-$(CONFIG_I2C_BPMP_TEGRA) += i2c-bpmp-tegra.o +obj-$(CONFIG_TEGRA_I2CSLV_T186) += i2c-t18x-slave.o i2c-t18x-client.o +obj-$(CONFIG_I2C_TEGRA_CAMRTC) += i2c-ivc-single.o i2c-ivc-multi.o i2c-rtcpu.o i2c-rtcpu-clk-config.o diff --git a/drivers/i2c/busses/Makefile.nvidia b/drivers/i2c/busses/Makefile.nvidia deleted file mode 100644 index 2b0356f7c..000000000 --- a/drivers/i2c/busses/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(CONFIG_I2C_TEGRA_VI) += i2c-tegra-vi.o -#CFLAGS_i2c-bpmp-tegra.o = -Werror -ccflags-y += -I$(srctree)/../nvidia/include -obj-$(CONFIG_I2C_BPMP_TEGRA) += i2c-bpmp-tegra.o -obj-$(CONFIG_TEGRA_I2CSLV_T186) += i2c-t18x-slave.o i2c-t18x-client.o -obj-$(CONFIG_I2C_TEGRA_CAMRTC) += i2c-ivc-single.o i2c-ivc-multi.o i2c-rtcpu.o i2c-rtcpu-clk-config.o diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig new file mode 100644 index 000000000..aece33abc --- /dev/null +++ b/drivers/iio/Kconfig @@ -0,0 +1,3 @@ +if IIO +source "drivers/iio/generic/Kconfig" +endif diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile new file mode 100644 index 000000000..7d635afdb --- /dev/null +++ b/drivers/iio/Makefile @@ -0,0 +1 @@ +obj-y += generic/ diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig new file mode 100644 index 000000000..9628f6a4a --- /dev/null +++ b/drivers/iio/accel/Kconfig @@ -0,0 +1,15 @@ +append_menu "Accelerometers" + +# +# Accelerometer drivers +# +# When adding new entries keep the list in alphabetical order + +config NVS_AIS328DQ + tristate "STMicroelectronics accelerometer AIS328DQ" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO + help + Say yes here to build support for STMicroelectronics AIS328DQ + accelerometer using NVS (NVidia Sensor framework). + +endmenu diff --git a/drivers/iio/accel/Kconfig.nvidia b/drivers/iio/accel/Kconfig.nvidia deleted file mode 100644 index 92695d973..000000000 --- a/drivers/iio/accel/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -# -# Accelerometer drivers -# -# When adding new entries keep the list in alphabetical order - -config NVS_AIS328DQ - tristate "STMicroelectronics accelerometer AIS328DQ" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO - help - Say yes here to build support for STMicroelectronics AIS328DQ - accelerometer using NVS (NVidia Sensor framework). diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile new file mode 100644 index 000000000..498154b9d --- /dev/null +++ b/drivers/iio/accel/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for industrial I/O accelerometer drivers +# + +# When adding new entries keep the list in alphabetical order + +obj-$(CONFIG_NVS_AIS328DQ) += nvs_ais328dq.o diff --git a/drivers/iio/accel/Makefile.nvidia b/drivers/iio/accel/Makefile.nvidia deleted file mode 100644 index 498154b9d..000000000 --- a/drivers/iio/accel/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for industrial I/O accelerometer drivers -# - -# When adding new entries keep the list in alphabetical order - -obj-$(CONFIG_NVS_AIS328DQ) += nvs_ais328dq.o diff --git a/drivers/iio/generic/Kconfig b/drivers/iio/generic/Kconfig new file mode 100644 index 000000000..6d65b4856 --- /dev/null +++ b/drivers/iio/generic/Kconfig @@ -0,0 +1,14 @@ +# +# nvs-led-test driver for Testing/Measurements +# + +config NVS_LED_TEST + tristate "LED test sensor device" + depends on SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER + select NVS_IIO + default n + help + This driver adds a LED test NVS_IIO sensor that can be triggered via sysfs + This driver can be built as a module. The module will be called + nvs_led_test. It will trigger a specified gpio when triggered which should + be attached to an LED which will light up for a period of time. diff --git a/drivers/iio/generic/Kconfig.nvidia b/drivers/iio/generic/Kconfig.nvidia deleted file mode 100644 index 6d65b4856..000000000 --- a/drivers/iio/generic/Kconfig.nvidia +++ /dev/null @@ -1,14 +0,0 @@ -# -# nvs-led-test driver for Testing/Measurements -# - -config NVS_LED_TEST - tristate "LED test sensor device" - depends on SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER - select NVS_IIO - default n - help - This driver adds a LED test NVS_IIO sensor that can be triggered via sysfs - This driver can be built as a module. The module will be called - nvs_led_test. It will trigger a specified gpio when triggered which should - be attached to an LED which will light up for a period of time. diff --git a/drivers/iio/generic/Makefile b/drivers/iio/generic/Makefile new file mode 100644 index 000000000..32785cf7e --- /dev/null +++ b/drivers/iio/generic/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for NVidia LED test sensor +# + +obj-$(CONFIG_NVS_LED_TEST) += nvs_led_test.o + +CFLAGS_nvs_led_test.o += -Idrivers/iio diff --git a/drivers/iio/generic/Makefile.nvidia b/drivers/iio/generic/Makefile.nvidia deleted file mode 100644 index 32785cf7e..000000000 --- a/drivers/iio/generic/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for NVidia LED test sensor -# - -obj-$(CONFIG_NVS_LED_TEST) += nvs_led_test.o - -CFLAGS_nvs_led_test.o += -Idrivers/iio diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig new file mode 100644 index 000000000..65f224e65 --- /dev/null +++ b/drivers/iio/gyro/Kconfig @@ -0,0 +1,15 @@ +append_menu "Digital gyroscope sensors" + +# +# Gyroscope drivers +# +# When adding new entries keep the list in alphabetical order + +config NVS_A3G4250D + tristate "STMicroelectronics gyroscope A3G4250D" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO + help + Say yes here to build support for STMicroelectronics A3G4250D + gyroscope using NVS (NVidia Sensor framework). + +endmenu diff --git a/drivers/iio/gyro/Kconfig.nvidia b/drivers/iio/gyro/Kconfig.nvidia deleted file mode 100644 index 21f8c01b2..000000000 --- a/drivers/iio/gyro/Kconfig.nvidia +++ /dev/null @@ -1,12 +0,0 @@ -# -# Gyroscope drivers -# -# When adding new entries keep the list in alphabetical order - -config NVS_A3G4250D - tristate "STMicroelectronics gyroscope A3G4250D" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO - help - Say yes here to build support for STMicroelectronics A3G4250D - gyroscope using NVS (NVidia Sensor framework). - diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile new file mode 100644 index 000000000..e26bd0100 --- /dev/null +++ b/drivers/iio/gyro/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for industrial I/O gyroscope drivers +# + +# When adding new entries keep the list in alphabetical order + +obj-$(CONFIG_NVS_A3G4250D) += nvs_a3g4250d.o diff --git a/drivers/iio/gyro/Makefile.nvidia b/drivers/iio/gyro/Makefile.nvidia deleted file mode 100644 index e26bd0100..000000000 --- a/drivers/iio/gyro/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for industrial I/O gyroscope drivers -# - -# When adding new entries keep the list in alphabetical order - -obj-$(CONFIG_NVS_A3G4250D) += nvs_a3g4250d.o diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig new file mode 100644 index 000000000..cec1e70f8 --- /dev/null +++ b/drivers/iio/imu/Kconfig @@ -0,0 +1,3 @@ +append_menu "Inertial measurement units" +source "drivers/iio/imu/nvi_mpu/Kconfig" +endmenu diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile new file mode 100644 index 000000000..88351dea7 --- /dev/null +++ b/drivers/iio/imu/Makefile @@ -0,0 +1 @@ +obj-y += nvi_mpu/ diff --git a/drivers/iio/imu/nvi_mpu/Kconfig b/drivers/iio/imu/nvi_mpu/Kconfig new file mode 100644 index 000000000..ddf57b081 --- /dev/null +++ b/drivers/iio/imu/nvi_mpu/Kconfig @@ -0,0 +1,14 @@ +# +# nvi-mpu driver for Invensense MPU devices and combos +# + +config NVI_MPU + tristate "Invensense MPU devices" + depends on I2C && SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER && !INV_MPU && NVS_IIO + default n + help + This driver supports the Invensense MPU devices. + This includes MPU6050/MPU65XX/MPU9X50 + This driver can be built as a module. The module will be called + nvi-mpu. + diff --git a/drivers/iio/imu/nvi_mpu/Kconfig.nvidia b/drivers/iio/imu/nvi_mpu/Kconfig.nvidia deleted file mode 100644 index ddf57b081..000000000 --- a/drivers/iio/imu/nvi_mpu/Kconfig.nvidia +++ /dev/null @@ -1,14 +0,0 @@ -# -# nvi-mpu driver for Invensense MPU devices and combos -# - -config NVI_MPU - tristate "Invensense MPU devices" - depends on I2C && SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER && !INV_MPU && NVS_IIO - default n - help - This driver supports the Invensense MPU devices. - This includes MPU6050/MPU65XX/MPU9X50 - This driver can be built as a module. The module will be called - nvi-mpu. - diff --git a/drivers/iio/imu/nvi_mpu/Makefile b/drivers/iio/imu/nvi_mpu/Makefile new file mode 100644 index 000000000..017080d26 --- /dev/null +++ b/drivers/iio/imu/nvi_mpu/Makefile @@ -0,0 +1,21 @@ +# +# Makefile for NVidia Invensense nvi-mpu device. +# + +obj-$(CONFIG_NVI_MPU) += nvi-mpu.o + +nvi-mpu-objs := nvi.o +nvi-mpu-objs += nvi_icm.o +nvi-mpu-objs += nvi_mpu.o +nvi-mpu-objs += nvi_dmp_icm.o +nvi-mpu-objs += nvi_dmp_mpu.o + +CFLAGS_nvi.o += -Idrivers/iio +# Uncomment next line to enable TRACING +# CFLAGS_nvi.o += -DENABLE_TRACE -DCREATE_TRACE_POINTS +# +CFLAGS_nvi_icm.o += -Idrivers/iio +CFLAGS_nvi_mpu.o += -Idrivers/iio +CFLAGS_nvi_dmp_icm.o += -Idrivers/iio +CFLAGS_nvi_dmp_mpu.o += -Idrivers/iio + diff --git a/drivers/iio/imu/nvi_mpu/Makefile.nvidia b/drivers/iio/imu/nvi_mpu/Makefile.nvidia deleted file mode 100644 index 017080d26..000000000 --- a/drivers/iio/imu/nvi_mpu/Makefile.nvidia +++ /dev/null @@ -1,21 +0,0 @@ -# -# Makefile for NVidia Invensense nvi-mpu device. -# - -obj-$(CONFIG_NVI_MPU) += nvi-mpu.o - -nvi-mpu-objs := nvi.o -nvi-mpu-objs += nvi_icm.o -nvi-mpu-objs += nvi_mpu.o -nvi-mpu-objs += nvi_dmp_icm.o -nvi-mpu-objs += nvi_dmp_mpu.o - -CFLAGS_nvi.o += -Idrivers/iio -# Uncomment next line to enable TRACING -# CFLAGS_nvi.o += -DENABLE_TRACE -DCREATE_TRACE_POINTS -# -CFLAGS_nvi_icm.o += -Idrivers/iio -CFLAGS_nvi_mpu.o += -Idrivers/iio -CFLAGS_nvi_dmp_icm.o += -Idrivers/iio -CFLAGS_nvi_dmp_mpu.o += -Idrivers/iio - diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig new file mode 100644 index 000000000..33da25260 --- /dev/null +++ b/drivers/iio/light/Kconfig @@ -0,0 +1,77 @@ +append_menu "Light sensors" + +# +# Light sensor drivers +# +# When adding new entries keep the list in alphabetical order + +config NVS_BH1730FVC + tristate "ROHM BH1730FVC ALS" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT + help + Say Y here for ROHM Co., Ltd. BH1730FVC + Digital 16bit Serial Output Type + Ambient Light Sensor (ALS) support. + + The driver uses the NVS (NVidia Sensor) IIO, light framework. + +config NVS_CM3217 + tristate "Capella CM3217 ALS" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT + help + Say Y here for Capella Microsystems, Inc. CM3217 + Ambient Light Sensor (ALS) support. + + The driver uses the NVS (NVidia Sensor) IIO, light framework. + +config NVS_CM3218 + tristate "Capella CM3218 ALS" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT + help + Say Y here for Capella Microsystems, Inc. CM3218 and CM32181 + Ambient Light Sensor (ALS) driver support. + + The driver uses the NVS (NVidia Sensor) IIO, light framework. + +config NVS_ISL2902X + tristate "INTERSIL ISL2902X ALS/Proximity" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY + help + Say Y here for Intersil ISL29028 and ISL29029 + Ambient Light Sensor (ALS) and proximity driver + support. + + The driver uses the NVS (NVidia Sensor) IIO, light and + proximity framework. + +config NVS_JSA1127 + tristate "SOLTEAMOPTO JSA1127 ALS" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT + help + Say Y here for Solteamopto JSA1127 + Ambient Light Sensor (ALS) driver support. + + The driver uses the NVS (NVidia Sensor) IIO, light framework. + +config NVS_LTR659 + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY + tristate "LITEON LTR-659PS or LTR_558ALS" + help + Say Y here for LITEON LTR-659PS or LTR-558ALS + ALS/proximity sensor driver support. + + The driver uses the NVS (NVidia Sensor) IIO, light and + proximity framework. + +config NVS_MAX4400X + tristate "Maxim MAX4400X ALS/Proximity" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY + help + Say Y here for Maxim MAX44005 and MAX44006/MAX44008 + Ambient Light Sensor (ALS) support. + Proximity is supported on the MAX44005. + + The driver uses the NVS (NVidia Sensor) IIO, light and + proximity framework. + +endmenu diff --git a/drivers/iio/light/Kconfig.nvidia b/drivers/iio/light/Kconfig.nvidia deleted file mode 100644 index 532f71263..000000000 --- a/drivers/iio/light/Kconfig.nvidia +++ /dev/null @@ -1,73 +0,0 @@ -# -# Light sensor drivers -# -# When adding new entries keep the list in alphabetical order - -config NVS_BH1730FVC - tristate "ROHM BH1730FVC ALS" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT - help - Say Y here for ROHM Co., Ltd. BH1730FVC - Digital 16bit Serial Output Type - Ambient Light Sensor (ALS) support. - - The driver uses the NVS (NVidia Sensor) IIO, light framework. - -config NVS_CM3217 - tristate "Capella CM3217 ALS" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT - help - Say Y here for Capella Microsystems, Inc. CM3217 - Ambient Light Sensor (ALS) support. - - The driver uses the NVS (NVidia Sensor) IIO, light framework. - -config NVS_CM3218 - tristate "Capella CM3218 ALS" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT - help - Say Y here for Capella Microsystems, Inc. CM3218 and CM32181 - Ambient Light Sensor (ALS) driver support. - - The driver uses the NVS (NVidia Sensor) IIO, light framework. - -config NVS_ISL2902X - tristate "INTERSIL ISL2902X ALS/Proximity" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY - help - Say Y here for Intersil ISL29028 and ISL29029 - Ambient Light Sensor (ALS) and proximity driver - support. - - The driver uses the NVS (NVidia Sensor) IIO, light and - proximity framework. - -config NVS_JSA1127 - tristate "SOLTEAMOPTO JSA1127 ALS" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT - help - Say Y here for Solteamopto JSA1127 - Ambient Light Sensor (ALS) driver support. - - The driver uses the NVS (NVidia Sensor) IIO, light framework. - -config NVS_LTR659 - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY - tristate "LITEON LTR-659PS or LTR_558ALS" - help - Say Y here for LITEON LTR-659PS or LTR-558ALS - ALS/proximity sensor driver support. - - The driver uses the NVS (NVidia Sensor) IIO, light and - proximity framework. - -config NVS_MAX4400X - tristate "Maxim MAX4400X ALS/Proximity" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_LIGHT && NVS_PROXIMITY - help - Say Y here for Maxim MAX44005 and MAX44006/MAX44008 - Ambient Light Sensor (ALS) support. - Proximity is supported on the MAX44005. - - The driver uses the NVS (NVidia Sensor) IIO, light and - proximity framework. diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile new file mode 100644 index 000000000..fcfcb34fd --- /dev/null +++ b/drivers/iio/light/Makefile @@ -0,0 +1,13 @@ +# +# Makefile for industrial I/O light sensor drivers +# + +# When adding new entries keep the list in alphabetical order + +obj-$(CONFIG_NVS_BH1730FVC) += nvs_bh1730fvc.o +obj-$(CONFIG_NVS_CM3217) += nvs_cm3217.o +obj-$(CONFIG_NVS_CM3218) += nvs_cm3218.o +obj-$(CONFIG_NVS_ISL2902X) += nvs_isl2902x.o +obj-$(CONFIG_NVS_JSA1127) += nvs_jsa1127.o +obj-$(CONFIG_NVS_LTR659) += nvs_ltr659.o +obj-$(CONFIG_NVS_MAX4400X) += nvs_max4400x.o diff --git a/drivers/iio/light/Makefile.nvidia b/drivers/iio/light/Makefile.nvidia deleted file mode 100644 index fcfcb34fd..000000000 --- a/drivers/iio/light/Makefile.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for industrial I/O light sensor drivers -# - -# When adding new entries keep the list in alphabetical order - -obj-$(CONFIG_NVS_BH1730FVC) += nvs_bh1730fvc.o -obj-$(CONFIG_NVS_CM3217) += nvs_cm3217.o -obj-$(CONFIG_NVS_CM3218) += nvs_cm3218.o -obj-$(CONFIG_NVS_ISL2902X) += nvs_isl2902x.o -obj-$(CONFIG_NVS_JSA1127) += nvs_jsa1127.o -obj-$(CONFIG_NVS_LTR659) += nvs_ltr659.o -obj-$(CONFIG_NVS_MAX4400X) += nvs_max4400x.o diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig new file mode 100644 index 000000000..8cc26208c --- /dev/null +++ b/drivers/iio/magnetometer/Kconfig @@ -0,0 +1,19 @@ +append_menu "Magnetometer sensors" + +# +# Magnetometer sensors +# +# When adding new entries keep the list in alphabetical order + + +config NVI_AK89XX + tristate "Asahi Kasei AK89XX 3-Axis Magnetometer" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO + help + Say yes here to build support for Asahi Kasei AK89XX 3-Axis + Magnetometer that can be connected via Invensense MPU. + + To compile this driver as a module, choose M here: the module + will be called nvi-ak89xx. + +endmenu diff --git a/drivers/iio/magnetometer/Kconfig.nvidia b/drivers/iio/magnetometer/Kconfig.nvidia deleted file mode 100644 index a1e37cce9..000000000 --- a/drivers/iio/magnetometer/Kconfig.nvidia +++ /dev/null @@ -1,16 +0,0 @@ -# -# Magnetometer sensors -# -# When adding new entries keep the list in alphabetical order - - -config NVI_AK89XX - tristate "Asahi Kasei AK89XX 3-Axis Magnetometer" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO - help - Say yes here to build support for Asahi Kasei AK89XX 3-Axis - Magnetometer that can be connected via Invensense MPU. - - To compile this driver as a module, choose M here: the module - will be called nvi-ak89xx. - diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile new file mode 100644 index 000000000..e36bd6f4e --- /dev/null +++ b/drivers/iio/magnetometer/Makefile @@ -0,0 +1,19 @@ +# +# Makefile for industrial I/O Magnetometer sensor drivers +# + +# When adding new entries keep the list in alphabetical order + +obj-$(CONFIG_NVI_AK89XX) += nvi-ak89xx.o +# Uncomment next line to enable TRACING +# CFLAGS_nvi_ak89xx.o += -DENABLE_TRACE +# +ifneq (,$(filter $(CONFIG_NVI_AK89XX),m)) +# Uncomment next line to enable TRACING +# CFLAGS_nvi_ak89xx.o += -DCREATE_TRACE_POINTS +# +endif +ifdef CONFIG_NVI_MPU + CFLAGS_nvi_ak89xx.o += -DAKM_NVI_MPU_SUPPORT=1 +endif +nvi-ak89xx-objs += nvi_ak89xx.o diff --git a/drivers/iio/magnetometer/Makefile.nvidia b/drivers/iio/magnetometer/Makefile.nvidia deleted file mode 100644 index e36bd6f4e..000000000 --- a/drivers/iio/magnetometer/Makefile.nvidia +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for industrial I/O Magnetometer sensor drivers -# - -# When adding new entries keep the list in alphabetical order - -obj-$(CONFIG_NVI_AK89XX) += nvi-ak89xx.o -# Uncomment next line to enable TRACING -# CFLAGS_nvi_ak89xx.o += -DENABLE_TRACE -# -ifneq (,$(filter $(CONFIG_NVI_AK89XX),m)) -# Uncomment next line to enable TRACING -# CFLAGS_nvi_ak89xx.o += -DCREATE_TRACE_POINTS -# -endif -ifdef CONFIG_NVI_MPU - CFLAGS_nvi_ak89xx.o += -DAKM_NVI_MPU_SUPPORT=1 -endif -nvi-ak89xx-objs += nvi_ak89xx.o diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig new file mode 100644 index 000000000..10b8c5652 --- /dev/null +++ b/drivers/iio/pressure/Kconfig @@ -0,0 +1,18 @@ +append_menu "Pressure sensors" + +# +# Pressure drivers +# +# When adding new entries keep the list in alphabetical order + +config NVI_BMPX80 + tristate "Bosch Digital pressure sensor" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO + help + Say yes here to build support for Bosch pressure sensor + that can be connected via Invensense MPU. + + To compile this driver as a module, choose M here: the module + will be called nvi-bmpX80. + +endmenu diff --git a/drivers/iio/pressure/Kconfig.nvidia b/drivers/iio/pressure/Kconfig.nvidia deleted file mode 100644 index 08e24a0e0..000000000 --- a/drivers/iio/pressure/Kconfig.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -# -# Pressure drivers -# -# When adding new entries keep the list in alphabetical order - -config NVI_BMPX80 - tristate "Bosch Digital pressure sensor" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO - help - Say yes here to build support for Bosch pressure sensor - that can be connected via Invensense MPU. - - To compile this driver as a module, choose M here: the module - will be called nvi-bmpX80. - diff --git a/drivers/iio/pressure/Makefile b/drivers/iio/pressure/Makefile new file mode 100644 index 000000000..0cbc76179 --- /dev/null +++ b/drivers/iio/pressure/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for industrial I/O pressure drivers +# + +# When adding new entries keep the list in alphabetical order + +obj-$(CONFIG_NVI_BMPX80) += nvi-bmpX80.o +ifdef CONFIG_NVI_MPU + CFLAGS_nvi_bmpX80.o += -DBMP_NVI_MPU_SUPPORT=1 +endif +nvi-bmpX80-objs += nvi_bmpX80.o diff --git a/drivers/iio/pressure/Makefile.nvidia b/drivers/iio/pressure/Makefile.nvidia deleted file mode 100644 index 0cbc76179..000000000 --- a/drivers/iio/pressure/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -# -# Makefile for industrial I/O pressure drivers -# - -# When adding new entries keep the list in alphabetical order - -obj-$(CONFIG_NVI_BMPX80) += nvi-bmpX80.o -ifdef CONFIG_NVI_MPU - CFLAGS_nvi_bmpX80.o += -DBMP_NVI_MPU_SUPPORT=1 -endif -nvi-bmpX80-objs += nvi_bmpX80.o diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig new file mode 100644 index 000000000..b152dc2e3 --- /dev/null +++ b/drivers/iio/proximity/Kconfig @@ -0,0 +1,16 @@ +menu "Proximity sensors" + +# +# Proximity sensors +# + +config NVS_IQS2X3 + tristate "Azoteq IQS253/IQS263 SAR proximity" + depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_PROXIMITY + help + Say Y here for Azoteq IQS253 and IQS263 SAR proximity support. + + The driver uses the NVS (NVidia Sensor) IIO and proximity + framework. + +endmenu diff --git a/drivers/iio/proximity/Kconfig.nvidia b/drivers/iio/proximity/Kconfig.nvidia deleted file mode 100644 index bc1526bad..000000000 --- a/drivers/iio/proximity/Kconfig.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -# -# Proximity sensors -# - -config NVS_IQS2X3 - tristate "Azoteq IQS253/IQS263 SAR proximity" - depends on I2C && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO && NVS_PROXIMITY - help - Say Y here for Azoteq IQS253 and IQS263 SAR proximity support. - - The driver uses the NVS (NVidia Sensor) IIO and proximity - framework. - diff --git a/drivers/iio/proximity/Makefile b/drivers/iio/proximity/Makefile new file mode 100644 index 000000000..194d2594d --- /dev/null +++ b/drivers/iio/proximity/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for IIO proximity sensors +# + +# When adding new entries keep the list in alphabetical order + +ccflags-y += -Werror +obj-$(CONFIG_NVS_IQS2X3) += nvs_iqs2x3.o diff --git a/drivers/iio/proximity/Makefile.nvidia b/drivers/iio/proximity/Makefile.nvidia deleted file mode 100644 index 194d2594d..000000000 --- a/drivers/iio/proximity/Makefile.nvidia +++ /dev/null @@ -1,8 +0,0 @@ -# -# Makefile for IIO proximity sensors -# - -# When adding new entries keep the list in alphabetical order - -ccflags-y += -Werror -obj-$(CONFIG_NVS_IQS2X3) += nvs_iqs2x3.o diff --git a/drivers/input/Makefile b/drivers/input/Makefile new file mode 100644 index 000000000..51db8266c --- /dev/null +++ b/drivers/input/Makefile @@ -0,0 +1,3 @@ +obj-y += touchscreen/ + +obj-$(CONFIG_INPUT_CFBOOST) += input-cfboost.o diff --git a/drivers/input/Makefile.nvidia b/drivers/input/Makefile.nvidia deleted file mode 100644 index 51db8266c..000000000 --- a/drivers/input/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += touchscreen/ - -obj-$(CONFIG_INPUT_CFBOOST) += input-cfboost.o diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig new file mode 100644 index 000000000..fb5033c8f --- /dev/null +++ b/drivers/input/touchscreen/Kconfig @@ -0,0 +1,44 @@ +if INPUT_TOUCHSCREEN + +config TOUCHSCREEN_NVIDIA_ATMEL_MXT + tristate "NVIDIA Atmel mXT I2C Touchscreen" + depends on I2C + select FW_LOADER + help + Say Y here if you have Atmel mXT series I2C touchscreen, + such as AT42QT602240/ATMXT224, connected to your system. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called atmel_mxt_ts. + + It is Nvidia Atmel driver which is impoved based on + atmel k3.14 driver. + +config TOUCHSCREEN_LR388K7 + tristate "Sharp LR388K7 touchscreen" + depends on SPI_MASTER + help + Say Y here if you have a LR388K7 and want to enable + support for the built-in touchscreen. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called lr388k7. + +config TOUCHSCREEN_RM31080A + tristate "RAYDIUM_31080A based touchscreens" + depends on SPI_MASTER + help + Say Y here if you have a touchscreen interface using the + RAYDIUM_T31080A controller, and your board-specific initialization + code includes that in its table of SPI devices. + + If unsure, say N (but it's safe to say "Y"). + + To compile this driver as a module, choose M here: the + module will be called RAYDIUM_31080A. + +endif diff --git a/drivers/input/touchscreen/Kconfig.nvidia b/drivers/input/touchscreen/Kconfig.nvidia deleted file mode 100644 index 7a76f9d2b..000000000 --- a/drivers/input/touchscreen/Kconfig.nvidia +++ /dev/null @@ -1,40 +0,0 @@ -config TOUCHSCREEN_NVIDIA_ATMEL_MXT - tristate "NVIDIA Atmel mXT I2C Touchscreen" - depends on I2C - select FW_LOADER - help - Say Y here if you have Atmel mXT series I2C touchscreen, - such as AT42QT602240/ATMXT224, connected to your system. - - If unsure, say N. - - To compile this driver as a module, choose M here: the - module will be called atmel_mxt_ts. - - It is Nvidia Atmel driver which is impoved based on - atmel k3.14 driver. - -config TOUCHSCREEN_LR388K7 - tristate "Sharp LR388K7 touchscreen" - depends on SPI_MASTER - help - Say Y here if you have a LR388K7 and want to enable - support for the built-in touchscreen. - - If unsure, say N. - - To compile this driver as a module, choose M here: the - module will be called lr388k7. - -config TOUCHSCREEN_RM31080A - tristate "RAYDIUM_31080A based touchscreens" - depends on SPI_MASTER - help - Say Y here if you have a touchscreen interface using the - RAYDIUM_T31080A controller, and your board-specific initialization - code includes that in its table of SPI devices. - - If unsure, say N (but it's safe to say "Y"). - - To compile this driver as a module, choose M here: the - module will be called RAYDIUM_31080A. diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile new file mode 100644 index 000000000..bb3b1a6e5 --- /dev/null +++ b/drivers/input/touchscreen/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_TOUCHSCREEN_NVIDIA_ATMEL_MXT) += atmel_mxt_ts.o +obj-$(CONFIG_TOUCHSCREEN_RM31080A) += rm31080a_ts.o rm31080a_ctrl.o +obj-$(CONFIG_TOUCHSCREEN_LR388K7) += lr388k7_ts.o diff --git a/drivers/input/touchscreen/Makefile.nvidia b/drivers/input/touchscreen/Makefile.nvidia deleted file mode 100644 index bb3b1a6e5..000000000 --- a/drivers/input/touchscreen/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_TOUCHSCREEN_NVIDIA_ATMEL_MXT) += atmel_mxt_ts.o -obj-$(CONFIG_TOUCHSCREEN_RM31080A) += rm31080a_ts.o rm31080a_ctrl.o -obj-$(CONFIG_TOUCHSCREEN_LR388K7) += lr388k7_ts.o diff --git a/drivers/media/Makefile b/drivers/media/Makefile new file mode 100644 index 000000000..9c93f0c06 --- /dev/null +++ b/drivers/media/Makefile @@ -0,0 +1,3 @@ +obj-y += i2c/ +obj-y += spi/ +obj-y += platform/ diff --git a/drivers/media/Makefile.nvidia b/drivers/media/Makefile.nvidia deleted file mode 100644 index 9c93f0c06..000000000 --- a/drivers/media/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += i2c/ -obj-y += spi/ -obj-y += platform/ diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig new file mode 100644 index 000000000..ee842dc62 --- /dev/null +++ b/drivers/media/i2c/Kconfig @@ -0,0 +1,104 @@ +if VIDEO_V4L2 + +menu "NVIDIA overlay Encoders, decoders, sensors and other helper chips" + visible if !MEDIA_SUBDRV_AUTOSELECT || COMPILE_TEST + +config VIDEO_IMX185 + tristate "IMX185 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a Video4Linux2 sensor-level driver for the Sony + IMX185 camera sensor + + To compile this driver as a module, choose M here: the module + will be called imx185. + +config VIDEO_IMX219 + tristate "IMX219 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This driver supports IMX219 camera sensor from Sony + + To compile this driver as a module, choose M here: the module + will be called imx219. + +config VIDEO_IMX274 + tristate "IMX274 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a Video4Linux2 sensor-level driver for the Sony + IMX274 camera sensor + + To compile this driver as a module, choose M here: the module + will be called imx274. + +config VIDEO_LC898212 + tristate "LC898212 focuser support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This driver supports LC898212 camera focuser + + To compile this driver as a module, choose M here: the module + will be called lc898212. + +config VIDEO_OV5693 + tristate "OV5693 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a Video4Linux2 sensor-level driver for the OmniVision + OV5693 camera. + + To compile this driver as a module, choose M here: the module + will be called ov5693. + +config VIDEO_OV9281 + tristate "OmniVision OV9281 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a Video4Linux2 sensor driver for the OmniVision + OV9281 camera sensor, for use with the tegra isp. + + To compile this driver as a module, choose M here: the module + will be called ov9281. + +config VIDEO_OV10823 + tristate "OmniVision OV10823 camera sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a Video4Linux2 sensor driver for the OmniVision + OV10823 camera sensor, for use with the tegra isp. + + To compile this driver as a module, choose M here: the module + will be called ov10823. + +config VIDEO_OV23850 + tristate "OmniVision OV23850 sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This driver supports OmniVision OV23850 camera sensor + + To compile this driver as a module, choose M here: the module + will be called ov23850. + +config I2C_IOEXPANDER_PCA9570 + tristate "nxp PCA9570 I2C IO Expander" + help + If you say yes here you get support for the nxp PCA9570 + I2C IO Expander devices. + + To compile this driver as a module, choose M here: the module + will be called pca9570. + +config VIDEO_TC358840 + tristate "Toshiba TC358840 decoder" + depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API + select HDMI + ---help--- + Support for the Toshiba TC358840 HDMI to MIPI CSI-2 bridge. + + To compile this driver as a module, choose M here: the + module will be called tc358840. + +endmenu + +endif diff --git a/drivers/media/i2c/Kconfig.nvidia b/drivers/media/i2c/Kconfig.nvidia deleted file mode 100644 index 46f106c52..000000000 --- a/drivers/media/i2c/Kconfig.nvidia +++ /dev/null @@ -1,96 +0,0 @@ - -config VIDEO_IMX185 - tristate "IMX185 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This is a Video4Linux2 sensor-level driver for the Sony - IMX185 camera sensor - - To compile this driver as a module, choose M here: the module - will be called imx185. - -config VIDEO_IMX219 - tristate "IMX219 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This driver supports IMX219 camera sensor from Sony - - To compile this driver as a module, choose M here: the module - will be called imx219. - -config VIDEO_IMX274 - tristate "IMX274 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This is a Video4Linux2 sensor-level driver for the Sony - IMX274 camera sensor - - To compile this driver as a module, choose M here: the module - will be called imx274. - -config VIDEO_LC898212 - tristate "LC898212 focuser support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This driver supports LC898212 camera focuser - - To compile this driver as a module, choose M here: the module - will be called lc898212. - -config VIDEO_OV5693 - tristate "OV5693 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This is a Video4Linux2 sensor-level driver for the OmniVision - OV5693 camera. - - To compile this driver as a module, choose M here: the module - will be called ov5693. - -config VIDEO_OV9281 - tristate "OmniVision OV9281 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This is a Video4Linux2 sensor driver for the OmniVision - OV9281 camera sensor, for use with the tegra isp. - - To compile this driver as a module, choose M here: the module - will be called ov9281. - -config VIDEO_OV10823 - tristate "OmniVision OV10823 camera sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This is a Video4Linux2 sensor driver for the OmniVision - OV10823 camera sensor, for use with the tegra isp. - - To compile this driver as a module, choose M here: the module - will be called ov10823. - -config VIDEO_OV23850 - tristate "OmniVision OV23850 sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - ---help--- - This driver supports OmniVision OV23850 camera sensor - - To compile this driver as a module, choose M here: the module - will be called ov23850. - -config I2C_IOEXPANDER_PCA9570 - tristate "nxp PCA9570 I2C IO Expander" - help - If you say yes here you get support for the nxp PCA9570 - I2C IO Expander devices. - - To compile this driver as a module, choose M here: the module - will be called pca9570. - -config VIDEO_TC358840 - tristate "Toshiba TC358840 decoder" - depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API - select HDMI - ---help--- - Support for the Toshiba TC358840 HDMI to MIPI CSI-2 bridge. - - To compile this driver as a module, choose M here: the - module will be called tc358840. diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile new file mode 100644 index 000000000..f1f14864f --- /dev/null +++ b/drivers/media/i2c/Makefile @@ -0,0 +1,15 @@ +subdir-ccflags-y += -Werror + +ccflags-y += -I$(srctree)/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/drivers/video/tegra/camera + +obj-$(CONFIG_VIDEO_IMX185) += imx185.o +obj-$(CONFIG_VIDEO_IMX219) += imx219.o +obj-$(CONFIG_VIDEO_IMX274) += imx274.o +obj-$(CONFIG_VIDEO_LC898212) += lc898212.o +obj-$(CONFIG_VIDEO_OV5693) += ov5693.o +obj-$(CONFIG_VIDEO_OV9281) += ov9281.o +obj-$(CONFIG_VIDEO_OV10823) += ov10823.o +obj-$(CONFIG_VIDEO_OV23850) += ov23850.o +obj-$(CONFIG_I2C_IOEXPANDER_PCA9570) += pca9570.o +obj-$(CONFIG_VIDEO_TC358840) += tc358840.o diff --git a/drivers/media/i2c/Makefile.nvidia b/drivers/media/i2c/Makefile.nvidia deleted file mode 100644 index f1f14864f..000000000 --- a/drivers/media/i2c/Makefile.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -subdir-ccflags-y += -Werror - -ccflags-y += -I$(srctree)/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/drivers/video/tegra/camera - -obj-$(CONFIG_VIDEO_IMX185) += imx185.o -obj-$(CONFIG_VIDEO_IMX219) += imx219.o -obj-$(CONFIG_VIDEO_IMX274) += imx274.o -obj-$(CONFIG_VIDEO_LC898212) += lc898212.o -obj-$(CONFIG_VIDEO_OV5693) += ov5693.o -obj-$(CONFIG_VIDEO_OV9281) += ov9281.o -obj-$(CONFIG_VIDEO_OV10823) += ov10823.o -obj-$(CONFIG_VIDEO_OV23850) += ov23850.o -obj-$(CONFIG_I2C_IOEXPANDER_PCA9570) += pca9570.o -obj-$(CONFIG_VIDEO_TC358840) += tc358840.o diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig new file mode 100644 index 000000000..09e97cf1f --- /dev/null +++ b/drivers/media/platform/Kconfig @@ -0,0 +1,3 @@ +menu "NVIDIA overlay V4L platform devices" +source "drivers/media/platform/tegra/Kconfig" +endmenu diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile new file mode 100644 index 000000000..3d50fea2a --- /dev/null +++ b/drivers/media/platform/Makefile @@ -0,0 +1 @@ +obj-y += tegra/ diff --git a/drivers/media/platform/Makefile.nvidia b/drivers/media/platform/Makefile.nvidia deleted file mode 100644 index 3d50fea2a..000000000 --- a/drivers/media/platform/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-y += tegra/ diff --git a/drivers/media/platform/tegra/Kconfig b/drivers/media/platform/tegra/Kconfig new file mode 100644 index 000000000..9075bc727 --- /dev/null +++ b/drivers/media/platform/tegra/Kconfig @@ -0,0 +1,44 @@ +source "drivers/media/platform/tegra/mipical/Kconfig" + +config VIDEO_CAMERA + tristate "generic camera device support" + depends on I2C && ARCH_TEGRA + select REGMAP_I2C + ---help--- + This is a driver for generic camera devices + for use with the tegra isp. + +config VIDEO_TEGRA_VI + depends on TEGRA_GRHOST + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF + select VIDEOBUF2_DMA_CONTIG + tristate "Tegra video input host1x client driver" + default y + help + Driver for the Tegra video input hardware based on + media controller framework and interact with host1x + apis to support both user space as well as kernel + programming of VI hardware registers + To compile this driver as a module, choose M here: + the module will be called nvhost-vi. + +config VIDEO_TEGRA_VI_TPG + depends on VIDEO_TEGRA_VI + tristate "Tegra video input test pattern generator driver" + default m + help + Driver for the Tegra video input test pattern generator + driver is based on media controller framework and interact + with host1x apis to support both user space as well as kernel + programming of VI hardware registers to generate predefined + test patterns. + To compile this driver as a module, choose M here: + the module will be called nvhost-vi-tpg. + +config VIDEO_ISC + tristate "ISC(Image Sensor Control) device support" + depends on I2C && ARCH_TEGRA + ---help--- + This is a driver for the ISC + for controlling power, interrupt and registering + i2c clients related to image sensor. diff --git a/drivers/media/platform/tegra/Kconfig.nvidia b/drivers/media/platform/tegra/Kconfig.nvidia deleted file mode 100644 index 3eeef2916..000000000 --- a/drivers/media/platform/tegra/Kconfig.nvidia +++ /dev/null @@ -1,45 +0,0 @@ - -source "../nvidia/drivers/media/platform/tegra/mipical/Kconfig.nvidia" - -config VIDEO_CAMERA - tristate "generic camera device support" - depends on I2C && ARCH_TEGRA - select REGMAP_I2C - ---help--- - This is a driver for generic camera devices - for use with the tegra isp. - -config VIDEO_TEGRA_VI - depends on TEGRA_GRHOST - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF - select VIDEOBUF2_DMA_CONTIG - tristate "Tegra video input host1x client driver" - default y - help - Driver for the Tegra video input hardware based on - media controller framework and interact with host1x - apis to support both user space as well as kernel - programming of VI hardware registers - To compile this driver as a module, choose M here: - the module will be called nvhost-vi. - -config VIDEO_TEGRA_VI_TPG - depends on VIDEO_TEGRA_VI - tristate "Tegra video input test pattern generator driver" - default m - help - Driver for the Tegra video input test pattern generator - driver is based on media controller framework and interact - with host1x apis to support both user space as well as kernel - programming of VI hardware registers to generate predefined - test patterns. - To compile this driver as a module, choose M here: - the module will be called nvhost-vi-tpg. - -config VIDEO_ISC - tristate "ISC(Image Sensor Control) device support" - depends on I2C && ARCH_TEGRA - ---help--- - This is a driver for the ISC - for controlling power, interrupt and registering - i2c clients related to image sensor. diff --git a/drivers/media/platform/tegra/Makefile b/drivers/media/platform/tegra/Makefile new file mode 100644 index 000000000..4a8a01c5e --- /dev/null +++ b/drivers/media/platform/tegra/Makefile @@ -0,0 +1,12 @@ +GCOV_PROFILE := y + +#subdir-ccflags-y := -Werror +# +# Makefile for the video capture/playback device drivers. +# +obj-$(CONFIG_VIDEO_CAMERA) += camera/ +obj-$(CONFIG_VIDEO_TEGRA_VI) += vi/ +obj-$(CONFIG_VIDEO_CAMERA) += regmap_util.o +obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += tpg/ +obj-$(CONFIG_TEGRA_MIPI_CAL) += mipical/ +obj-$(CONFIG_VIDEO_ISC) += isc/ diff --git a/drivers/media/platform/tegra/Makefile.nvidia b/drivers/media/platform/tegra/Makefile.nvidia deleted file mode 100644 index 4a8a01c5e..000000000 --- a/drivers/media/platform/tegra/Makefile.nvidia +++ /dev/null @@ -1,12 +0,0 @@ -GCOV_PROFILE := y - -#subdir-ccflags-y := -Werror -# -# Makefile for the video capture/playback device drivers. -# -obj-$(CONFIG_VIDEO_CAMERA) += camera/ -obj-$(CONFIG_VIDEO_TEGRA_VI) += vi/ -obj-$(CONFIG_VIDEO_CAMERA) += regmap_util.o -obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += tpg/ -obj-$(CONFIG_TEGRA_MIPI_CAL) += mipical/ -obj-$(CONFIG_VIDEO_ISC) += isc/ diff --git a/drivers/media/platform/tegra/camera/Makefile b/drivers/media/platform/tegra/camera/Makefile new file mode 100644 index 000000000..292550a26 --- /dev/null +++ b/drivers/media/platform/tegra/camera/Makefile @@ -0,0 +1,14 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host +ccflags-y += -I$(srctree)/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -Werror + +obj-y += vi/ +obj-y += csi/ +obj-y += camera_common.o camera_gpio.o sensor_common.o camera_version_utils.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_common.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/isp_channel.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/capture_isp.o diff --git a/drivers/media/platform/tegra/camera/Makefile.nvidia b/drivers/media/platform/tegra/camera/Makefile.nvidia deleted file mode 100644 index 292550a26..000000000 --- a/drivers/media/platform/tegra/camera/Makefile.nvidia +++ /dev/null @@ -1,14 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -Werror - -obj-y += vi/ -obj-y += csi/ -obj-y += camera_common.o camera_gpio.o sensor_common.o camera_version_utils.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_common.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/isp_channel.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/capture_isp.o diff --git a/drivers/media/platform/tegra/camera/csi/Makefile b/drivers/media/platform/tegra/camera/csi/Makefile new file mode 100644 index 000000000..7fcd48c53 --- /dev/null +++ b/drivers/media/platform/tegra/camera/csi/Makefile @@ -0,0 +1,8 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Werror + +obj-y += csi.o csi2_fops.o csi4_fops.o diff --git a/drivers/media/platform/tegra/camera/csi/Makefile.nvidia b/drivers/media/platform/tegra/camera/csi/Makefile.nvidia deleted file mode 100644 index 7fcd48c53..000000000 --- a/drivers/media/platform/tegra/camera/csi/Makefile.nvidia +++ /dev/null @@ -1,8 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Werror - -obj-y += csi.o csi2_fops.o csi4_fops.o diff --git a/drivers/media/platform/tegra/camera/vi/Makefile b/drivers/media/platform/tegra/camera/vi/Makefile new file mode 100644 index 000000000..77884f3dd --- /dev/null +++ b/drivers/media/platform/tegra/camera/vi/Makefile @@ -0,0 +1,25 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Werror + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o vi4_fops.o +endif + +ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host +endif + +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_vi_channel.o + +ifeq ($(CONFIG_ARCH_TEGRA_210_SOC),y) +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ +obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o +endif diff --git a/drivers/media/platform/tegra/camera/vi/Makefile.nvidia b/drivers/media/platform/tegra/camera/vi/Makefile.nvidia deleted file mode 100644 index 77884f3dd..000000000 --- a/drivers/media/platform/tegra/camera/vi/Makefile.nvidia +++ /dev/null @@ -1,25 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Werror - -ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o vi4_fops.o -endif - -ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host -endif - -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_vi_channel.o - -ifeq ($(CONFIG_ARCH_TEGRA_210_SOC),y) -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ -obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o -endif diff --git a/drivers/media/platform/tegra/isc/Makefile b/drivers/media/platform/tegra/isc/Makefile new file mode 100644 index 000000000..359d479df --- /dev/null +++ b/drivers/media/platform/tegra/isc/Makefile @@ -0,0 +1,6 @@ +GCOV_PROFILE := y + +obj-$(CONFIG_VIDEO_ISC) += isc_gpio.o +obj-$(CONFIG_VIDEO_ISC) += isc_mgr.o +obj-$(CONFIG_VIDEO_ISC) += isc_dev.o +obj-$(CONFIG_VIDEO_ISC) += isc_pwm.o diff --git a/drivers/media/platform/tegra/isc/Makefile.nvidia b/drivers/media/platform/tegra/isc/Makefile.nvidia deleted file mode 100644 index 359d479df..000000000 --- a/drivers/media/platform/tegra/isc/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -GCOV_PROFILE := y - -obj-$(CONFIG_VIDEO_ISC) += isc_gpio.o -obj-$(CONFIG_VIDEO_ISC) += isc_mgr.o -obj-$(CONFIG_VIDEO_ISC) += isc_dev.o -obj-$(CONFIG_VIDEO_ISC) += isc_pwm.o diff --git a/drivers/media/platform/tegra/mipical/Kconfig b/drivers/media/platform/tegra/mipical/Kconfig new file mode 100644 index 000000000..e00659b2b --- /dev/null +++ b/drivers/media/platform/tegra/mipical/Kconfig @@ -0,0 +1,11 @@ +config TEGRA_MIPI_CAL + depends on TEGRA_DC || TEGRA_CAMERA_PLATFORM + bool "Enable MIPI Cal driver" + default y + select REGMAP + select REGMAP_MMIO + help + Provides an interfaces to do MIPI calibration for both DSI and CSI blocks. + You will always want this enabled if you are using either Camera or Display. + Disabling this can cause issues for drivers that depend on it being present. + Leaving this on is harmless even if no drivers that need it are enabled. diff --git a/drivers/media/platform/tegra/mipical/Kconfig.nvidia b/drivers/media/platform/tegra/mipical/Kconfig.nvidia deleted file mode 100644 index e00659b2b..000000000 --- a/drivers/media/platform/tegra/mipical/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -config TEGRA_MIPI_CAL - depends on TEGRA_DC || TEGRA_CAMERA_PLATFORM - bool "Enable MIPI Cal driver" - default y - select REGMAP - select REGMAP_MMIO - help - Provides an interfaces to do MIPI calibration for both DSI and CSI blocks. - You will always want this enabled if you are using either Camera or Display. - Disabling this can cause issues for drivers that depend on it being present. - Leaving this on is harmless even if no drivers that need it are enabled. diff --git a/drivers/media/platform/tegra/mipical/Makefile b/drivers/media/platform/tegra/mipical/Makefile new file mode 100644 index 000000000..ffd996e09 --- /dev/null +++ b/drivers/media/platform/tegra/mipical/Makefile @@ -0,0 +1,6 @@ +GCOV_PROFILE := y +# +# Makefile for Mipical driver +# +obj-$(CONFIG_TEGRA_MIPI_CAL) += mipi_cal.o +obj-$(CONFIG_TEGRA_MIPI_CAL) += vmipi/vmipi.o diff --git a/drivers/media/platform/tegra/mipical/Makefile.nvidia b/drivers/media/platform/tegra/mipical/Makefile.nvidia deleted file mode 100644 index ffd996e09..000000000 --- a/drivers/media/platform/tegra/mipical/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -GCOV_PROFILE := y -# -# Makefile for Mipical driver -# -obj-$(CONFIG_TEGRA_MIPI_CAL) += mipi_cal.o -obj-$(CONFIG_TEGRA_MIPI_CAL) += vmipi/vmipi.o diff --git a/drivers/media/platform/tegra/tpg/Makefile b/drivers/media/platform/tegra/tpg/Makefile new file mode 100644 index 000000000..3a94af88b --- /dev/null +++ b/drivers/media/platform/tegra/tpg/Makefile @@ -0,0 +1,20 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Werror + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +nvhost-vi-tpg-objs += tpg_t18x.o +else +nvhost-vi-tpg-objs += tpg_t21x.o +endif + +ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) +nvhost-vi-tpg-t19x-objs += tpg_t19x.o +endif + +obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += nvhost-vi-tpg.o +ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) +obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += nvhost-vi-tpg-t19x.o +endif diff --git a/drivers/media/platform/tegra/tpg/Makefile.nvidia b/drivers/media/platform/tegra/tpg/Makefile.nvidia deleted file mode 100644 index 3a94af88b..000000000 --- a/drivers/media/platform/tegra/tpg/Makefile.nvidia +++ /dev/null @@ -1,20 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Werror - -ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -nvhost-vi-tpg-objs += tpg_t18x.o -else -nvhost-vi-tpg-objs += tpg_t21x.o -endif - -ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) -nvhost-vi-tpg-t19x-objs += tpg_t19x.o -endif - -obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += nvhost-vi-tpg.o -ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) -obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += nvhost-vi-tpg-t19x.o -endif diff --git a/drivers/media/platform/tegra/vi/Makefile b/drivers/media/platform/tegra/vi/Makefile new file mode 100644 index 000000000..da13dd5dc --- /dev/null +++ b/drivers/media/platform/tegra/vi/Makefile @@ -0,0 +1,13 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -Werror + +nvhost-vi-objs += vi.o +nvhost-vi-objs += vi_irq.o +nvhost-vi-objs += tegra_vi.o + +obj-$(CONFIG_VIDEO_TEGRA_VI) += nvhost-vi.o diff --git a/drivers/media/platform/tegra/vi/Makefile.nvidia b/drivers/media/platform/tegra/vi/Makefile.nvidia deleted file mode 100644 index da13dd5dc..000000000 --- a/drivers/media/platform/tegra/vi/Makefile.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/ -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -Werror - -nvhost-vi-objs += vi.o -nvhost-vi-objs += vi_irq.o -nvhost-vi-objs += tegra_vi.o - -obj-$(CONFIG_VIDEO_TEGRA_VI) += nvhost-vi.o diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig new file mode 100644 index 000000000..bf401f57a --- /dev/null +++ b/drivers/media/spi/Kconfig @@ -0,0 +1,12 @@ + +config VIDEO_IMX204 + tristate "IMX204 camera sensor support" + depends on SPI && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + select REGMAP_SPI + ---help--- + This is a Video4Linux2 sensor-level driver for the Sony + IMX204 camera sensor + + To compile this driver as a module, choose M here: the module + will be called imx204. + diff --git a/drivers/media/spi/Kconfig.nvidia b/drivers/media/spi/Kconfig.nvidia deleted file mode 100644 index bf401f57a..000000000 --- a/drivers/media/spi/Kconfig.nvidia +++ /dev/null @@ -1,12 +0,0 @@ - -config VIDEO_IMX204 - tristate "IMX204 camera sensor support" - depends on SPI && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - select REGMAP_SPI - ---help--- - This is a Video4Linux2 sensor-level driver for the Sony - IMX204 camera sensor - - To compile this driver as a module, choose M here: the module - will be called imx204. - diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile new file mode 100644 index 000000000..54ae95255 --- /dev/null +++ b/drivers/media/spi/Makefile @@ -0,0 +1,6 @@ +subdir-ccflags-y += -Werror + +ccflags-y += -I$(srctree)/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/drivers/video/tegra/camera + +obj-$(CONFIG_VIDEO_IMX204) += imx204.o diff --git a/drivers/media/spi/Makefile.nvidia b/drivers/media/spi/Makefile.nvidia deleted file mode 100644 index 54ae95255..000000000 --- a/drivers/media/spi/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -subdir-ccflags-y += -Werror - -ccflags-y += -I$(srctree)/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/drivers/video/tegra/camera - -obj-$(CONFIG_VIDEO_IMX204) += imx204.o diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig new file mode 100644 index 000000000..a43cd3ffe --- /dev/null +++ b/drivers/misc/Kconfig @@ -0,0 +1,85 @@ +append_menu "Misc devices" + +config MODS + tristate "NVIDIA MODS driver" + select OF_DYNAMIC + select OF_RESOLVE + default n + ---help--- + The NVIDIA MODS driver gives user space software direct access to + hardware. The NVIDIA Diagnostic Software uses this to test hardware. + This driver should normally be disabled in all production builds. + + Say Y here to compile the NVIDIA MODS driver into the kernel or say M + to compile it as a module. + + If unsure, say N here. + +config SAF775x_HWDEP + tristate "SAF775x HWDEP Driver" + default n + depends on I2C || SPI + +config SAF36XX_HWDEP + tristate "SAF36XX HWDEP Driver" + default n + depends on SPI && SPI_MASTER + help + Provides interfaces for flashing SAF36XX + +config SENSORS_NCT1008 + tristate "ON Semiconductor Temperature Sensor" + default n + depends on I2C + help + Say yes here if you wish to include the ON Semiconductor + NCT1008 Temperature sensor. + +config TEGRA_CPC + bool "Tegra content protection controller" + depends on I2C + help + This driver allows authenticated IO access to storage blocks on + CPC controller via i2c. + +config THERM_EST + bool "Thermal estimator driver" + default n + ---help--- + Thermal driver which estimates temperature based of other sensors. + +config FAN_THERM_EST + tristate "Fan driving temp estimator" + ---help--- + Thermal driver that estimates the fan driving temperature based on + other sensors. + + This enables a virtual sensor that polls other registered thermal + zone devices for temperature updates. + +config EQOS_APE_HWDEP + tristate "EQOS APE HWDEP Driver" + default n + depends on TEGRA_NVADSP + help + Driver provides mechanism to synchronize EAVB and APE clock. + This driver copies the EAVB time stamp on APE time registers + to synchroniza the initial phase offset. It calculates the + frequency offset between the two clocks by taking subsequent + snapshots of the clock and taking the difference. Based on the + calculated frequency offset, the pll_a clock (parent of APE clock) + frequency is adjusted. + +config TEGRA_SKIN + tristate "Thermal skin temperature estimator" + ---help--- + Thermal driver which estimates hotspot(s) tempeature based on power + features like rail power, rail current, backlight brightness. The + driver estimates multiple hotspot temperatures based on OF configuration. + +source "drivers/misc/nvs-dfsh/Kconfig" +source "drivers/misc/nvs/Kconfig" +source "drivers/misc/nvs-aonsh/Kconfig" +source "drivers/misc/tegra-profiler/Kconfig" + +endmenu diff --git a/drivers/misc/Kconfig.nvidia b/drivers/misc/Kconfig.nvidia deleted file mode 100644 index 23a631dd2..000000000 --- a/drivers/misc/Kconfig.nvidia +++ /dev/null @@ -1,78 +0,0 @@ -config MODS - tristate "NVIDIA MODS driver" - select OF_DYNAMIC - select OF_RESOLVE - default n - ---help--- - The NVIDIA MODS driver gives user space software direct access to - hardware. The NVIDIA Diagnostic Software uses this to test hardware. - This driver should normally be disabled in all production builds. - - Say Y here to compile the NVIDIA MODS driver into the kernel or say M - to compile it as a module. - - If unsure, say N here. - -config SAF775x_HWDEP - tristate "SAF775x HWDEP Driver" - default n - depends on I2C || SPI - -config SAF36XX_HWDEP - tristate "SAF36XX HWDEP Driver" - default n - depends on SPI && SPI_MASTER - help - Provides interfaces for flashing SAF36XX - -config SENSORS_NCT1008 - tristate "ON Semiconductor Temperature Sensor" - default n - depends on I2C - help - Say yes here if you wish to include the ON Semiconductor - NCT1008 Temperature sensor. - -config TEGRA_CPC - bool "Tegra content protection controller" - depends on I2C - help - This driver allows authenticated IO access to storage blocks on - CPC controller via i2c. - -config THERM_EST - bool "Thermal estimator driver" - default n - ---help--- - Thermal driver which estimates temperature based of other sensors. - -config FAN_THERM_EST - tristate "Fan driving temp estimator" - ---help--- - Thermal driver that estimates the fan driving temperature based on - other sensors. - - This enables a virtual sensor that polls other registered thermal - zone devices for temperature updates. - -config EQOS_APE_HWDEP - tristate "EQOS APE HWDEP Driver" - default n - depends on TEGRA_NVADSP - help - Driver provides mechanism to synchronize EAVB and APE clock. - This driver copies the EAVB time stamp on APE time registers - to synchroniza the initial phase offset. It calculates the - frequency offset between the two clocks by taking subsequent - snapshots of the clock and taking the difference. Based on the - calculated frequency offset, the pll_a clock (parent of APE clock) - frequency is adjusted. - -config TEGRA_SKIN - tristate "Thermal skin temperature estimator" - ---help--- - Thermal driver which estimates hotspot(s) tempeature based on power - features like rail power, rail current, backlight brightness. The - driver estimates multiple hotspot temperatures based on OF configuration. - -trysource "../nvidia/drivers/misc/nvs-dfsh/Kconfig.nvidia" diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile new file mode 100644 index 000000000..cb57e0334 --- /dev/null +++ b/drivers/misc/Makefile @@ -0,0 +1,15 @@ +obj-$(CONFIG_MODS) += mods/ +obj-y += nvs/ +obj-y += nvs-aonsh/ +obj-$(CONFIG_TEGRA_PROFILER) += tegra-profiler/ + +obj-$(CONFIG_NVS_DFSH) += nvs-dfsh/ +obj-$(CONFIG_SAF775x_HWDEP) += saf775x/ +obj-$(CONFIG_SAF36XX_HWDEP) += saf775x/ +obj-$(CONFIG_SENSORS_NCT1008) += nct1008.o +obj-$(CONFIG_TEGRA_CPC) += tegra_cpc.o +obj-$(CONFIG_THERM_EST) += therm_est.o +obj-$(CONFIG_FAN_THERM_EST) += therm_fan_est.o +obj-$(CONFIG_EQOS_APE_HWDEP) += eqos_ape/ +obj-$(CONFIG_TEGRA_SKIN) += tegra-skin.o +obj-$(CONFIG_TEGRA186_AHC) += tegra186-ahc/ diff --git a/drivers/misc/Makefile.nvidia b/drivers/misc/Makefile.nvidia deleted file mode 100644 index a0fc051bf..000000000 --- a/drivers/misc/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -obj-$(CONFIG_MODS) += mods/ - -obj-$(CONFIG_NVS_DFSH) += nvs-dfsh/ -obj-$(CONFIG_SAF775x_HWDEP) += saf775x/ -obj-$(CONFIG_SAF36XX_HWDEP) += saf775x/ -obj-$(CONFIG_SENSORS_NCT1008) += nct1008.o -obj-$(CONFIG_TEGRA_CPC) += tegra_cpc.o -obj-$(CONFIG_THERM_EST) += therm_est.o -obj-$(CONFIG_FAN_THERM_EST) += therm_fan_est.o -obj-$(CONFIG_EQOS_APE_HWDEP) += eqos_ape/ -obj-$(CONFIG_TEGRA_SKIN) += tegra-skin.o diff --git a/drivers/misc/eqos_ape/Makefile b/drivers/misc/eqos_ape/Makefile new file mode 100644 index 000000000..7d7872042 --- /dev/null +++ b/drivers/misc/eqos_ape/Makefile @@ -0,0 +1,20 @@ +# +# drivers/misc/eqos_ape/Makefile +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. +# + +obj-$(CONFIG_EQOS_APE_HWDEP) := eqos_ape.o + +eqos_ape-objs := \ + eqos_ape_amisc.o \ + eqos_ape_ioctl.o diff --git a/drivers/misc/eqos_ape/Makefile.nvidia b/drivers/misc/eqos_ape/Makefile.nvidia deleted file mode 100644 index 7d7872042..000000000 --- a/drivers/misc/eqos_ape/Makefile.nvidia +++ /dev/null @@ -1,20 +0,0 @@ -# -# drivers/misc/eqos_ape/Makefile -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. -# - -obj-$(CONFIG_EQOS_APE_HWDEP) := eqos_ape.o - -eqos_ape-objs := \ - eqos_ape_amisc.o \ - eqos_ape_ioctl.o diff --git a/drivers/misc/eqos_ape/eqos_ape_ioctl.h b/drivers/misc/eqos_ape/eqos_ape_ioctl.h index faafa916e..b82232902 100644 --- a/drivers/misc/eqos_ape/eqos_ape_ioctl.h +++ b/drivers/misc/eqos_ape/eqos_ape_ioctl.h @@ -25,7 +25,7 @@ #include #include -#include +#include "eqos_ape_global.h" struct eqos_ape_cmd { int ppm; diff --git a/drivers/misc/mods/Makefile b/drivers/misc/mods/Makefile new file mode 100644 index 000000000..95ea29169 --- /dev/null +++ b/drivers/misc/mods/Makefile @@ -0,0 +1,15 @@ +obj-$(CONFIG_MODS) := mods.o +mods-y := mods_krnl.o +mods-y += mods_mem.o +mods-y += mods_irq.o +mods-y += mods_clock.o +mods-$(CONFIG_ARCH_TEGRA) += mods_tegraprod.o +mods-$(CONFIG_PCI) += mods_pci.o +mods-$(CONFIG_ACPI) += mods_acpi.o +mods-$(CONFIG_ARCH_TEGRA) += mods_dmabuf.o +mods-$(CONFIG_DMA_ENGINE) += mods_dma.o +mods-$(CONFIG_DEBUG_FS) += mods_debugfs.o +mods-$(CONFIG_TEGRA_DC) += mods_tegradc.o +mods-$(CONFIG_TEGRA_NVADSP) += mods_adsp.o +mods-$(CONFIG_NET) += mods_netdevice.o +mods-objs := mods.dtb.o diff --git a/drivers/misc/mods/Makefile.nvidia b/drivers/misc/mods/Makefile.nvidia deleted file mode 100644 index 95ea29169..000000000 --- a/drivers/misc/mods/Makefile.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -obj-$(CONFIG_MODS) := mods.o -mods-y := mods_krnl.o -mods-y += mods_mem.o -mods-y += mods_irq.o -mods-y += mods_clock.o -mods-$(CONFIG_ARCH_TEGRA) += mods_tegraprod.o -mods-$(CONFIG_PCI) += mods_pci.o -mods-$(CONFIG_ACPI) += mods_acpi.o -mods-$(CONFIG_ARCH_TEGRA) += mods_dmabuf.o -mods-$(CONFIG_DMA_ENGINE) += mods_dma.o -mods-$(CONFIG_DEBUG_FS) += mods_debugfs.o -mods-$(CONFIG_TEGRA_DC) += mods_tegradc.o -mods-$(CONFIG_TEGRA_NVADSP) += mods_adsp.o -mods-$(CONFIG_NET) += mods_netdevice.o -mods-objs := mods.dtb.o diff --git a/drivers/misc/nvs-aonsh/Kconfig b/drivers/misc/nvs-aonsh/Kconfig new file mode 100644 index 000000000..cbe5c85be --- /dev/null +++ b/drivers/misc/nvs-aonsh/Kconfig @@ -0,0 +1,10 @@ +config NVS_AON_SHUB + tristate "Tegra T18x AON Sensor Hub driver" + depends on ARCH_TEGRA_18x_SOC && TEGRA_AON && NVS_IIO + select TEGRA_IVC + select TEGRA_HSP + help + Say Y here for Tegra T18x sensor hub for projects that only use + sensors connected to an auxilliary CPU. + + The driver uses the NVS (NVidia Sensor) IIO framework. diff --git a/drivers/misc/nvs-aonsh/Kconfig.nvidia b/drivers/misc/nvs-aonsh/Kconfig.nvidia deleted file mode 100644 index cbe5c85be..000000000 --- a/drivers/misc/nvs-aonsh/Kconfig.nvidia +++ /dev/null @@ -1,10 +0,0 @@ -config NVS_AON_SHUB - tristate "Tegra T18x AON Sensor Hub driver" - depends on ARCH_TEGRA_18x_SOC && TEGRA_AON && NVS_IIO - select TEGRA_IVC - select TEGRA_HSP - help - Say Y here for Tegra T18x sensor hub for projects that only use - sensors connected to an auxilliary CPU. - - The driver uses the NVS (NVidia Sensor) IIO framework. diff --git a/drivers/misc/nvs-aonsh/Makefile b/drivers/misc/nvs-aonsh/Makefile new file mode 100644 index 000000000..c1c78be2a --- /dev/null +++ b/drivers/misc/nvs-aonsh/Makefile @@ -0,0 +1,4 @@ +GCOV_PROFILE := y + +obj-$(CONFIG_NVS_AON_SHUB) += nvs_aon_shub.o +CFLAGS_nvs_aon_shub.o += -Werror diff --git a/drivers/misc/nvs-aonsh/Makefile.nvidia b/drivers/misc/nvs-aonsh/Makefile.nvidia deleted file mode 100644 index c1c78be2a..000000000 --- a/drivers/misc/nvs-aonsh/Makefile.nvidia +++ /dev/null @@ -1,4 +0,0 @@ -GCOV_PROFILE := y - -obj-$(CONFIG_NVS_AON_SHUB) += nvs_aon_shub.o -CFLAGS_nvs_aon_shub.o += -Werror diff --git a/drivers/misc/nvs-aonsh/nvs_aon_shub.c b/drivers/misc/nvs-aonsh/nvs_aon_shub.c index 82ac8b46e..819a01616 100644 --- a/drivers/misc/nvs-aonsh/nvs_aon_shub.c +++ b/drivers/misc/nvs-aonsh/nvs_aon_shub.c @@ -63,7 +63,7 @@ #include #include -#include +#include "aon-shub-messages.h" #define READJUST_TS_SAMPLES (100) diff --git a/drivers/misc/nvs-dfsh/Kconfig b/drivers/misc/nvs-dfsh/Kconfig new file mode 100644 index 000000000..e14aa86a8 --- /dev/null +++ b/drivers/misc/nvs-dfsh/Kconfig @@ -0,0 +1,11 @@ +config NVS_DFSH + tristate "Line discipline for NVS DFSH" + depends on TTY && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO + default n + help + Say Y here for TTY line discipline for NVS + DFSH stream. + + This driver cannot be built as a module. + If unsure, say N. + diff --git a/drivers/misc/nvs-dfsh/Kconfig.nvidia b/drivers/misc/nvs-dfsh/Kconfig.nvidia deleted file mode 100644 index e14aa86a8..000000000 --- a/drivers/misc/nvs-dfsh/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -config NVS_DFSH - tristate "Line discipline for NVS DFSH" - depends on TTY && IIO_BUFFER && IIO_TRIGGERED_BUFFER && NVS_IIO - default n - help - Say Y here for TTY line discipline for NVS - DFSH stream. - - This driver cannot be built as a module. - If unsure, say N. - diff --git a/drivers/misc/nvs-dfsh/Makefile b/drivers/misc/nvs-dfsh/Makefile new file mode 100644 index 000000000..36ae32f38 --- /dev/null +++ b/drivers/misc/nvs-dfsh/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for NVS DFSH line discipline +# +obj-$(CONFIG_NVS_DFSH) += nvs_dfsh.o + diff --git a/drivers/misc/nvs-dfsh/Makefile.nvidia b/drivers/misc/nvs-dfsh/Makefile.nvidia deleted file mode 100644 index 36ae32f38..000000000 --- a/drivers/misc/nvs-dfsh/Makefile.nvidia +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for NVS DFSH line discipline -# -obj-$(CONFIG_NVS_DFSH) += nvs_dfsh.o - diff --git a/drivers/misc/nvs/Kconfig b/drivers/misc/nvs/Kconfig new file mode 100644 index 000000000..e22cfe44a --- /dev/null +++ b/drivers/misc/nvs/Kconfig @@ -0,0 +1,66 @@ +# +# NVS (NVidia Sensor framework) +# +config NVS + tristate "Common module for NVSensor drivers" + depends on SYSFS + default n + help + Say Y here for NVSensor framework support. + This is a common module for NVS (NVidia Sensor) + drivers (nvs_). + +config NVS_IIO + tristate "Common module for NVSensor IIO drivers" + depends on SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER && NVS + default n + help + Say Y here for IIO NVSensor framework support. + This is a common module for NVS (NVidia Sensor) + IIO (Industrial Input/Output) drivers (nvs_). + +config NVS_INPUT + tristate "Common module for NVSensor INPUT drivers" + depends on SYSFS && NVS + default n + help + Say Y here for INPUT NVSensor framework support. + This is a common module for NVS (NVidia Sensor) + +config NVS_RELAY + tristate "Common module for NVSensor RELAY drivers" + depends on SYSFS && NVS + default n + help + Say Y here for INPUT NVSensor framework support. + This is a common module for NVS (NVidia Sensor) + +config NVS_LIGHT + tristate "Common module for NVSensor light drivers" + depends on SYSFS + default n + help + Say Y here for the NVSensor framework for ambient light sensors. + + This is required for NVS (NVidia Sensor) drivers (nvs_) + that control an ambient light sensor (ALS) in their device. + This is typically autoselected by these drivers. + +config NVS_PROXIMITY + tristate "Common module for NVSensor proximity drivers" + depends on SYSFS + default n + help + Say Y here for the NVSensor framework for proximity sensors. + This is required for NVS (NVidia Sensor) drivers (nvs_) + that control a proximity sensor in their device. + +config NVS_TRIGGERED_BUFFER + bool "Alias for IIO_TRIGGERED_BUFFER" + select IIO_TRIGGERED_BUFFER + default n + help + Say Y here for the NVSensor framework for proximity sensors. + This is required for NVS (NVidia Sensor) drivers (nvs_) + that control a proximity sensor in their device. + diff --git a/drivers/misc/nvs/Kconfig.nvidia b/drivers/misc/nvs/Kconfig.nvidia deleted file mode 100644 index e22cfe44a..000000000 --- a/drivers/misc/nvs/Kconfig.nvidia +++ /dev/null @@ -1,66 +0,0 @@ -# -# NVS (NVidia Sensor framework) -# -config NVS - tristate "Common module for NVSensor drivers" - depends on SYSFS - default n - help - Say Y here for NVSensor framework support. - This is a common module for NVS (NVidia Sensor) - drivers (nvs_). - -config NVS_IIO - tristate "Common module for NVSensor IIO drivers" - depends on SYSFS && IIO && IIO_KFIFO_BUF && IIO_TRIGGER && NVS - default n - help - Say Y here for IIO NVSensor framework support. - This is a common module for NVS (NVidia Sensor) - IIO (Industrial Input/Output) drivers (nvs_). - -config NVS_INPUT - tristate "Common module for NVSensor INPUT drivers" - depends on SYSFS && NVS - default n - help - Say Y here for INPUT NVSensor framework support. - This is a common module for NVS (NVidia Sensor) - -config NVS_RELAY - tristate "Common module for NVSensor RELAY drivers" - depends on SYSFS && NVS - default n - help - Say Y here for INPUT NVSensor framework support. - This is a common module for NVS (NVidia Sensor) - -config NVS_LIGHT - tristate "Common module for NVSensor light drivers" - depends on SYSFS - default n - help - Say Y here for the NVSensor framework for ambient light sensors. - - This is required for NVS (NVidia Sensor) drivers (nvs_) - that control an ambient light sensor (ALS) in their device. - This is typically autoselected by these drivers. - -config NVS_PROXIMITY - tristate "Common module for NVSensor proximity drivers" - depends on SYSFS - default n - help - Say Y here for the NVSensor framework for proximity sensors. - This is required for NVS (NVidia Sensor) drivers (nvs_) - that control a proximity sensor in their device. - -config NVS_TRIGGERED_BUFFER - bool "Alias for IIO_TRIGGERED_BUFFER" - select IIO_TRIGGERED_BUFFER - default n - help - Say Y here for the NVSensor framework for proximity sensors. - This is required for NVS (NVidia Sensor) drivers (nvs_) - that control a proximity sensor in their device. - diff --git a/drivers/misc/nvs/Makefile b/drivers/misc/nvs/Makefile new file mode 100644 index 000000000..19b17dfb5 --- /dev/null +++ b/drivers/misc/nvs/Makefile @@ -0,0 +1,34 @@ +# +# Makefile for NVS (NVidia Sensor framework). +# +obj-$(CONFIG_NVS) += nvs.o + +nvs-objs := nvs_vreg.o nvs_of_dt.o nvs_timestamp.o nvs_dsm.o \ + nvs_auto.o + +ifneq (,$(filter $(CONFIG_NVS_LIGHT),y m)) +nvs-objs += nvs_light.o +endif + +ifneq (,$(filter $(CONFIG_NVS_PROXIMITY),y m)) +nvs-objs += nvs_proximity.o +endif + +ifneq (,$(filter $(CONFIG_NVS_IIO),y m)) +nvs-objs += nvs_iio.o +CFLAGS_nvs_dsm.o += -DNVS_KIF_IIO=1 +CFLAGS_nvs_auto.o += -DNVS_KIF_IIO=1 +endif + +ifneq (,$(filter $(CONFIG_NVS_RELAY),y m)) +nvs-objs += nvs_relay.o nvs_sysfs.o +CFLAGS_nvs_dsm.o += -DNVS_KIF_RELAY=1 +CFLAGS_nvs_auto.o += -DNVS_KIF_RELAY=1 +endif + +ifneq (,$(filter $(CONFIG_NVS_INPUT),y m)) + +nvs-objs += nvs_input.o nvs_sysfs.o +CFLAGS_nvs_dsm.o += -DNVS_KIF_INPUT=1 +CFLAGS_nvs_auto.o += -DNVS_KIF_INPUT=1 +endif diff --git a/drivers/misc/nvs/Makefile.nvidia b/drivers/misc/nvs/Makefile.nvidia deleted file mode 100644 index 19b17dfb5..000000000 --- a/drivers/misc/nvs/Makefile.nvidia +++ /dev/null @@ -1,34 +0,0 @@ -# -# Makefile for NVS (NVidia Sensor framework). -# -obj-$(CONFIG_NVS) += nvs.o - -nvs-objs := nvs_vreg.o nvs_of_dt.o nvs_timestamp.o nvs_dsm.o \ - nvs_auto.o - -ifneq (,$(filter $(CONFIG_NVS_LIGHT),y m)) -nvs-objs += nvs_light.o -endif - -ifneq (,$(filter $(CONFIG_NVS_PROXIMITY),y m)) -nvs-objs += nvs_proximity.o -endif - -ifneq (,$(filter $(CONFIG_NVS_IIO),y m)) -nvs-objs += nvs_iio.o -CFLAGS_nvs_dsm.o += -DNVS_KIF_IIO=1 -CFLAGS_nvs_auto.o += -DNVS_KIF_IIO=1 -endif - -ifneq (,$(filter $(CONFIG_NVS_RELAY),y m)) -nvs-objs += nvs_relay.o nvs_sysfs.o -CFLAGS_nvs_dsm.o += -DNVS_KIF_RELAY=1 -CFLAGS_nvs_auto.o += -DNVS_KIF_RELAY=1 -endif - -ifneq (,$(filter $(CONFIG_NVS_INPUT),y m)) - -nvs-objs += nvs_input.o nvs_sysfs.o -CFLAGS_nvs_dsm.o += -DNVS_KIF_INPUT=1 -CFLAGS_nvs_auto.o += -DNVS_KIF_INPUT=1 -endif diff --git a/drivers/misc/saf775x/Makefile b/drivers/misc/saf775x/Makefile new file mode 100644 index 000000000..65839e9f6 --- /dev/null +++ b/drivers/misc/saf775x/Makefile @@ -0,0 +1,15 @@ +subdir-ccflags-y += -Werror + +obj-$(CONFIG_SAF775x_HWDEP) += saf775x-hwdep.o + +saf775x-hwdep-objs := \ + saf775x_stub.o \ + saf775x_ioctl.o +ifdef CONFIG_COMPAT + saf775x-hwdep-objs += compat_saf775x_ioctl.o +endif + +obj-$(CONFIG_SAF36XX_HWDEP) += saf36xx-hwdep.o + +saf36xx-hwdep-objs := \ + saf36xx.o diff --git a/drivers/misc/saf775x/Makefile.nvidia b/drivers/misc/saf775x/Makefile.nvidia deleted file mode 100644 index 65839e9f6..000000000 --- a/drivers/misc/saf775x/Makefile.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -subdir-ccflags-y += -Werror - -obj-$(CONFIG_SAF775x_HWDEP) += saf775x-hwdep.o - -saf775x-hwdep-objs := \ - saf775x_stub.o \ - saf775x_ioctl.o -ifdef CONFIG_COMPAT - saf775x-hwdep-objs += compat_saf775x_ioctl.o -endif - -obj-$(CONFIG_SAF36XX_HWDEP) += saf36xx-hwdep.o - -saf36xx-hwdep-objs := \ - saf36xx.o diff --git a/drivers/misc/tegra-cec/Kconfig b/drivers/misc/tegra-cec/Kconfig new file mode 100644 index 000000000..f7fe81c12 --- /dev/null +++ b/drivers/misc/tegra-cec/Kconfig @@ -0,0 +1,9 @@ +if ARCH_TEGRA + +config TEGRA_CEC_SUPPORT + bool "Tegra CEC support" + depends on TEGRA_DC + ---help--- + Enables HDMI-CEC driver for Tegra SoC. + +endif diff --git a/drivers/misc/tegra-cec/Kconfig.nvidia b/drivers/misc/tegra-cec/Kconfig.nvidia deleted file mode 100644 index 074f74300..000000000 --- a/drivers/misc/tegra-cec/Kconfig.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -config TEGRA_CEC_SUPPORT - bool "Tegra CEC support" - depends on TEGRA_DC - ---help--- - Enables HDMI-CEC driver for Tegra SoC. - diff --git a/drivers/misc/tegra-profiler/Kconfig b/drivers/misc/tegra-profiler/Kconfig new file mode 100644 index 000000000..c320906d3 --- /dev/null +++ b/drivers/misc/tegra-profiler/Kconfig @@ -0,0 +1,8 @@ +config TEGRA_PROFILER + bool "Enable Tegra profiler" + depends on ARCH_TEGRA || PLATFORM_TEGRA + help + This option enables Tegra profiler + The main responsibility of this module is sampling + This module creates /dev/quadd device which is essential for + Tegra profiler work diff --git a/drivers/misc/tegra-profiler/Kconfig.nvidia b/drivers/misc/tegra-profiler/Kconfig.nvidia deleted file mode 100644 index c320906d3..000000000 --- a/drivers/misc/tegra-profiler/Kconfig.nvidia +++ /dev/null @@ -1,8 +0,0 @@ -config TEGRA_PROFILER - bool "Enable Tegra profiler" - depends on ARCH_TEGRA || PLATFORM_TEGRA - help - This option enables Tegra profiler - The main responsibility of this module is sampling - This module creates /dev/quadd device which is essential for - Tegra profiler work diff --git a/drivers/misc/tegra-profiler/Makefile b/drivers/misc/tegra-profiler/Makefile new file mode 100644 index 000000000..5abff8d1f --- /dev/null +++ b/drivers/misc/tegra-profiler/Makefile @@ -0,0 +1,38 @@ +# +# drivers/misc/tegra-profiler/Makefile +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. +# + +ccflags-y += -Werror + +obj-$(CONFIG_TEGRA_PROFILER) := tegra-profiler.o + +tegra-profiler-y := \ + main.o \ + hrt.o \ + comm.o \ + mmap.o \ + backtrace.o \ + debug.o \ + ma.o \ + power_clk.o \ + auth.o \ + quadd_proc.o \ + eh_unwind.o \ + dwarf_unwind.o \ + disassembler.o + +obj-$(CONFIG_CACHE_L2X0) += pl310.o + +obj-$(CONFIG_ARM) += armv7_pmu.o +obj-$(CONFIG_ARM64) += armv8_pmu.o diff --git a/drivers/misc/tegra-profiler/Makefile.nvidia b/drivers/misc/tegra-profiler/Makefile.nvidia deleted file mode 100644 index 5abff8d1f..000000000 --- a/drivers/misc/tegra-profiler/Makefile.nvidia +++ /dev/null @@ -1,38 +0,0 @@ -# -# drivers/misc/tegra-profiler/Makefile -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. -# - -ccflags-y += -Werror - -obj-$(CONFIG_TEGRA_PROFILER) := tegra-profiler.o - -tegra-profiler-y := \ - main.o \ - hrt.o \ - comm.o \ - mmap.o \ - backtrace.o \ - debug.o \ - ma.o \ - power_clk.o \ - auth.o \ - quadd_proc.o \ - eh_unwind.o \ - dwarf_unwind.o \ - disassembler.o - -obj-$(CONFIG_CACHE_L2X0) += pl310.o - -obj-$(CONFIG_ARM) += armv7_pmu.o -obj-$(CONFIG_ARM64) += armv8_pmu.o diff --git a/drivers/misc/tegra186-ahc/Kconfig b/drivers/misc/tegra186-ahc/Kconfig new file mode 100644 index 000000000..017125c29 --- /dev/null +++ b/drivers/misc/tegra186-ahc/Kconfig @@ -0,0 +1,3 @@ +config TEGRA186_AHC + tristate "Tegra186 AHC driver" + depends on ARCH_TEGRA_18x_SOC diff --git a/drivers/misc/tegra186-ahc/Kconfig.nvidia b/drivers/misc/tegra186-ahc/Kconfig.nvidia deleted file mode 100644 index 017125c29..000000000 --- a/drivers/misc/tegra186-ahc/Kconfig.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -config TEGRA186_AHC - tristate "Tegra186 AHC driver" - depends on ARCH_TEGRA_18x_SOC diff --git a/drivers/misc/tegra186-ahc/Makefile b/drivers/misc/tegra186-ahc/Makefile new file mode 100644 index 000000000..8e7279353 --- /dev/null +++ b/drivers/misc/tegra186-ahc/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_TEGRA186_AHC) += tegra186_ahc.o diff --git a/drivers/misc/tegra186-ahc/Makefile.nvidia b/drivers/misc/tegra186-ahc/Makefile.nvidia deleted file mode 100644 index 8e7279353..000000000 --- a/drivers/misc/tegra186-ahc/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_TEGRA186_AHC) += tegra186_ahc.o diff --git a/drivers/net/Makefile b/drivers/net/Makefile new file mode 100644 index 000000000..fdedda760 --- /dev/null +++ b/drivers/net/Makefile @@ -0,0 +1,2 @@ + +obj-y += can/ diff --git a/drivers/net/Makefile.nvidia b/drivers/net/Makefile.nvidia deleted file mode 100644 index fdedda760..000000000 --- a/drivers/net/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ - -obj-y += can/ diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig new file mode 100644 index 000000000..71ebba10b --- /dev/null +++ b/drivers/net/can/Kconfig @@ -0,0 +1,5 @@ +if CAN_DEV +source "drivers/net/can/mttcan/native/Kconfig" +source "drivers/net/can/mttcan/ivc/Kconfig" +source "drivers/net/can/nvsec/Kconfig" +endif diff --git a/drivers/net/can/Kconfig.nvidia b/drivers/net/can/Kconfig.nvidia deleted file mode 100644 index 2dfd58d9e..000000000 --- a/drivers/net/can/Kconfig.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -trysource "../nvidia/drivers/net/can/mttcan/native/Kconfig.nvidia" -trysource "../nvidia/drivers/net/can/mttcan/ivc/Kconfig.nvidia" -trysource "../nvidia/drivers/net/can/nvsec/Kconfig.nvidia" diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile new file mode 100644 index 000000000..ba6577458 --- /dev/null +++ b/drivers/net/can/Makefile @@ -0,0 +1,3 @@ + +obj-y += mttcan/ +obj-y += nvsec/ diff --git a/drivers/net/can/Makefile.nvidia b/drivers/net/can/Makefile.nvidia deleted file mode 100644 index ba6577458..000000000 --- a/drivers/net/can/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ - -obj-y += mttcan/ -obj-y += nvsec/ diff --git a/drivers/net/can/mttcan/Makefile b/drivers/net/can/mttcan/Makefile new file mode 100644 index 000000000..8459c62cc --- /dev/null +++ b/drivers/net/can/mttcan/Makefile @@ -0,0 +1,3 @@ + +obj-$(CONFIG_MTTCAN) += native/ +obj-$(CONFIG_MTTCAN_IVC) += ivc/ diff --git a/drivers/net/can/mttcan/Makefile.nvidia b/drivers/net/can/mttcan/Makefile.nvidia deleted file mode 100644 index 8459c62cc..000000000 --- a/drivers/net/can/mttcan/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ - -obj-$(CONFIG_MTTCAN) += native/ -obj-$(CONFIG_MTTCAN_IVC) += ivc/ diff --git a/drivers/net/can/mttcan/ivc/Kconfig b/drivers/net/can/mttcan/ivc/Kconfig new file mode 100644 index 000000000..a73619fd7 --- /dev/null +++ b/drivers/net/can/mttcan/ivc/Kconfig @@ -0,0 +1,11 @@ +config MTTCAN_IVC + tristate "Bosch M_TTCAN IVC Devices" + depends on ARCH_TEGRA_18x_SOC && CAN + select STAGING + help + Support for the Bosch M_TTCAN driver over IVC. The driver + is implemented in sensor processor running RTOS. CAN services + are made available to Linux though IVC. The Bosch MTTCAN + CAN controller has two independent CAN interfaces. These + intefaces supports CAN-FD and TT-CAN. This driver requires + SocketCAN support enabled in kernel. diff --git a/drivers/net/can/mttcan/ivc/Kconfig.nvidia b/drivers/net/can/mttcan/ivc/Kconfig.nvidia deleted file mode 100644 index a73619fd7..000000000 --- a/drivers/net/can/mttcan/ivc/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -config MTTCAN_IVC - tristate "Bosch M_TTCAN IVC Devices" - depends on ARCH_TEGRA_18x_SOC && CAN - select STAGING - help - Support for the Bosch M_TTCAN driver over IVC. The driver - is implemented in sensor processor running RTOS. CAN services - are made available to Linux though IVC. The Bosch MTTCAN - CAN controller has two independent CAN interfaces. These - intefaces supports CAN-FD and TT-CAN. This driver requires - SocketCAN support enabled in kernel. diff --git a/drivers/net/can/mttcan/ivc/Makefile b/drivers/net/can/mttcan/ivc/Makefile new file mode 100644 index 000000000..4ce03181d --- /dev/null +++ b/drivers/net/can/mttcan/ivc/Makefile @@ -0,0 +1,23 @@ +# +# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the version 2 of the GNU General Public License +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +obj-$(CONFIG_MTTCAN_IVC) := mttcan_ivc.o + +mttcan_ivc-y = m_ttcan_linux_ivc.o ../hal/m_ttcan.o +mttcan_ivc-y += ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o + +ccflags-y += -I$(src)/../include diff --git a/drivers/net/can/mttcan/ivc/Makefile.nvidia b/drivers/net/can/mttcan/ivc/Makefile.nvidia deleted file mode 100644 index 4ce03181d..000000000 --- a/drivers/net/can/mttcan/ivc/Makefile.nvidia +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the version 2 of the GNU General Public License -# as published by the Free Software Foundation -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -obj-$(CONFIG_MTTCAN_IVC) := mttcan_ivc.o - -mttcan_ivc-y = m_ttcan_linux_ivc.o ../hal/m_ttcan.o -mttcan_ivc-y += ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o - -ccflags-y += -I$(src)/../include diff --git a/drivers/net/can/mttcan/native/Kconfig b/drivers/net/can/mttcan/native/Kconfig new file mode 100644 index 000000000..28e8730ab --- /dev/null +++ b/drivers/net/can/mttcan/native/Kconfig @@ -0,0 +1,9 @@ +config MTTCAN + tristate "Bosch M_TTCAN Devices" + depends on ARCH_TEGRA_18x_SOC && CAN + select STAGING + help + Support for the Bosch M_TTCAN driver. The Bosch MTTCAN CAN + controller is having two independent CAN interfaces. These + intefaces supports CAN-FD and TT-CAN. This driver will require + SocketCAN support enabled in kernel. diff --git a/drivers/net/can/mttcan/native/Kconfig.nvidia b/drivers/net/can/mttcan/native/Kconfig.nvidia deleted file mode 100644 index 28e8730ab..000000000 --- a/drivers/net/can/mttcan/native/Kconfig.nvidia +++ /dev/null @@ -1,9 +0,0 @@ -config MTTCAN - tristate "Bosch M_TTCAN Devices" - depends on ARCH_TEGRA_18x_SOC && CAN - select STAGING - help - Support for the Bosch M_TTCAN driver. The Bosch MTTCAN CAN - controller is having two independent CAN interfaces. These - intefaces supports CAN-FD and TT-CAN. This driver will require - SocketCAN support enabled in kernel. diff --git a/drivers/net/can/mttcan/native/Makefile b/drivers/net/can/mttcan/native/Makefile new file mode 100644 index 000000000..b642dce42 --- /dev/null +++ b/drivers/net/can/mttcan/native/Makefile @@ -0,0 +1,24 @@ +# +# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the version 2 of the GNU General Public License +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +obj-$(CONFIG_MTTCAN) := mttcan.o + +mttcan-y = m_ttcan_linux.o m_ttcan_sys.o ../hal/m_ttcan.o +mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o +mttcan-y += ../hal/m_ttcan_tt.o + +ccflags-y += -I$(overlay)/drivers/net/can/mttcan/include diff --git a/drivers/net/can/mttcan/native/Makefile.nvidia b/drivers/net/can/mttcan/native/Makefile.nvidia deleted file mode 100644 index 502d57b2c..000000000 --- a/drivers/net/can/mttcan/native/Makefile.nvidia +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the version 2 of the GNU General Public License -# as published by the Free Software Foundation -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -obj-$(CONFIG_MTTCAN) := mttcan.o - -mttcan-y = m_ttcan_linux.o m_ttcan_sys.o ../hal/m_ttcan.o -mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o -mttcan-y += ../hal/m_ttcan_tt.o - -ccflags-y += -I$(src)/../include diff --git a/drivers/net/can/nvsec/Kconfig b/drivers/net/can/nvsec/Kconfig new file mode 100644 index 000000000..a0a50568b --- /dev/null +++ b/drivers/net/can/nvsec/Kconfig @@ -0,0 +1,9 @@ +config TEGRA_HV_SECCAN + tristate "Tegra Hypervisor Security path CAN" + depends on ARCH_TEGRA_18x_SOC && CAN + select STAGING + help + Add support for emulating a socketCAN device on tegra hypervisor systems. + To compile this driver as a module, choose M here: the + module will be called nvsec_hv_can. + diff --git a/drivers/net/can/nvsec/Kconfig.nvidia b/drivers/net/can/nvsec/Kconfig.nvidia deleted file mode 100644 index a0a50568b..000000000 --- a/drivers/net/can/nvsec/Kconfig.nvidia +++ /dev/null @@ -1,9 +0,0 @@ -config TEGRA_HV_SECCAN - tristate "Tegra Hypervisor Security path CAN" - depends on ARCH_TEGRA_18x_SOC && CAN - select STAGING - help - Add support for emulating a socketCAN device on tegra hypervisor systems. - To compile this driver as a module, choose M here: the - module will be called nvsec_hv_can. - diff --git a/drivers/net/can/nvsec/Makefile b/drivers/net/can/nvsec/Makefile new file mode 100644 index 000000000..9d6ab7a6b --- /dev/null +++ b/drivers/net/can/nvsec/Makefile @@ -0,0 +1,20 @@ +# +# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the version 2 of the GNU General Public License +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +obj-$(CONFIG_TEGRA_HV_SECCAN) = nv_hv_seccan.o + +nv_hv_seccan-y = nvhvseccan.o diff --git a/drivers/net/can/nvsec/Makefile.nvidia b/drivers/net/can/nvsec/Makefile.nvidia deleted file mode 100644 index 9d6ab7a6b..000000000 --- a/drivers/net/can/nvsec/Makefile.nvidia +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the version 2 of the GNU General Public License -# as published by the Free Software Foundation -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -obj-$(CONFIG_TEGRA_HV_SECCAN) = nv_hv_seccan.o - -nv_hv_seccan-y = nvhvseccan.o diff --git a/drivers/nvpmodel/Kconfig b/drivers/nvpmodel/Kconfig new file mode 100644 index 000000000..9a559af7d --- /dev/null +++ b/drivers/nvpmodel/Kconfig @@ -0,0 +1,14 @@ +# +# Nvpmodel EMC CAP Configuration +# + +menuconfig NVPMODEL_EMC + tristate "NVPMODEL_EMC_CAP driver" + default n + help + This driver add an EMC bwmgr client and expose related cap Sysfs to + user space, this make the Nvpmodel to cap EMC BW through Sysfs + possible. The cap value is based on different Nvpmodel usecase. + The BW cap will effect on not only bwmgr client and also iso client. + + If in doubt, say N. diff --git a/drivers/nvpmodel/Kconfig.nvidia b/drivers/nvpmodel/Kconfig.nvidia deleted file mode 100644 index 9a559af7d..000000000 --- a/drivers/nvpmodel/Kconfig.nvidia +++ /dev/null @@ -1,14 +0,0 @@ -# -# Nvpmodel EMC CAP Configuration -# - -menuconfig NVPMODEL_EMC - tristate "NVPMODEL_EMC_CAP driver" - default n - help - This driver add an EMC bwmgr client and expose related cap Sysfs to - user space, this make the Nvpmodel to cap EMC BW through Sysfs - possible. The cap value is based on different Nvpmodel usecase. - The BW cap will effect on not only bwmgr client and also iso client. - - If in doubt, say N. diff --git a/drivers/nvpmodel/Makefile b/drivers/nvpmodel/Makefile new file mode 100644 index 000000000..f7bf6edee --- /dev/null +++ b/drivers/nvpmodel/Makefile @@ -0,0 +1,5 @@ +# +# Nvpmodel EMC Client driver. +# +ccflags-y += -Werror +obj-$(CONFIG_NVPMODEL_EMC) := nvpmodel_emc_cap.o diff --git a/drivers/nvpmodel/Makefile.nvidia b/drivers/nvpmodel/Makefile.nvidia deleted file mode 100644 index f7bf6edee..000000000 --- a/drivers/nvpmodel/Makefile.nvidia +++ /dev/null @@ -1,5 +0,0 @@ -# -# Nvpmodel EMC Client driver. -# -ccflags-y += -Werror -obj-$(CONFIG_NVPMODEL_EMC) := nvpmodel_emc_cap.o diff --git a/drivers/padctrl/Kconfig b/drivers/padctrl/Kconfig new file mode 100644 index 000000000..5696fec65 --- /dev/null +++ b/drivers/padctrl/Kconfig @@ -0,0 +1,12 @@ +if PADCTRL + +config PADCTRL_GENERIC_TEGRA_IO_PAD + bool "Generic Tegra IO Pad control driver" + depends on ARCH_TEGRA + help + This option enables Genric Tegra IO PAD padctrl driver + + Tegra IO Pad padctrl driver which controls the IO pad + configuration for 1.2V, 1.8V and 3.3V. + +endif diff --git a/drivers/padctrl/Kconfig.nvidia b/drivers/padctrl/Kconfig.nvidia deleted file mode 100644 index b81b1b169..000000000 --- a/drivers/padctrl/Kconfig.nvidia +++ /dev/null @@ -1,10 +0,0 @@ -if PADCTRL -config PADCTRL_GENERIC_TEGRA_IO_PAD - bool "Generic Tegra IO Pad control driver" - depends on ARCH_TEGRA - help - This option enables Genric Tegra IO PAD padctrl driver - - Tegra IO Pad padctrl driver which controls the IO pad - configuration for 1.2V, 1.8V and 3.3V. -endif diff --git a/drivers/padctrl/Makefile b/drivers/padctrl/Makefile new file mode 100644 index 000000000..b7a726230 --- /dev/null +++ b/drivers/padctrl/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for padctrl support. +# +subdir-ccflags-y = -Werror + +obj-$(CONFIG_PADCTRL_GENERIC_TEGRA_IO_PAD) += padctrl-tegra-io-pads.o diff --git a/drivers/padctrl/Makefile.nvidia b/drivers/padctrl/Makefile.nvidia deleted file mode 100644 index b7a726230..000000000 --- a/drivers/padctrl/Makefile.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile for padctrl support. -# -subdir-ccflags-y = -Werror - -obj-$(CONFIG_PADCTRL_GENERIC_TEGRA_IO_PAD) += padctrl-tegra-io-pads.o diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig new file mode 100644 index 000000000..4261010aa --- /dev/null +++ b/drivers/pinctrl/Kconfig @@ -0,0 +1,23 @@ +append_menu "Pin controllers" + +config PINCTRL_TEGRA186 + bool "NVIDIA Tegra186 Pinmux support" + select PINCTRL_TEGRA + help + Support for the NVIDIA Tegra186 PINCTRL controller driver. + +config PINCTRL_TEGRA186_PADCTL + bool "NVIDIA Tegra186 XUSB PADCTL Driver" + depends on ARCH_TEGRA_18x_SOC + depends on MAILBOX + select GENERIC_PHY + select PINCONF + select PINMUX + +config PINCTRL_TEGRA186_DPAUX + bool "NVIDIA Tegra186 DP AUX Pinctrl Driver" + depends on ARCH_TEGRA_18x_SOC + select PINCONF + select PINMUX + +endmenu diff --git a/drivers/pinctrl/Kconfig.nvidia b/drivers/pinctrl/Kconfig.nvidia deleted file mode 100644 index 325875a27..000000000 --- a/drivers/pinctrl/Kconfig.nvidia +++ /dev/null @@ -1,19 +0,0 @@ -config PINCTRL_TEGRA186 - bool "NVIDIA Tegra186 Pinmux support" - select PINCTRL_TEGRA - help - Support for the NVIDIA Tegra186 PINCTRL controller driver. - -config PINCTRL_TEGRA186_PADCTL - bool "NVIDIA Tegra186 XUSB PADCTL Driver" - depends on ARCH_TEGRA_18x_SOC - depends on MAILBOX - select GENERIC_PHY - select PINCONF - select PINMUX - -config PINCTRL_TEGRA186_DPAUX - bool "NVIDIA Tegra186 DP AUX Pinctrl Driver" - depends on ARCH_TEGRA_18x_SOC - select PINCONF - select PINMUX diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile new file mode 100644 index 000000000..d7f607883 --- /dev/null +++ b/drivers/pinctrl/Makefile @@ -0,0 +1,12 @@ +GCOV_PROFILE_pinctrl-tegra186-padctl.o := y + +ccflags-y += -Werror +ccflags-y += -I$(srctree)/drivers/pinctrl +ccflags-y += -I$(srctree)/drivers/pinctrl/tegra +ccflags-y += -I$(srctree)/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/include + +obj-$(CONFIG_PINCTRL_TEGRA186) += pinctrl-tegra186.o +obj-$(CONFIG_PINCTRL_TEGRA186_PADCTL) += pinctrl-tegra186-padctl.o +obj-$(CONFIG_PINCTRL_TEGRA186_DPAUX) += pinctrl-tegra186-dpaux.o diff --git a/drivers/pinctrl/Makefile.nvidia b/drivers/pinctrl/Makefile.nvidia deleted file mode 100644 index d7f607883..000000000 --- a/drivers/pinctrl/Makefile.nvidia +++ /dev/null @@ -1,12 +0,0 @@ -GCOV_PROFILE_pinctrl-tegra186-padctl.o := y - -ccflags-y += -Werror -ccflags-y += -I$(srctree)/drivers/pinctrl -ccflags-y += -I$(srctree)/drivers/pinctrl/tegra -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/include - -obj-$(CONFIG_PINCTRL_TEGRA186) += pinctrl-tegra186.o -obj-$(CONFIG_PINCTRL_TEGRA186_PADCTL) += pinctrl-tegra186-padctl.o -obj-$(CONFIG_PINCTRL_TEGRA186_DPAUX) += pinctrl-tegra186-dpaux.o diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile new file mode 100644 index 000000000..3d50fea2a --- /dev/null +++ b/drivers/platform/Makefile @@ -0,0 +1 @@ +obj-y += tegra/ diff --git a/drivers/platform/Makefile.nvidia b/drivers/platform/Makefile.nvidia deleted file mode 100644 index 3d50fea2a..000000000 --- a/drivers/platform/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-y += tegra/ diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig new file mode 100644 index 000000000..7dfd2a00d --- /dev/null +++ b/drivers/platform/tegra/Kconfig @@ -0,0 +1,134 @@ +config DENVER_CPU + bool "Denver CPU" + help + Support for NVIDIA Denver CPU + +config DENVER_DEBUG + bool "Denver Hardware Debug Tools" + depends on DENVER_CPU + help + This enables drivers that allow debugging the Denver CPU internals. + +config DENVER_MCA + tristate "Denver Machine Check Handler" + depends on DENVER_CPU + select SERROR_HANDLER + help + The Denver Machine Check handler. It collects and reports errors from + the Denver CPUs. + +config TEGRA_AON + bool "Tegra AON driver" + depends on ARCH_TEGRA_18x_SOC + select TEGRA_IVC + select TEGRA_HSP + +config TEGRA_ARI_MCA + tristate "Tegra Abstract Request Interface (ARI) Machine Check" + select SERROR_HANDLER + help + The Tegra Abstract Request Interface (ARI) Machine Check handler. This + handles the Machine Check registers that are accessible via ARI. + +config TEGRA_BRIDGE_MCA + tristate "AXI/APB Bridge Machine Check" + select SERROR_HANDLER + help + The Tegra AXI/APB Bridge Machine Check handler. This + handes the SERRs from failed AXI/APB transactions. + +config TEGRA_A57_SERR + tristate "A57 SError Handler" + select SERROR_HANDLER + help + The A57 SError Handler. This handles the SERRs from A57 cores, + specifically L1 ECC errors. + +config TEGRA_18X_SERROR + tristate "Tegra18 SError handler" + depends on ARCH_TEGRA_18x_SOC + select DENVER_MCA + select TEGRA_ARI_MCA + select TEGRA_BRIDGE_MCA + select TEGRA_A57_SERR + help + The Tegra18 SError handler. This handles Denver SErrors, A57 SErrors, + CCPLEX errors, and fabric slave errors. + +config TEGRA_BWMGR + bool "Enable EMC Bandwidth Manager" + depends on COMMON_CLK + default n + help + Enables Bandwidth manager support for EMC clock. Required when using Common Clock Framework + +config TEGRA_CAMERA_RTCPU + bool "Enable Tegra Camera RTCPU Driver" + depends on ARCH_TEGRA_18x_SOC + select TEGRA_IVC + select TEGRA_HSP + +config TEGRA_ISOMGR + bool "Isochronous Bandwidth Manager " + help + When enabled, drivers for ISO units can obtain ISO BW. + The memory controller (MC) for each Tegra platform can supply + a limited amount of isochronous (real-time) bandwidth. When + enabled, isomgr will manage a pool of ISO BW. + +config TEGRA_ISOMGR_POOL_KB_PER_SEC + int "Size of isomgr pool " + default 0 + help + Set this maximum ISO BW (in Kbytes/sec) that platform supports. + The memory controller (MC) for each Tegra platform can supply + a limited amount of isochronous (real-time) bandwidth. Each + platform must specify the maximum amount of ISO BW that isomgr + should manage. + +config TEGRA_ISOMGR_SYSFS + bool "Visibility into Isochronous Bandwidth Manager state " + depends on TEGRA_ISOMGR + help + When enabled, sysfs can be used to query isomgr state. + This is used for visibility into isomgr state. It could + be useful in debug or in understanding performance on a + running system. + +config TEGRA_ISOMGR_MAX_ISO_BW_QUIRK + bool "Relax Max ISO Bw limit" + depends on TEGRA_ISOMGR + default n + help + When enabled, allows system with less ISO bw continue to + work. This is necessary for systems running at lower + EMC clock freq or on FPGA. + +config TEGRA_MC + bool "Tegra MC" + default y + help + Enable Tegra MC. + +config TEGRA_OF_MCERR + bool "Tegra MCERR OF" + default y + help + Enable Tegra MC ERR OF. + +config TEGRA_PTP_NOTIFIER + tristate "Enable PTP Notifier" + depends on ARCH_TEGRA_18x_SOC + default y if EQOS + +config TEGRA_SAFETY_SCE + tristate "Enable CCPLEX-SCE communication Driver for Safety" + depends on ARCH_TEGRA_18x_SOC + select TEGRA_IVC + select TEGRA_HSP + help + This enables communication between CCPLEX and SCE over IVC channel. + This also provides a userspace command response interface as + character device which will be used by other safety modules. + +source "drivers/platform/tegra/nvadsp/Kconfig" diff --git a/drivers/platform/tegra/Kconfig.nvidia b/drivers/platform/tegra/Kconfig.nvidia deleted file mode 100644 index 82f5fd03d..000000000 --- a/drivers/platform/tegra/Kconfig.nvidia +++ /dev/null @@ -1,132 +0,0 @@ -config DENVER_CPU - bool "Denver CPU" - help - Support for NVIDIA Denver CPU - -config DENVER_DEBUG - bool "Denver Hardware Debug Tools" - depends on DENVER_CPU - help - This enables drivers that allow debugging the Denver CPU internals. - -config DENVER_MCA - tristate "Denver Machine Check Handler" - depends on DENVER_CPU - select SERROR_HANDLER - help - The Denver Machine Check handler. It collects and reports errors from - the Denver CPUs. - -config TEGRA_AON - bool "Tegra AON driver" - depends on ARCH_TEGRA_18x_SOC - select TEGRA_IVC - select TEGRA_HSP - -config TEGRA_ARI_MCA - tristate "Tegra Abstract Request Interface (ARI) Machine Check" - select SERROR_HANDLER - help - The Tegra Abstract Request Interface (ARI) Machine Check handler. This - handles the Machine Check registers that are accessible via ARI. - -config TEGRA_BRIDGE_MCA - tristate "AXI/APB Bridge Machine Check" - select SERROR_HANDLER - help - The Tegra AXI/APB Bridge Machine Check handler. This - handes the SERRs from failed AXI/APB transactions. - -config TEGRA_A57_SERR - tristate "A57 SError Handler" - select SERROR_HANDLER - help - The A57 SError Handler. This handles the SERRs from A57 cores, - specifically L1 ECC errors. - -config TEGRA_18X_SERROR - tristate "Tegra18 SError handler" - depends on ARCH_TEGRA_18x_SOC - select DENVER_MCA - select TEGRA_ARI_MCA - select TEGRA_BRIDGE_MCA - select TEGRA_A57_SERR - help - The Tegra18 SError handler. This handles Denver SErrors, A57 SErrors, - CCPLEX errors, and fabric slave errors. - -config TEGRA_BWMGR - bool "Enable EMC Bandwidth Manager" - depends on COMMON_CLK - default n - help - Enables Bandwidth manager support for EMC clock. Required when using Common Clock Framework - -config TEGRA_CAMERA_RTCPU - bool "Enable Tegra Camera RTCPU Driver" - depends on ARCH_TEGRA_18x_SOC - select TEGRA_IVC - select TEGRA_HSP - -config TEGRA_ISOMGR - bool "Isochronous Bandwidth Manager " - help - When enabled, drivers for ISO units can obtain ISO BW. - The memory controller (MC) for each Tegra platform can supply - a limited amount of isochronous (real-time) bandwidth. When - enabled, isomgr will manage a pool of ISO BW. - -config TEGRA_ISOMGR_POOL_KB_PER_SEC - int "Size of isomgr pool " - default 0 - help - Set this maximum ISO BW (in Kbytes/sec) that platform supports. - The memory controller (MC) for each Tegra platform can supply - a limited amount of isochronous (real-time) bandwidth. Each - platform must specify the maximum amount of ISO BW that isomgr - should manage. - -config TEGRA_ISOMGR_SYSFS - bool "Visibility into Isochronous Bandwidth Manager state " - depends on TEGRA_ISOMGR - help - When enabled, sysfs can be used to query isomgr state. - This is used for visibility into isomgr state. It could - be useful in debug or in understanding performance on a - running system. - -config TEGRA_ISOMGR_MAX_ISO_BW_QUIRK - bool "Relax Max ISO Bw limit" - depends on TEGRA_ISOMGR - default n - help - When enabled, allows system with less ISO bw continue to - work. This is necessary for systems running at lower - EMC clock freq or on FPGA. - -config TEGRA_MC - bool "Tegra MC" - default y - help - Enable Tegra MC. - -config TEGRA_OF_MCERR - bool "Tegra MCERR OF" - default y - help - Enable Tegra MC ERR OF. - -config TEGRA_PTP_NOTIFIER - tristate "Enable PTP Notifier" - depends on ARCH_TEGRA_18x_SOC - default y if EQOS - -config TEGRA_SAFETY_SCE - tristate "Enable CCPLEX-SCE communication Driver for Safety" - depends on ARCH_TEGRA_18x_SOC - select TEGRA_IVC - select TEGRA_HSP - help - This enables communication between CCPLEX and SCE over IVC channel. - This also provides a userspace command response interface as - character device which will be used by other safety modules. diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile new file mode 100644 index 000000000..944691b82 --- /dev/null +++ b/drivers/platform/tegra/Makefile @@ -0,0 +1,47 @@ +KBUILD_CFLAGS += -I$(srctree)/arch/arm/mach-tegra \ + -I$(srctree)/arch/arm/mach-tegra/include/ \ + -I$(srctree)/drivers/platform/tegra/ \ + -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu \ + -I$(srctree)/../nvidia/drivers/video/tegra/dc/ \ + -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel/ + +ccflags-y += -Werror +obj-$(CONFIG_TEGRA_MC) += mc/ +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_speedo.o +obj-$(CONFIG_TEGRA_NVDISPLAY) += panel-simulator.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra-mce.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra-roc.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-aowake.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-system-config.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += tegra-camera-rtcpu.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/ +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += pm-irq-t18x.o +ifeq ($(CONFIG_PM_SLEEP),y) +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += wakeups-t18x.o +endif +obj-y += powergate/ +obj-$(CONFIG_TEGRA_AON) += tegra-aon.o +obj-$(CONFIG_TEGRA_AON) += tegra-aon-ivc-echo.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_cpu_debugfs.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reboot-t18x.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += pm-tegra186.o +obj-$(CONFIG_TEGRA_AON) += tegra186_aondbg.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/ivc-bus.o +obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/hsp-doorbell.o +obj-$(CONFIG_TEGRA_ARI_MCA) += ari_mca.o +obj-$(CONFIG_TEGRA_18X_SERROR) += tegra18_serr.o +obj-$(CONFIG_TEGRA_BRIDGE_MCA) += bridge_mca.o +obj-$(CONFIG_TEGRA_A57_SERR) += tegra18_a57_serr.o +obj-$(CONFIG_TEGRA_CENTRAL_ACTMON) += cactmon_t18x.o +obj-$(CONFIG_TEGRA_CENTRAL_ACTMON) += cactmon_t21x.o +ifeq ($(CONFIG_HW_PERF_EVENTS), y) +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_perf_uncore.o +endif +obj-$(CONFIG_TEGRA_PTP_NOTIFIER) += ptp-notifier.o +obj-$(CONFIG_DENVER_CPU) += denver-knobs.o +obj-$(CONFIG_DENVER_DEBUG)+= denver-hardwood.o +obj-$(CONFIG_DENVER_MCA) += denver_mca.o +obj-$(CONFIG_TEGRA_SAFETY_SCE) += tegra-safety.o +tegra-safety-objs += tegra-safety-ivc.o tegra-safety-dev.o + +obj-$(CONFIG_TEGRA_NVADSP) += nvadsp/ diff --git a/drivers/platform/tegra/Makefile.nvidia b/drivers/platform/tegra/Makefile.nvidia deleted file mode 100644 index 90eab4ba1..000000000 --- a/drivers/platform/tegra/Makefile.nvidia +++ /dev/null @@ -1,45 +0,0 @@ -KBUILD_CFLAGS += -I$(srctree)/arch/arm/mach-tegra \ - -I$(srctree)/arch/arm/mach-tegra/include/ \ - -I$(srctree)/drivers/platform/tegra/ \ - -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu \ - -I$(srctree)/../nvidia/drivers/video/tegra/dc/ \ - -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel/ - -ccflags-y += -Werror -obj-$(CONFIG_TEGRA_MC) += mc/ -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_speedo.o -obj-$(CONFIG_TEGRA_NVDISPLAY) += panel-simulator.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra-mce.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra-roc.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-aowake.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-system-config.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += tegra-camera-rtcpu.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/ -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += pm-irq-t18x.o -ifeq ($(CONFIG_PM_SLEEP),y) -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += wakeups-t18x.o -endif -obj-y += powergate/ -obj-$(CONFIG_TEGRA_AON) += tegra-aon.o -obj-$(CONFIG_TEGRA_AON) += tegra-aon-ivc-echo.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_cpu_debugfs.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reboot-t18x.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += pm-tegra186.o -obj-$(CONFIG_TEGRA_AON) += tegra186_aondbg.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/ivc-bus.o -obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += rtcpu/hsp-doorbell.o -obj-$(CONFIG_TEGRA_ARI_MCA) += ari_mca.o -obj-$(CONFIG_TEGRA_18X_SERROR) += tegra18_serr.o -obj-$(CONFIG_TEGRA_BRIDGE_MCA) += bridge_mca.o -obj-$(CONFIG_TEGRA_A57_SERR) += tegra18_a57_serr.o -obj-$(CONFIG_TEGRA_CENTRAL_ACTMON) += cactmon_t18x.o -obj-$(CONFIG_TEGRA_CENTRAL_ACTMON) += cactmon_t21x.o -ifeq ($(CONFIG_HW_PERF_EVENTS), y) -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra18_perf_uncore.o -endif -obj-$(CONFIG_TEGRA_PTP_NOTIFIER) += ptp-notifier.o -obj-$(CONFIG_DENVER_CPU) += denver-knobs.o -obj-$(CONFIG_DENVER_DEBUG)+= denver-hardwood.o -obj-$(CONFIG_DENVER_MCA) += denver_mca.o -obj-$(CONFIG_TEGRA_SAFETY_SCE) += tegra-safety.o -tegra-safety-objs += tegra-safety-ivc.o tegra-safety-dev.o diff --git a/drivers/platform/tegra/nvadsp/Kconfig b/drivers/platform/tegra/nvadsp/Kconfig new file mode 100644 index 000000000..4f3fa7004 --- /dev/null +++ b/drivers/platform/tegra/nvadsp/Kconfig @@ -0,0 +1,80 @@ +config TEGRA_NVADSP + bool "Enable Host ADSP driver" + default n + select ARM_GIC_PM + select FIQ + help + Enables support for Host ADSP driver. + + If unsure, say N + +config TEGRA_NVADSP_ON_SMMU + bool "Use SMMU to relocate ADSP" + depends on (TEGRA_IOMMU_SMMU || OF_TEGRA_IOMMU_SMMU) && TEGRA_NVADSP + default n + help + Use SMMU to relocate ADSP OS. + +config TEGRA_ADSP_DFS + bool "Enable ADSP DFS" + depends on TEGRA_NVADSP + default n + help + Enable ADSP dynamic frequency scaling. Use this config + to scale adsp frequency via actmon or set fixed value. + + If unsure, say N + +config TEGRA_ADSP_ACTMON + bool "Enable ADSP ACTMON" + depends on TEGRA_ADSP_DFS + default n + help + Enable ADSP actmon. It converts adsp activty to frequency and + asks adsp dfs to set the adsp frequency. Use it if adsp frequency + to be scaled dynamically by actmon. + + If unsure, say N + +config TEGRA_ADSP_CPUSTAT + bool "Enable ADSP CPUSTAT" + depends on DEBUG_FS && TEGRA_NVADSP && !TEGRA_ADSP_ACTMON + default n + help + Enable ADSP cpu usage measurement using actmon + + If unsure, say N + +config TEGRA_ADSP_FILEIO + bool "Enable ADSP file io" + default n + help + Enable dumping to and reading from file on host from ADSP + + If unsure, say N + +config TEGRA_EMC_APE_DFS + bool "Enable emc dfs due to APE" + default n + help + Enable emc dfs due to APE DRAM access + + If unsure, say N + +config TEGRA_ADSP_CONSOLE + bool "Enable ADSP console" + depends on TEGRA_NVADSP + default y + help + Enable ADSP console access + + If unsure, say N + +config MBOX_ACK_HANDLER + bool "Enable mailbox acknowledge handler" + depends on TEGRA_NVADSP + default n + help + Enable mailbox acknowledge handler + + if unsure, say N diff --git a/drivers/platform/tegra/nvadsp/Kconfig.nvidia b/drivers/platform/tegra/nvadsp/Kconfig.nvidia deleted file mode 100644 index 4f3fa7004..000000000 --- a/drivers/platform/tegra/nvadsp/Kconfig.nvidia +++ /dev/null @@ -1,80 +0,0 @@ -config TEGRA_NVADSP - bool "Enable Host ADSP driver" - default n - select ARM_GIC_PM - select FIQ - help - Enables support for Host ADSP driver. - - If unsure, say N - -config TEGRA_NVADSP_ON_SMMU - bool "Use SMMU to relocate ADSP" - depends on (TEGRA_IOMMU_SMMU || OF_TEGRA_IOMMU_SMMU) && TEGRA_NVADSP - default n - help - Use SMMU to relocate ADSP OS. - -config TEGRA_ADSP_DFS - bool "Enable ADSP DFS" - depends on TEGRA_NVADSP - default n - help - Enable ADSP dynamic frequency scaling. Use this config - to scale adsp frequency via actmon or set fixed value. - - If unsure, say N - -config TEGRA_ADSP_ACTMON - bool "Enable ADSP ACTMON" - depends on TEGRA_ADSP_DFS - default n - help - Enable ADSP actmon. It converts adsp activty to frequency and - asks adsp dfs to set the adsp frequency. Use it if adsp frequency - to be scaled dynamically by actmon. - - If unsure, say N - -config TEGRA_ADSP_CPUSTAT - bool "Enable ADSP CPUSTAT" - depends on DEBUG_FS && TEGRA_NVADSP && !TEGRA_ADSP_ACTMON - default n - help - Enable ADSP cpu usage measurement using actmon - - If unsure, say N - -config TEGRA_ADSP_FILEIO - bool "Enable ADSP file io" - default n - help - Enable dumping to and reading from file on host from ADSP - - If unsure, say N - -config TEGRA_EMC_APE_DFS - bool "Enable emc dfs due to APE" - default n - help - Enable emc dfs due to APE DRAM access - - If unsure, say N - -config TEGRA_ADSP_CONSOLE - bool "Enable ADSP console" - depends on TEGRA_NVADSP - default y - help - Enable ADSP console access - - If unsure, say N - -config MBOX_ACK_HANDLER - bool "Enable mailbox acknowledge handler" - depends on TEGRA_NVADSP - default n - help - Enable mailbox acknowledge handler - - if unsure, say N diff --git a/drivers/platform/tegra/nvadsp/Makefile b/drivers/platform/tegra/nvadsp/Makefile new file mode 100644 index 000000000..87c8cd37d --- /dev/null +++ b/drivers/platform/tegra/nvadsp/Makefile @@ -0,0 +1,35 @@ +GCOV_PROFILE := y +ccflags-y += -Werror + +obj-y := nvadsp.o +nvadsp-objs += dev.o os.o app.o app_loader_linker.o\ + amc.o nvadsp_dram.o \ + nvadsp_shared_sema.o nvadsp_arb_sema.o \ + hwmailbox.o mailbox.o msgq.o \ + mem_manager.o aram_manager.o dram_app_mem_manager.o \ + dev-t21x.o os-t21x.o dev-t18x.o os-t18x.o acast.o + + +ifeq ($(CONFIG_TEGRA_ADSP_DFS),y) +nvadsp-objs += adsp_dfs.o +endif + +ifeq ($(CONFIG_TEGRA_ADSP_ACTMON),y) +nvadsp-objs += ape_actmon.o +endif + +ifeq ($(CONFIG_TEGRA_EMC_APE_DFS),y) +nvadsp-objs += emc_dfs.o +endif + +ifeq ($(CONFIG_TEGRA_ADSP_CONSOLE),y) +nvadsp-objs += adsp_console_dbfs.o +endif + +ifeq ($(CONFIG_TEGRA_ADSP_CPUSTAT),y) +nvadsp-objs += adsp_cpustat.o +endif + +ifeq ($(CONFIG_TEGRA_ADSP_FILEIO),y) +nvadsp-objs += adspff.o +endif diff --git a/drivers/platform/tegra/nvadsp/Makefile.nvidia b/drivers/platform/tegra/nvadsp/Makefile.nvidia deleted file mode 100644 index 87c8cd37d..000000000 --- a/drivers/platform/tegra/nvadsp/Makefile.nvidia +++ /dev/null @@ -1,35 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -Werror - -obj-y := nvadsp.o -nvadsp-objs += dev.o os.o app.o app_loader_linker.o\ - amc.o nvadsp_dram.o \ - nvadsp_shared_sema.o nvadsp_arb_sema.o \ - hwmailbox.o mailbox.o msgq.o \ - mem_manager.o aram_manager.o dram_app_mem_manager.o \ - dev-t21x.o os-t21x.o dev-t18x.o os-t18x.o acast.o - - -ifeq ($(CONFIG_TEGRA_ADSP_DFS),y) -nvadsp-objs += adsp_dfs.o -endif - -ifeq ($(CONFIG_TEGRA_ADSP_ACTMON),y) -nvadsp-objs += ape_actmon.o -endif - -ifeq ($(CONFIG_TEGRA_EMC_APE_DFS),y) -nvadsp-objs += emc_dfs.o -endif - -ifeq ($(CONFIG_TEGRA_ADSP_CONSOLE),y) -nvadsp-objs += adsp_console_dbfs.o -endif - -ifeq ($(CONFIG_TEGRA_ADSP_CPUSTAT),y) -nvadsp-objs += adsp_cpustat.o -endif - -ifeq ($(CONFIG_TEGRA_ADSP_FILEIO),y) -nvadsp-objs += adspff.o -endif diff --git a/drivers/platform/tegra/powergate/Makefile b/drivers/platform/tegra/powergate/Makefile new file mode 100644 index 000000000..b89051683 --- /dev/null +++ b/drivers/platform/tegra/powergate/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += powergate-t186.o diff --git a/drivers/platform/tegra/powergate/Makefile.nvidia b/drivers/platform/tegra/powergate/Makefile.nvidia deleted file mode 100644 index b89051683..000000000 --- a/drivers/platform/tegra/powergate/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += powergate-t186.o diff --git a/drivers/platform/tegra/rtcpu/Makefile b/drivers/platform/tegra/rtcpu/Makefile new file mode 100644 index 000000000..0b37f13b7 --- /dev/null +++ b/drivers/platform/tegra/rtcpu/Makefile @@ -0,0 +1,17 @@ +ccflags-y := -Werror +ccflags-y += -I$(srctree)/include +ccflags-y += -I$(srctree)/../nvhost +ccflags-y += -I$(srctree) +ccflags-y += -I$(srctree)/../nvidia +ccflags-y += -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu + +obj-y += debug.o +obj-y += tegra-sysfs-mbox.o +obj-y += vi-notify.o +obj-y += hsp-mbox.o +obj-y += tegra-rtcpu-trace.o +obj-y += camchar.o +obj-y += rtcpu-monitor.o +obj-y += tegra-ivc-rpc.o tegra-ivc-rpc-test.o +obj-y += capture-ivc.o +obj-y += syncpt-display-channel.o diff --git a/drivers/platform/tegra/rtcpu/Makefile.nvidia b/drivers/platform/tegra/rtcpu/Makefile.nvidia deleted file mode 100644 index 0b37f13b7..000000000 --- a/drivers/platform/tegra/rtcpu/Makefile.nvidia +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y := -Werror -ccflags-y += -I$(srctree)/include -ccflags-y += -I$(srctree)/../nvhost -ccflags-y += -I$(srctree) -ccflags-y += -I$(srctree)/../nvidia -ccflags-y += -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu - -obj-y += debug.o -obj-y += tegra-sysfs-mbox.o -obj-y += vi-notify.o -obj-y += hsp-mbox.o -obj-y += tegra-rtcpu-trace.o -obj-y += camchar.o -obj-y += rtcpu-monitor.o -obj-y += tegra-ivc-rpc.o tegra-ivc-rpc-test.o -obj-y += capture-ivc.o -obj-y += syncpt-display-channel.o diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig new file mode 100644 index 000000000..11a01543c --- /dev/null +++ b/drivers/regulator/Kconfig @@ -0,0 +1,11 @@ +if REGULATOR + +config REGULATOR_PMIC_OTP + bool "Provide a regulator with PMIC OTP without PMIC registration" + help + This driver able to provide all regulator interface to client + without any actual implementation. This should be used if it + is required to use the PMCI OTP configuration and do not want + to register PMIC. + +endif diff --git a/drivers/regulator/Kconfig.nvidia b/drivers/regulator/Kconfig.nvidia deleted file mode 100644 index 321ed2c9e..000000000 --- a/drivers/regulator/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -if REGULATOR - -config REGULATOR_PMIC_OTP - bool "Provide a regulator with PMIC OTP without PMIC registration" - help - This driver able to provide all regulator interface to client - without any actual implementation. This should be used if it - is required to use the PMCI OTP configuration and do not want - to register PMIC. -endif - diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile new file mode 100644 index 000000000..9dbd02bf5 --- /dev/null +++ b/drivers/regulator/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for regulator drivers. +# + +obj-$(CONFIG_REGULATOR_PMIC_OTP) += pmic-otp-regulator.o diff --git a/drivers/regulator/Makefile.nvidia b/drivers/regulator/Makefile.nvidia deleted file mode 100644 index 9dbd02bf5..000000000 --- a/drivers/regulator/Makefile.nvidia +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for regulator drivers. -# - -obj-$(CONFIG_REGULATOR_PMIC_OTP) += pmic-otp-regulator.o diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile new file mode 100644 index 000000000..94a640234 --- /dev/null +++ b/drivers/reset/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra/ +obj-y += reset-fake.o diff --git a/drivers/reset/Makefile.nvidia b/drivers/reset/Makefile.nvidia deleted file mode 100644 index 94a640234..000000000 --- a/drivers/reset/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra/ -obj-y += reset-fake.o diff --git a/drivers/reset/tegra/Makefile b/drivers/reset/tegra/Makefile new file mode 100644 index 000000000..eec4279fc --- /dev/null +++ b/drivers/reset/tegra/Makefile @@ -0,0 +1,16 @@ +# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reset-bpmp.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reset-tegra.o diff --git a/drivers/reset/tegra/Makefile.nvidia b/drivers/reset/tegra/Makefile.nvidia deleted file mode 100644 index eec4279fc..000000000 --- a/drivers/reset/tegra/Makefile.nvidia +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reset-bpmp.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += reset-tegra.o diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig new file mode 100644 index 000000000..b81d09153 --- /dev/null +++ b/drivers/scsi/ufs/Kconfig @@ -0,0 +1,11 @@ +config SCSI_UFSHCD_TEGRA + tristate "Tegra UFS Controller support" + depends on SCSI_UFSHCD + ---help--- + This selects the Tegra specific additions to UFSHCD platform driver. + UFS host on TEGRA needs some vendor specific configuration before + accessing the hardware which includes PHY configuration and vendor + specific registers. + + Select this if you have UFS controller on Tegra chipset. + If unsure, say N. diff --git a/drivers/scsi/ufs/Kconfig.nvidia b/drivers/scsi/ufs/Kconfig.nvidia deleted file mode 100644 index b81d09153..000000000 --- a/drivers/scsi/ufs/Kconfig.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -config SCSI_UFSHCD_TEGRA - tristate "Tegra UFS Controller support" - depends on SCSI_UFSHCD - ---help--- - This selects the Tegra specific additions to UFSHCD platform driver. - UFS host on TEGRA needs some vendor specific configuration before - accessing the hardware which includes PHY configuration and vendor - specific registers. - - Select this if you have UFS controller on Tegra chipset. - If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile new file mode 100644 index 000000000..025f7075f --- /dev/null +++ b/drivers/scsi/ufs/Makefile @@ -0,0 +1,2 @@ +KBUILD_CFLAGS += -I$(srctree)/drivers/scsi/ufs/ +obj-$(CONFIG_SCSI_UFSHCD_TEGRA) += ufs-tegra.o ufs-provision.o diff --git a/drivers/scsi/ufs/Makefile.nvidia b/drivers/scsi/ufs/Makefile.nvidia deleted file mode 100644 index 025f7075f..000000000 --- a/drivers/scsi/ufs/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -KBUILD_CFLAGS += -I$(srctree)/drivers/scsi/ufs/ -obj-$(CONFIG_SCSI_UFSHCD_TEGRA) += ufs-tegra.o ufs-provision.o diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig new file mode 100644 index 000000000..f0209f956 --- /dev/null +++ b/drivers/spi/Kconfig @@ -0,0 +1,12 @@ +if SPI +if SPI_MASTER + +config SPI_TEGRA186_AON + bool "Tegra18x AON SPI proxy driver" + depends on ARCH_TEGRA_18x_SOC + default y + select TEGRA_IVC + select TEGRA_HSP + +endif +endif diff --git a/drivers/spi/Kconfig.nvidia b/drivers/spi/Kconfig.nvidia deleted file mode 100644 index 4d43f6557..000000000 --- a/drivers/spi/Kconfig.nvidia +++ /dev/null @@ -1,6 +0,0 @@ -config SPI_TEGRA186_AON - bool "Tegra18x AON SPI proxy driver" - depends on ARCH_TEGRA_18x_SOC - default y - select TEGRA_IVC - select TEGRA_HSP diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile new file mode 100644 index 000000000..5c671030f --- /dev/null +++ b/drivers/spi/Makefile @@ -0,0 +1,7 @@ +GCOV_PROFILE := y + +ccflags-y += -Werror +ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG + +obj-$(CONFIG_SPI_TEGRA186_AON) += spi-tegra-aon.o + diff --git a/drivers/spi/Makefile.nvidia b/drivers/spi/Makefile.nvidia deleted file mode 100644 index 5c671030f..000000000 --- a/drivers/spi/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -GCOV_PROFILE := y - -ccflags-y += -Werror -ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG - -obj-$(CONFIG_SPI_TEGRA186_AON) += spi-tegra-aon.o - diff --git a/drivers/staging/iio/meter/Kconfig b/drivers/staging/iio/meter/Kconfig new file mode 100644 index 000000000..f8221d3d1 --- /dev/null +++ b/drivers/staging/iio/meter/Kconfig @@ -0,0 +1,27 @@ +append_menu "Active energy metering IC" + +config INA219 + tristate "TI INA219 bidirectional current/power monitor" + depends on I2C + help + TI INA219 is High- or Low-Side Measurement,Bidirectional + CURRENT/POWER MONITOR with I2C Interface. + Say Y here if you have INA219 hooked to a I2C bus. + +config INA230 + tristate "TI INA230 bidirectional current/power monitor" + depends on I2C + help + TI INA230 is High- or Low-Side Measurement,Bidirectional + CURRENT/POWER MONITOR with I2C Interface. + Say Y here if you have INA230 hooked to a I2C bus. + +config INA3221 + tristate "TI INA3221 3-Channel Shunt and Bus Voltage Monitor" + depends on I2C + help + TI INA3221 is Triple-Channel, High-Side Measurement, Shunt and Bus + Voltage Monitor with I2C Interface + Say Y here if you have INA3221 hooked to a I2C bus. + +endmenu diff --git a/drivers/staging/iio/meter/Kconfig.nvidia b/drivers/staging/iio/meter/Kconfig.nvidia deleted file mode 100644 index 2f57c55ba..000000000 --- a/drivers/staging/iio/meter/Kconfig.nvidia +++ /dev/null @@ -1,23 +0,0 @@ -config INA219 - tristate "TI INA219 bidirectional current/power monitor" - depends on I2C - help - TI INA219 is High- or Low-Side Measurement,Bidirectional - CURRENT/POWER MONITOR with I2C Interface. - Say Y here if you have INA219 hooked to a I2C bus. - -config INA230 - tristate "TI INA230 bidirectional current/power monitor" - depends on I2C - help - TI INA230 is High- or Low-Side Measurement,Bidirectional - CURRENT/POWER MONITOR with I2C Interface. - Say Y here if you have INA230 hooked to a I2C bus. - -config INA3221 - tristate "TI INA3221 3-Channel Shunt and Bus Voltage Monitor" - depends on I2C - help - TI INA3221 is Triple-Channel, High-Side Measurement, Shunt and Bus - Voltage Monitor with I2C Interface - Say Y here if you have INA3221 hooked to a I2C bus. diff --git a/drivers/staging/iio/meter/Makefile b/drivers/staging/iio/meter/Makefile new file mode 100644 index 000000000..85557f4c9 --- /dev/null +++ b/drivers/staging/iio/meter/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for metering ic drivers +# + +obj-$(CONFIG_INA219) += ina219.o +obj-$(CONFIG_INA230) += ina230.o +obj-$(CONFIG_INA3221) += ina3221.o diff --git a/drivers/staging/iio/meter/Makefile.nvidia b/drivers/staging/iio/meter/Makefile.nvidia deleted file mode 100644 index 85557f4c9..000000000 --- a/drivers/staging/iio/meter/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for metering ic drivers -# - -obj-$(CONFIG_INA219) += ina219.o -obj-$(CONFIG_INA230) += ina230.o -obj-$(CONFIG_INA3221) += ina3221.o diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile new file mode 100644 index 000000000..0c48740ad --- /dev/null +++ b/drivers/thermal/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_TEGRA_BPMP) += tegra_bpmp_thermal.o diff --git a/drivers/thermal/Makefile.nvidia b/drivers/thermal/Makefile.nvidia deleted file mode 100644 index 0c48740ad..000000000 --- a/drivers/thermal/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_TEGRA_BPMP) += tegra_bpmp_thermal.o diff --git a/drivers/thermal/tegra/Kconfig b/drivers/thermal/tegra/Kconfig new file mode 100644 index 000000000..dfcd3c3b6 --- /dev/null +++ b/drivers/thermal/tegra/Kconfig @@ -0,0 +1,32 @@ +append_menu "NVIDIA Tegra thermal drivers" + +config TEGRA_AOTAG + bool "Tegra Always-On-Thermal-Alert-Generator" + help + Support for Tegra Always-On thermal Alert Generator + +config TEGRA_TJ_THERMAL + bool "Tegra Tj temperature" + default y + help + Enable this option to read the temperature of hottest spot on Tegra + SoC. The driver can be configured (via device-tree) to account for + multiple thermal zones and the corresponding configurable hotspot + offsets, and, report the maximum temperature from the same, hence, + representing the hottest point on the chip. + +config TEGRA_CORE_CAPS + tristate "Tegra core DVFS thermal limits" + depends on TEGRA_DVFS + help + This config enables a cooling device that enforces VF limits on the + core voltage rail. + +config TEGRA_DFLL_CAPS + tristate "Tegra DFLL DVFS thermal limits" + depends on TEGRA_DVFS + help + This config enables a cooling device that enforces VF limits on the + cpu DFLL clock. + +endmenu diff --git a/drivers/thermal/tegra/Kconfig.nvidia b/drivers/thermal/tegra/Kconfig.nvidia deleted file mode 100644 index db9f4bc7f..000000000 --- a/drivers/thermal/tegra/Kconfig.nvidia +++ /dev/null @@ -1,28 +0,0 @@ -config TEGRA_AOTAG - bool "Tegra Always-On-Thermal-Alert-Generator" - help - Support for Tegra Always-On thermal Alert Generator - -config TEGRA_TJ_THERMAL - bool "Tegra Tj temperature" - default y - help - Enable this option to read the temperature of hottest spot on Tegra - SoC. The driver can be configured (via device-tree) to account for - multiple thermal zones and the corresponding configurable hotspot - offsets, and, report the maximum temperature from the same, hence, - representing the hottest point on the chip. - -config TEGRA_CORE_CAPS - tristate "Tegra core DVFS thermal limits" - depends on TEGRA_DVFS - help - This config enables a cooling device that enforces VF limits on the - core voltage rail. - -config TEGRA_DFLL_CAPS - tristate "Tegra DFLL DVFS thermal limits" - depends on TEGRA_DVFS - help - This config enables a cooling device that enforces VF limits on the - cpu DFLL clock. diff --git a/drivers/thermal/tegra/Makefile b/drivers/thermal/tegra/Makefile new file mode 100644 index 000000000..5338fddc9 --- /dev/null +++ b/drivers/thermal/tegra/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_TEGRA_AOTAG) += aotag.o +obj-$(CONFIG_TEGRA_TJ_THERMAL) += tegra_tj_thermal.o +obj-$(CONFIG_TEGRA_CORE_CAPS) += tegra-core-action.o +obj-$(CONFIG_TEGRA_DFLL_CAPS) += tegra-dfll-action.o diff --git a/drivers/thermal/tegra/Makefile.nvidia b/drivers/thermal/tegra/Makefile.nvidia deleted file mode 100644 index 5338fddc9..000000000 --- a/drivers/thermal/tegra/Makefile.nvidia +++ /dev/null @@ -1,4 +0,0 @@ -obj-$(CONFIG_TEGRA_AOTAG) += aotag.o -obj-$(CONFIG_TEGRA_TJ_THERMAL) += tegra_tj_thermal.o -obj-$(CONFIG_TEGRA_CORE_CAPS) += tegra-core-action.o -obj-$(CONFIG_TEGRA_DFLL_CAPS) += tegra-dfll-action.o diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile new file mode 100644 index 000000000..dd3b9b662 --- /dev/null +++ b/drivers/tty/Makefile @@ -0,0 +1 @@ +obj-y += serial/ diff --git a/drivers/tty/Makefile.nvidia b/drivers/tty/Makefile.nvidia deleted file mode 100644 index dd3b9b662..000000000 --- a/drivers/tty/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-y += serial/ diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig new file mode 100644 index 000000000..0175aac45 --- /dev/null +++ b/drivers/tty/serial/Kconfig @@ -0,0 +1,28 @@ +if TTY + +config TEGRA_COMBINED_UART + bool "Tegra combined UART" + depends on ARCH_TEGRA_18x_SOC + default n + help + Tegra combined UART is a client-server model which allows a server + running on SPE to multiplex a single UART controller amongst multiple + UART clients. + + This config enables the Linux client driver. Instead of + directly bit banging the UART controller, the client driver + communicates with the SPE server using mailbox registers. The SPE + server multiplexes the UART controller amongst the various clients. + This allows all the clients to send output and receive input through a + single UART controller. + +config TEGRA_HV_COMM + tristate "Tegra Hypervisor Communication" + depends on TEGRA_HV_MANAGER + help + Add support for emulating a TTY device over the Tegra Hypervisor interface. + + To compile this driver as a module, choose M here: the + module will be called tegra_hv_comm. + +endif diff --git a/drivers/tty/serial/Kconfig.nvidia b/drivers/tty/serial/Kconfig.nvidia deleted file mode 100644 index f82bf9d27..000000000 --- a/drivers/tty/serial/Kconfig.nvidia +++ /dev/null @@ -1,24 +0,0 @@ -config TEGRA_COMBINED_UART - bool "Tegra combined UART" - depends on ARCH_TEGRA_18x_SOC - default n - help - Tegra combined UART is a client-server model which allows a server - running on SPE to multiplex a single UART controller amongst multiple - UART clients. - - This config enables the Linux client driver. Instead of - directly bit banging the UART controller, the client driver - communicates with the SPE server using mailbox registers. The SPE - server multiplexes the UART controller amongst the various clients. - This allows all the clients to send output and receive input through a - single UART controller. - -config TEGRA_HV_COMM - tristate "Tegra Hypervisor Communication" - depends on TEGRA_HV_MANAGER - help - Add support for emulating a TTY device over the Tegra Hypervisor interface. - - To compile this driver as a module, choose M here: the - module will be called tegra_hv_comm. diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile new file mode 100644 index 000000000..b83ebcb0e --- /dev/null +++ b/drivers/tty/serial/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_TEGRA_COMBINED_UART) += tegra-combined-uart.o +obj-$(CONFIG_TEGRA_HV_COMM) += tegra_hv_comm.o diff --git a/drivers/tty/serial/Makefile.nvidia b/drivers/tty/serial/Makefile.nvidia deleted file mode 100644 index b83ebcb0e..000000000 --- a/drivers/tty/serial/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_TEGRA_COMBINED_UART) += tegra-combined-uart.o -obj-$(CONFIG_TEGRA_HV_COMM) += tegra_hv_comm.o diff --git a/drivers/video/Makefile b/drivers/video/Makefile new file mode 100644 index 000000000..200a62c22 --- /dev/null +++ b/drivers/video/Makefile @@ -0,0 +1,4 @@ +subdir-ccflags-y += -Werror + +obj-y += backlight/ +obj-y += tegra/ diff --git a/drivers/video/Makefile.nvidia b/drivers/video/Makefile.nvidia deleted file mode 100644 index 200a62c22..000000000 --- a/drivers/video/Makefile.nvidia +++ /dev/null @@ -1,4 +0,0 @@ -subdir-ccflags-y += -Werror - -obj-y += backlight/ -obj-y += tegra/ diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig new file mode 100644 index 000000000..4e1bdee5a --- /dev/null +++ b/drivers/video/backlight/Kconfig @@ -0,0 +1,18 @@ +# +# Backlight & LCD drivers configuration +# + +if BACKLIGHT_LCD_SUPPORT + +if BACKLIGHT_CLASS_DEVICE + +config BACKLIGHT_DS1050 + tristate "Backlight driver for Maxim DS1050" + depends on I2C + help + If you have a DS1050 for backlight, say Y to enable the + backlight driver. + +endif # BACKLIGHT_CLASS_DEVICE + +endif # BACKLIGHT_LCD_SUPPORT diff --git a/drivers/video/backlight/Kconfig.nvidia b/drivers/video/backlight/Kconfig.nvidia deleted file mode 100644 index 41ea86b56..000000000 --- a/drivers/video/backlight/Kconfig.nvidia +++ /dev/null @@ -1,19 +0,0 @@ -# -# Backlight & LCD drivers configuration -# - -if BACKLIGHT_LCD_SUPPORT - -if BACKLIGHT_CLASS_DEVICE - -config BACKLIGHT_DS1050 - tristate "Backlight driver for Maxim DS1050" - depends on I2C - help - If you have a DS1050 for backlight, say Y to enable the - backlight driver. - -endif # BACKLIGHT_CLASS_DEVICE - -endif # BACKLIGHT_LCD_SUPPORT - diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile new file mode 100644 index 000000000..72e7f845e --- /dev/null +++ b/drivers/video/backlight/Makefile @@ -0,0 +1,3 @@ +# Backlight & LCD drivers + +obj-$(CONFIG_BACKLIGHT_DS1050) += ds1050_bl.o diff --git a/drivers/video/backlight/Makefile.nvidia b/drivers/video/backlight/Makefile.nvidia deleted file mode 100644 index 72e7f845e..000000000 --- a/drivers/video/backlight/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -# Backlight & LCD drivers - -obj-$(CONFIG_BACKLIGHT_DS1050) += ds1050_bl.o diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig new file mode 100644 index 000000000..5a938037d --- /dev/null +++ b/drivers/video/tegra/Kconfig @@ -0,0 +1,346 @@ +if ARCH_TEGRA + +config TEGRA_GRHOST + tristate "Tegra graphics host driver" + help + Driver for the Tegra graphics host hardware. + +config TEGRA_GRHOST_ISP + depends on TEGRA_GRHOST + tristate "Tegra image processing pipeline support" + default y + help + Driver for the Tegra image processing pipeline (ISP) + To compile this driver as a module, choose M here: + the module will be called nvhost-isp. + +config TEGRA_GRHOST_VIC + depends on TEGRA_GRHOST + tristate "Tegra VIC support" + default y + help + Driver for the Tegra Video Image Compositor is an falcon + based engine used image composition. + +config TEGRA_GRHOST_NVDEC + depends on TEGRA_GRHOST + tristate "Tegra NVDEC support" + default y + help + Driver for the Tegra NVDEC is an engine which + can be used for decoding various multimedia formats. + +config TEGRA_GRHOST_NVENC + depends on TEGRA_GRHOST + tristate "Tegra NVENC support" + default y + help + Driver for the Tegra NVENC is an engine which + can be used for encoding various multimedia formats. + +config TEGRA_GRHOST_NVJPG + depends on TEGRA_GRHOST + tristate "Tegra NVJPG support" + default y + help + Driver for the Tegra NVJPG is an engine which + can be used for JPEG encoding and decoding. + +config TEGRA_GRHOST_TSEC + depends on TEGRA_GRHOST + tristate "Tegra TSEC support" + default y + help + Driver for the Tegra TSEC is falcon based engine which + provides security. + +config TEGRA_GRHOST_NVCSI + bool "Tegra NVCSI support" + depends on TEGRA_GRHOST && ARCH_TEGRA_18x_SOC + default y + help + Enables support for camera CSI support under nvhost + Say N here if not sure. + +config TEGRA_GRHOST_DEFAULT_TIMEOUT + depends on TEGRA_GRHOST + int "Default timeout for submits" + default 10000 + help + Default timeout for jobs in milliseconds. Set to zero for no timeout. + +config TEGRA_GRHOST_SYNC + depends on TEGRA_GRHOST || TEGRA_HOST1X + bool "Tegra host synchronization objects" + default y + select SYNC + help + Add tegra host backend for the cross driver synchronization framework. + Allows creating sync fence file descriptors from Tegra host syncpoints. + +config TEGRA_GRHOST_VHOST + depends on TEGRA_GRHOST + bool "Tegra virtualized host support" + default y + help + Allows the nvhost driver to function as a client for a virtualized + Host1x server. + +config NVDEC_BOOTLOADER + depends on TEGRA_GRHOST_NVDEC + bool "Enable use of nvdec bootloader" + help + Say Y here if you want to enable nvdec bootloader + If unsure, say N + +config TEGRA_CAMERA_PLATFORM + bool "Enable tegra camera platform driver" + depends on ARCH_TEGRA + depends on VIDEO_TEGRA_VI + default y + help + Enables tegra camera platform driver. + If unsure, say Y + +comment "NVIDIA Tegra Display Driver options" + +config TEGRA_NVDISPLAY + bool "Tegra NvDisplay Architecture Support" + depends on TEGRA_DC + help + Enable the support for NvDisplay Architecture + If unsure, say N + +config TEGRA_DC_64BIT_SUPPORT + bool "64-bit addressing in DC" + depends on TEGRA_DC && ARCH_TEGRA_210_SOC + default y + help + T12x/T21x LPAE support in dc driver. + This is needed to support buffers whose physical address does + not fit into 32-bits. + Default is to enable it on 64-bit platforms. + +config TEGRA_NVSD + bool "Tegra SmartDimmer" + depends on TEGRA_DC && !TEGRA_NVDISPLAY + default y + help + Smart Dimmer support for Tegra display controller. + +config TEGRA_SD_GEN2 + bool "Tegra SD Gen2" + depends on TEGRA_DC && TEGRA_NVSD + default y + help + Smart Dimmer Gen2 support for Tegra display controller. + +config TEGRA_DC_TEMPORAL_DITHER + bool + depends on TEGRA_DC + default y + +config FB_TEGRA + tristate "Tegra Framebuffer driver" + depends on TEGRA_DC && FB = y + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + default FB && !ADF + help + Framebuffer device support for the Tegra display controller. + +config TEGRA_DC_SCREEN_CAPTURE + bool "Tegra Display Screen Capture" + depends on TEGRA_DC + default n + help + Say Y here to enable the Tegra Screen Capture support. + Provides additional IOCTLs to pause display and capture display control + information and framebuffers. + Disabled by default since this may disrupt display. Recommend to enable + only for development. + +config TEGRA_DSI + bool "Enable DSI panel." + depends on TEGRA_DC && TEGRA_MIPI_CAL + help + Say Y here to enable the DSI panel. + +config TEGRA_DSI2EDP_TC358767 + bool "Enable DSI2EDP TC358767 bridge." + help + Say Y here to enable the DSI2EDP TOSHIBA 358767 adapter. + +config TEGRA_DSI2EDP_SN65DSI86 + bool "Enable DSI2EDP SN65DSI86 bridge." + help + Say Y here to enable the DSI2EDP TI SN65DSI86 adapter. + +config TEGRA_DSI2LVDS_SN65DSI85 + bool "Enable DSI2LVDS SN65DSI85 bridge." + help + Say Y here to enable the DSI2LVDS TI SN65DSI85 adapter. + +config TEGRA_LVDS2FPDL_DS90UB947 + bool "DS90UB947-Q1 1080p OpenLDS to FPD-Link III Serializer driver" + default n + help + Enable support for TI DS90UB947-Q1 LVDS-to-FPD-Link Serializer driver. + +config TEGRA_DS90UH948Q_DESER + bool "DS90UH948Q FPDLink Deserializer" + depends on I2C + help + Say Y here to enable FPDLink to LVDS TI DS90UH948 adapter + Disabled by default. DS90UH948Q is a deserializer chip which converts + FPDLink signal to OpenLDI. This config enables deserializer driver for + DS90UH948 chip. + +config TEGRA_EDP2LVDS_PS8625 + bool "Enable EDP2LVDS PS8625 bridge." + default n + help + Say Y here to enable the EDP2LVDS PS8625 bridge. + Disabled by default. PS8625 is i2c slave chip which has EDP to LVDS + support. For L4T, the display head will be treated as EDP, this + chip takes care of converting edp to lvds signals. + +config TEGRA_DP + bool "Enable eDP panel." + default y + help + Say Y here to enable eDP panel. + +config TEGRA_HDMI2_0 + bool "Enable hdmi2.0" + depends on TEGRA_DC + default n + help + Say Y here to enable HDMI 2.0. + Supported by sor-hdmi only. + Suported on T21x and later chips only. + Disabled by default since most chips are using older controller at present. + +config TEGRA_HDMI2GMSL_MAX929x + bool "Enable HDMI-to-GMSL MAX929x bridge." + help + Say Y here to enable the Maxim Integrated MAX929x driver. + This bridge chip converts SOR->HDMI output to GMSL. + Driver supports MAX9291 and MAX9293 chips, ignoring HDCP on the latter. + +config TEGRA_HDMI2DSI_TC358870 + bool "Enable HDMI-to-DSI TC358870 bridge." + depends on TEGRA_HDMI2_0 && I2C + default n + help + Say Y here to enable the Toshiba TC358870 bridge. + The bridge chip converts HDMI output to DSI. + +config TEGRA_HDA_DC + bool "Enable HDA DC driver" + depends on TEGRA_HDMI2_0 || TEGRA_DP + default y + help + Say Y here to enable separate HDA driver in DC space. + Separate HDA driver is written to support both DP/HDMI from same code. + Removes redundancy of HDA code, so it doesn't get duplicated for each client. + Supported for T21x and later chips only which have HDMI2_0 or DP enabled. + +config TEGRA_HDMI2FPD + bool + +config TEGRA_HDMI2FPD_DS90UH949 + bool "DS90UH949 FPDLink Serializer" + depends on I2C + select TEGRA_HDMI2FPD + help + Say Y here to enable HDMI2FPD serializer bridge + This is a driver for FPDLink Serializer DS90UH949. + This option is required when HDMI output is converted to FPD output + using DS90UH949 serializer chip. + +config TEGRA_NVSR + bool "Enable NVSR support." + default n + help + Say Y here to enable NVSR support. + +config TEGRA_VRR + bool "Enable VRR Support" + default n + help + Say Y here to support VRR. + +config TEGRA_HDMIVRR + bool "Enable HDMIVRR Support." + default n + help + Say Y here to support HDMIVRR. HDMIVRR monitor supports variable + refresh rate so that the display scanout matches graphics rendering + speed. It is enabled to improve user experience for games and videos. + +config TEGRA_HDMIHDCP + bool "Support HDCP content protection on HDMI2_0" + depends on TEGRA_HDMI2_0 + help + Say Y here to support HDCP upstream and downstream protocols for HDMI2_0, + this requires a correctly fused chip to negotiate keys. + It is only needed if you have an application that cares about checking + for HDCP security while playing protected content. You do not need this + option to simply display a GUI on an HDMI TV. An HDMI TV will display + unprotected content just fine. + +config TEGRA_DEBUG_HDCP + bool "Support Debug mode for HDCP on HDMI2_0" + depends on TEGRA_HDMIHDCP + default n + help + Say Y here to expose debugfs nodes for HDCP content protection on HDMI2_0. + It is only required if you need to modify the number of retries for HDCP + authentication. + +config TEGRA_DPHDCP + bool "Support HDCP content protection on DP" + depends on TEGRA_DP + help + Say Y here to support HDCP upstream and downstream protocols for DP, + This requires a correctly fused chip to negotiate keys. + It is needed if you have an application that cares about checking + for HDCP security while playing protected content. + +config TEGRA_DEBUG_DP_HDCP + bool "Support Debug mode for HDCP on DP" + depends on TEGRA_DPHDCP + default n + help + Say Y here to expose debugfs nodes for HDCP content protection on DP. + It is needed to modify the number of retries for HDCP authentication. + +config TEGRA_YUV_BYPASS_MODE_FILTER + bool "Filter-out YUV bypass modes" + default n + help + Display driver parses all the YUV modes specified in EDID of a given sink. + But T210 does not have hardware support for any of the YUV modes and T186 hardware + supports only YUV422 and YUV444 modes. Say Y here to filter out all YUV modes on + T210 platforms and to filter out YUV420 modes on T186 platforms. These modes will + not be exposed to upper layers, including userspace. + +config TEGRA_DC_FAKE_PANEL_SUPPORT + bool "Enables fake panel and NULL OR support" + depends on TEGRA_DC + default y + help + Select Y to enable support for the + Display Controller to output to + fake panel or NULL Output Resource. + Used for silicon characterization and + automated testing. should not be enabled + for production. + +source "drivers/misc/tegra-cec/Kconfig" +source "drivers/video/tegra/host/Kconfig" +source "drivers/video/tegra/nvmap/Kconfig" + +endif diff --git a/drivers/video/tegra/Kconfig.nvidia b/drivers/video/tegra/Kconfig.nvidia deleted file mode 100644 index 3e42f0181..000000000 --- a/drivers/video/tegra/Kconfig.nvidia +++ /dev/null @@ -1,341 +0,0 @@ -config TEGRA_GRHOST - tristate "Tegra graphics host driver" - help - Driver for the Tegra graphics host hardware. - -config TEGRA_GRHOST_ISP - depends on TEGRA_GRHOST - tristate "Tegra image processing pipeline support" - default y - help - Driver for the Tegra image processing pipeline (ISP) - To compile this driver as a module, choose M here: - the module will be called nvhost-isp. - -config TEGRA_GRHOST_VIC - depends on TEGRA_GRHOST - tristate "Tegra VIC support" - default y - help - Driver for the Tegra Video Image Compositor is an falcon - based engine used image composition. - -config TEGRA_GRHOST_NVDEC - depends on TEGRA_GRHOST - tristate "Tegra NVDEC support" - default y - help - Driver for the Tegra NVDEC is an engine which - can be used for decoding various multimedia formats. - -config TEGRA_GRHOST_NVENC - depends on TEGRA_GRHOST - tristate "Tegra NVENC support" - default y - help - Driver for the Tegra NVENC is an engine which - can be used for encoding various multimedia formats. - -config TEGRA_GRHOST_NVJPG - depends on TEGRA_GRHOST - tristate "Tegra NVJPG support" - default y - help - Driver for the Tegra NVJPG is an engine which - can be used for JPEG encoding and decoding. - -config TEGRA_GRHOST_TSEC - depends on TEGRA_GRHOST - tristate "Tegra TSEC support" - default y - help - Driver for the Tegra TSEC is falcon based engine which - provides security. - -config TEGRA_GRHOST_NVCSI - bool "Tegra NVCSI support" - depends on TEGRA_GRHOST && ARCH_TEGRA_18x_SOC - default y - help - Enables support for camera CSI support under nvhost - Say N here if not sure. - -config TEGRA_GRHOST_DEFAULT_TIMEOUT - depends on TEGRA_GRHOST - int "Default timeout for submits" - default 10000 - help - Default timeout for jobs in milliseconds. Set to zero for no timeout. - -config TEGRA_GRHOST_SYNC - depends on TEGRA_GRHOST || TEGRA_HOST1X - bool "Tegra host synchronization objects" - default y - select SYNC - help - Add tegra host backend for the cross driver synchronization framework. - Allows creating sync fence file descriptors from Tegra host syncpoints. - -config TEGRA_GRHOST_VHOST - depends on TEGRA_GRHOST - bool "Tegra virtualized host support" - default y - help - Allows the nvhost driver to function as a client for a virtualized - Host1x server. - -config NVDEC_BOOTLOADER - depends on TEGRA_GRHOST_NVDEC - bool "Enable use of nvdec bootloader" - help - Say Y here if you want to enable nvdec bootloader - If unsure, say N - -config TEGRA_CAMERA_PLATFORM - bool "Enable tegra camera platform driver" - depends on ARCH_TEGRA - depends on VIDEO_TEGRA_VI - default y - help - Enables tegra camera platform driver. - If unsure, say Y - -comment "NVIDIA Tegra Display Driver options" - -config TEGRA_NVDISPLAY - bool "Tegra NvDisplay Architecture Support" - depends on TEGRA_DC - help - Enable the support for NvDisplay Architecture - If unsure, say N - -config TEGRA_DC_64BIT_SUPPORT - bool "64-bit addressing in DC" - depends on TEGRA_DC && ARCH_TEGRA_210_SOC - default y - help - T12x/T21x LPAE support in dc driver. - This is needed to support buffers whose physical address does - not fit into 32-bits. - Default is to enable it on 64-bit platforms. - -config TEGRA_NVSD - bool "Tegra SmartDimmer" - depends on TEGRA_DC && !TEGRA_NVDISPLAY - default y - help - Smart Dimmer support for Tegra display controller. - -config TEGRA_SD_GEN2 - bool "Tegra SD Gen2" - depends on TEGRA_DC && TEGRA_NVSD - default y - help - Smart Dimmer Gen2 support for Tegra display controller. - -config TEGRA_DC_TEMPORAL_DITHER - bool - depends on TEGRA_DC - default y - -config FB_TEGRA - tristate "Tegra Framebuffer driver" - depends on TEGRA_DC && FB = y - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - default FB && !ADF - help - Framebuffer device support for the Tegra display controller. - -config TEGRA_DC_SCREEN_CAPTURE - bool "Tegra Display Screen Capture" - depends on TEGRA_DC - default n - help - Say Y here to enable the Tegra Screen Capture support. - Provides additional IOCTLs to pause display and capture display control - information and framebuffers. - Disabled by default since this may disrupt display. Recommend to enable - only for development. - -config TEGRA_DSI - bool "Enable DSI panel." - depends on TEGRA_DC && TEGRA_MIPI_CAL - help - Say Y here to enable the DSI panel. - -config TEGRA_DSI2EDP_TC358767 - bool "Enable DSI2EDP TC358767 bridge." - help - Say Y here to enable the DSI2EDP TOSHIBA 358767 adapter. - -config TEGRA_DSI2EDP_SN65DSI86 - bool "Enable DSI2EDP SN65DSI86 bridge." - help - Say Y here to enable the DSI2EDP TI SN65DSI86 adapter. - -config TEGRA_DSI2LVDS_SN65DSI85 - bool "Enable DSI2LVDS SN65DSI85 bridge." - help - Say Y here to enable the DSI2LVDS TI SN65DSI85 adapter. - -config TEGRA_LVDS2FPDL_DS90UB947 - bool "DS90UB947-Q1 1080p OpenLDS to FPD-Link III Serializer driver" - default n - help - Enable support for TI DS90UB947-Q1 LVDS-to-FPD-Link Serializer driver. - -config TEGRA_DS90UH948Q_DESER - bool "DS90UH948Q FPDLink Deserializer" - depends on I2C - help - Say Y here to enable FPDLink to LVDS TI DS90UH948 adapter - Disabled by default. DS90UH948Q is a deserializer chip which converts - FPDLink signal to OpenLDI. This config enables deserializer driver for - DS90UH948 chip. - -config TEGRA_EDP2LVDS_PS8625 - bool "Enable EDP2LVDS PS8625 bridge." - default n - help - Say Y here to enable the EDP2LVDS PS8625 bridge. - Disabled by default. PS8625 is i2c slave chip which has EDP to LVDS - support. For L4T, the display head will be treated as EDP, this - chip takes care of converting edp to lvds signals. - -config TEGRA_DP - bool "Enable eDP panel." - default y - help - Say Y here to enable eDP panel. - -config TEGRA_HDMI2_0 - bool "Enable hdmi2.0" - depends on TEGRA_DC - default n - help - Say Y here to enable HDMI 2.0. - Supported by sor-hdmi only. - Suported on T21x and later chips only. - Disabled by default since most chips are using older controller at present. - -config TEGRA_HDMI2GMSL_MAX929x - bool "Enable HDMI-to-GMSL MAX929x bridge." - help - Say Y here to enable the Maxim Integrated MAX929x driver. - This bridge chip converts SOR->HDMI output to GMSL. - Driver supports MAX9291 and MAX9293 chips, ignoring HDCP on the latter. - -config TEGRA_HDMI2DSI_TC358870 - bool "Enable HDMI-to-DSI TC358870 bridge." - depends on TEGRA_HDMI2_0 && I2C - default n - help - Say Y here to enable the Toshiba TC358870 bridge. - The bridge chip converts HDMI output to DSI. - -config TEGRA_HDA_DC - bool "Enable HDA DC driver" - depends on TEGRA_HDMI2_0 || TEGRA_DP - default y - help - Say Y here to enable separate HDA driver in DC space. - Separate HDA driver is written to support both DP/HDMI from same code. - Removes redundancy of HDA code, so it doesn't get duplicated for each client. - Supported for T21x and later chips only which have HDMI2_0 or DP enabled. - -config TEGRA_HDMI2FPD - bool - -config TEGRA_HDMI2FPD_DS90UH949 - bool "DS90UH949 FPDLink Serializer" - depends on I2C - select TEGRA_HDMI2FPD - help - Say Y here to enable HDMI2FPD serializer bridge - This is a driver for FPDLink Serializer DS90UH949. - This option is required when HDMI output is converted to FPD output - using DS90UH949 serializer chip. - -config TEGRA_NVSR - bool "Enable NVSR support." - default n - help - Say Y here to enable NVSR support. - -config TEGRA_VRR - bool "Enable VRR Support" - default n - help - Say Y here to support VRR. - -config TEGRA_HDMIVRR - bool "Enable HDMIVRR Support." - default n - help - Say Y here to support HDMIVRR. HDMIVRR monitor supports variable - refresh rate so that the display scanout matches graphics rendering - speed. It is enabled to improve user experience for games and videos. - -config TEGRA_HDMIHDCP - bool "Support HDCP content protection on HDMI2_0" - depends on TEGRA_HDMI2_0 - help - Say Y here to support HDCP upstream and downstream protocols for HDMI2_0, - this requires a correctly fused chip to negotiate keys. - It is only needed if you have an application that cares about checking - for HDCP security while playing protected content. You do not need this - option to simply display a GUI on an HDMI TV. An HDMI TV will display - unprotected content just fine. - -config TEGRA_DEBUG_HDCP - bool "Support Debug mode for HDCP on HDMI2_0" - depends on TEGRA_HDMIHDCP - default n - help - Say Y here to expose debugfs nodes for HDCP content protection on HDMI2_0. - It is only required if you need to modify the number of retries for HDCP - authentication. - -config TEGRA_DPHDCP - bool "Support HDCP content protection on DP" - depends on TEGRA_DP - help - Say Y here to support HDCP upstream and downstream protocols for DP, - This requires a correctly fused chip to negotiate keys. - It is needed if you have an application that cares about checking - for HDCP security while playing protected content. - -config TEGRA_DEBUG_DP_HDCP - bool "Support Debug mode for HDCP on DP" - depends on TEGRA_DPHDCP - default n - help - Say Y here to expose debugfs nodes for HDCP content protection on DP. - It is needed to modify the number of retries for HDCP authentication. - -config TEGRA_YUV_BYPASS_MODE_FILTER - bool "Filter-out YUV bypass modes" - default n - help - Display driver parses all the YUV modes specified in EDID of a given sink. - But T210 does not have hardware support for any of the YUV modes and T186 hardware - supports only YUV422 and YUV444 modes. Say Y here to filter out all YUV modes on - T210 platforms and to filter out YUV420 modes on T186 platforms. These modes will - not be exposed to upper layers, including userspace. - -config TEGRA_DC_FAKE_PANEL_SUPPORT - bool "Enables fake panel and NULL OR support" - depends on TEGRA_DC - default y - help - Select Y to enable support for the - Display Controller to output to - fake panel or NULL Output Resource. - Used for silicon characterization and - automated testing. should not be enabled - for production. - -trysource "../nvidia/drivers/misc/tegra-cec/Kconfig.nvidia" -trysource "../t19x/drivers/video/tegra/host/Kconfig.t19x" diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile new file mode 100644 index 000000000..999b3eabd --- /dev/null +++ b/drivers/video/tegra/Makefile @@ -0,0 +1,9 @@ +obj-$(CONFIG_TEGRA_CAMERA_PLATFORM) += camera/ +obj-$(CONFIG_TEGRA_GRHOST) += host/ +obj-$(CONFIG_TEGRA_NVMAP) += nvmap/ + +GCOV_PROFILE := y +#subdir-ccflags-y := -Werror + +obj-$(CONFIG_TEGRA_DC) += dc/ +obj-$(CONFIG_FB_TEGRA) += fb.o diff --git a/drivers/video/tegra/Makefile.nvidia b/drivers/video/tegra/Makefile.nvidia deleted file mode 100644 index 999b3eabd..000000000 --- a/drivers/video/tegra/Makefile.nvidia +++ /dev/null @@ -1,9 +0,0 @@ -obj-$(CONFIG_TEGRA_CAMERA_PLATFORM) += camera/ -obj-$(CONFIG_TEGRA_GRHOST) += host/ -obj-$(CONFIG_TEGRA_NVMAP) += nvmap/ - -GCOV_PROFILE := y -#subdir-ccflags-y := -Werror - -obj-$(CONFIG_TEGRA_DC) += dc/ -obj-$(CONFIG_FB_TEGRA) += fb.o diff --git a/drivers/video/tegra/camera/Makefile b/drivers/video/tegra/camera/Makefile index f4b9dcd1d..2c4d58e48 100644 --- a/drivers/video/tegra/camera/Makefile +++ b/drivers/video/tegra/camera/Makefile @@ -1,8 +1,5 @@ GCOV_PROFILE := y -ccflags-y += -Idrivers/media/platform/tegra/vi -ccflags-y += -I../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/media/platform/tegra/ +ccflags-y += -I$(overlay)/drivers/video/tegra/host ifdef CONFIG_TEGRA_CAMERA_PLATFORM obj-y += tegra_camera_platform.o diff --git a/drivers/video/tegra/camera/Makefile.nvidia b/drivers/video/tegra/camera/Makefile.nvidia deleted file mode 100644 index 9e5a3b4e9..000000000 --- a/drivers/video/tegra/camera/Makefile.nvidia +++ /dev/null @@ -1,7 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra - -obj-y += tegra_camera_platform.o -obj-y += tegra_camera_dev_mfi.o diff --git a/drivers/video/tegra/dc/Makefile b/drivers/video/tegra/dc/Makefile index afe85a47f..217053ce1 100644 --- a/drivers/video/tegra/dc/Makefile +++ b/drivers/video/tegra/dc/Makefile @@ -1,9 +1,9 @@ GCOV_PROFILE := y subdir-ccflags-y := -Werror -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ifeq ($(CONFIG_TEGRA_NVDISPLAY),y) -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc -ccflags-y += -I$(srctree)/../nvidia/drivers/platform/tegra +ccflags-y += -I$(overlay)/drivers/video/tegra/host +ifneq ($(CONFIG_TEGRA_NVDISPLAY),y) +ccflags-y += -I$(overlay)/drivers/video/tegra/dc +ccflags-y += -I$(overlay)/drivers/platform/tegra endif ccflags-y += -I$(srctree)/arch/arm/mach-tegra obj-y += dc_common.o dc.o mode.o clock.o window.o dc_client.o @@ -24,7 +24,7 @@ obj-$(CONFIG_TEGRA_LVDS2FPDL_DS90UB947) += ds90ub947-q1.o obj-$(CONFIG_TEGRA_DS90UH948Q_DESER) += ds90uh948q_deser.o obj-$(CONFIG_TEGRA_EDP2LVDS_PS8625) += ps8625_edp2lvds.o ccflags-y +=-DCOMMON_MIPICAL_SUPPORTED\ - -I$(srctree)/../nvidia/drivers/media/platform/tegra + -I$(overlay)/drivers/media/platform/tegra ifneq ($(CONFIG_TEGRA_NVDISPLAY),y) obj-$(CONFIG_TEGRA_HDMIHDCP) += hdmihdcp.o @@ -69,3 +69,4 @@ obj-$(CONFIG_TEGRA_HDMIVRR) += hdmivrr.o obj-y += panel/ obj-$(CONFIG_TEGRA_CEC_SUPPORT) += ../../../misc/tegra-cec/ obj-y += crc.o +obj-$(CONFIG_TEGRA_NVDISPLAY) += nvdisp/ diff --git a/drivers/video/tegra/dc/Makefile.nvidia b/drivers/video/tegra/dc/Makefile.nvidia deleted file mode 100644 index 783c0cb0d..000000000 --- a/drivers/video/tegra/dc/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -GCOV_PROFILE := y -obj-$(CONFIG_TEGRA_NVDISPLAY) += nvdisp/ diff --git a/drivers/video/tegra/dc/nvdisp/Makefile b/drivers/video/tegra/dc/nvdisp/Makefile new file mode 100644 index 000000000..741e73aff --- /dev/null +++ b/drivers/video/tegra/dc/nvdisp/Makefile @@ -0,0 +1,22 @@ +GCOV_PROFILE := y +subdir-ccflags-y := -Werror +ccflags-y += -Idrivers/video/tegra +ccflags-y += -I../nvidia/drivers/video/tegra/dc +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc +ccflags-y += -I../nvidia/drivers/video/tegra/dc/panel +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel +ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) + ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/dc +endif + +obj-y += nvdisp.o +obj-y += nvdisp_win.o +obj-y += nvdisp_stub.o +obj-y += nvdisp_cursor.o +obj-y += nvdisp_config.o +obj-y += nvdisp_sd.o +obj-y += nvdisp_bandwidth.o +obj-y += nvdisp_crc.o +obj-y += nvdisp_lut.o +obj-y += nvdisp_csc.o + diff --git a/drivers/video/tegra/dc/nvdisp/Makefile.nvidia b/drivers/video/tegra/dc/nvdisp/Makefile.nvidia deleted file mode 100644 index 741e73aff..000000000 --- a/drivers/video/tegra/dc/nvdisp/Makefile.nvidia +++ /dev/null @@ -1,22 +0,0 @@ -GCOV_PROFILE := y -subdir-ccflags-y := -Werror -ccflags-y += -Idrivers/video/tegra -ccflags-y += -I../nvidia/drivers/video/tegra/dc -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc -ccflags-y += -I../nvidia/drivers/video/tegra/dc/panel -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel -ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) - ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/dc -endif - -obj-y += nvdisp.o -obj-y += nvdisp_win.o -obj-y += nvdisp_stub.o -obj-y += nvdisp_cursor.o -obj-y += nvdisp_config.o -obj-y += nvdisp_sd.o -obj-y += nvdisp_bandwidth.o -obj-y += nvdisp_crc.o -obj-y += nvdisp_lut.o -obj-y += nvdisp_csc.o - diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile new file mode 100644 index 000000000..807d3c30c --- /dev/null +++ b/drivers/video/tegra/host/Makefile @@ -0,0 +1,44 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Idrivers/devfreq +ccflags-y += -Wno-multichar + +subdir-ccflags-y := -Werror + +nvhost-objs = \ + nvhost_acm.o \ + nvhost_syncpt.o \ + nvhost_cdma.o \ + nvhost_intr.o \ + nvhost_channel.o \ + nvhost_job.o \ + dev.o \ + debug.o \ + bus_client.o \ + chip_support.o \ + nvhost_scale.o \ + nvhost_vm.o \ + scale_emc.o \ + nvhost_pd.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o +obj-$(CONFIG_TEGRA_GRHOST) += host1x/ +obj-$(CONFIG_TEGRA_GRHOST_TSEC) += tsec/ +obj-$(CONFIG_TEGRA_GRHOST_NVDEC) += nvdec/ +obj-$(CONFIG_TEGRA_GRHOST_ISP) += isp/ +obj-$(CONFIG_TEGRA_GRHOST) += t124/ +obj-$(CONFIG_TEGRA_GRHOST) += flcn/ +obj-$(CONFIG_TEGRA_GRHOST) += t210/ + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +obj-$(CONFIG_TEGRA_GRHOST) += iommu_context_dev.o + +obj-$(CONFIG_TEGRA_GRHOST) += t186/ +endif + +obj-$(CONFIG_TEGRA_GRHOST_NVCSI) += nvcsi/ +obj-$(CONFIG_TEGRA_GRHOST_SYNC) += nvhost_sync.o +obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += vi/ +obj-$(CONFIG_TEGRA_GRHOST_VHOST) += vhost/ diff --git a/drivers/video/tegra/host/Makefile.nvidia b/drivers/video/tegra/host/Makefile.nvidia deleted file mode 100644 index a02696d24..000000000 --- a/drivers/video/tegra/host/Makefile.nvidia +++ /dev/null @@ -1,48 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/devfreq -ccflags-y += -Wno-multichar - -subdir-ccflags-y := -Werror - -nvhost-objs = \ - nvhost_acm.o \ - nvhost_syncpt.o \ - nvhost_cdma.o \ - nvhost_intr.o \ - nvhost_channel.o \ - nvhost_job.o \ - dev.o \ - debug.o \ - bus_client.o \ - chip_support.o \ - nvhost_scale.o \ - nvhost_vm.o \ - scale_emc.o \ - nvhost_pd.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o -obj-$(CONFIG_TEGRA_GRHOST) += host1x/ -obj-$(CONFIG_TEGRA_GRHOST_TSEC) += tsec/ -obj-$(CONFIG_TEGRA_GRHOST_NVDEC) += nvdec/ -obj-$(CONFIG_TEGRA_GRHOST_ISP) += isp/ -obj-$(CONFIG_TEGRA_GRHOST) += t124/ -obj-$(CONFIG_TEGRA_GRHOST) += flcn/ -obj-$(CONFIG_TEGRA_GRHOST) += t210/ - -ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -obj-$(CONFIG_TEGRA_GRHOST) += iommu_context_dev.o - -obj-$(CONFIG_TEGRA_GRHOST) += t186/ -obj-$(CONFIG_TEGRA_GRHOST_NVCSI) += nvcsi/ -endif - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -obj-$(CONFIG_TEGRA_GRHOST) += $(call tegra-path,t19x/,drivers/video/tegra/host/) -endif - -obj-$(CONFIG_TEGRA_GRHOST_SYNC) += nvhost_sync.o -obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += vi/ -obj-$(CONFIG_TEGRA_GRHOST_VHOST) += vhost/ diff --git a/drivers/video/tegra/host/flcn/Makefile b/drivers/video/tegra/host/flcn/Makefile new file mode 100644 index 000000000..7f88f693c --- /dev/null +++ b/drivers/video/tegra/host/flcn/Makefile @@ -0,0 +1,12 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host + +ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ +endif + +nvhost-flcn-objs = \ + flcn.o \ + +obj-y += nvhost-flcn.o diff --git a/drivers/video/tegra/host/flcn/Makefile.nvidia b/drivers/video/tegra/host/flcn/Makefile.nvidia deleted file mode 100644 index 7f88f693c..000000000 --- a/drivers/video/tegra/host/flcn/Makefile.nvidia +++ /dev/null @@ -1,12 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ -endif - -nvhost-flcn-objs = \ - flcn.o \ - -obj-y += nvhost-flcn.o diff --git a/drivers/video/tegra/host/host1x/Makefile b/drivers/video/tegra/host/host1x/Makefile new file mode 100644 index 000000000..fad713355 --- /dev/null +++ b/drivers/video/tegra/host/host1x/Makefile @@ -0,0 +1,13 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Werror + +ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ +endif + +nvhost-host1x-objs = \ + host1x.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-host1x.o diff --git a/drivers/video/tegra/host/host1x/Makefile.nvidia b/drivers/video/tegra/host/host1x/Makefile.nvidia deleted file mode 100644 index fad713355..000000000 --- a/drivers/video/tegra/host/host1x/Makefile.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Werror - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ -endif - -nvhost-host1x-objs = \ - host1x.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-host1x.o diff --git a/drivers/video/tegra/host/isp/Makefile b/drivers/video/tegra/host/isp/Makefile new file mode 100644 index 000000000..5936983bf --- /dev/null +++ b/drivers/video/tegra/host/isp/Makefile @@ -0,0 +1,18 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/camera +ccflags-y += -Werror + +nvhost-isp-objs = \ + isp_isr_v1.o \ + isp.o + +obj-$(CONFIG_TEGRA_GRHOST_ISP) += nvhost-isp.o + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +nvhost-isp-t186-objs = \ + isp_isr_v2.o + +obj-$(CONFIG_TEGRA_GRHOST_ISP) += nvhost-isp-t186.o +endif diff --git a/drivers/video/tegra/host/isp/Makefile.nvidia b/drivers/video/tegra/host/isp/Makefile.nvidia deleted file mode 100644 index 5936983bf..000000000 --- a/drivers/video/tegra/host/isp/Makefile.nvidia +++ /dev/null @@ -1,18 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/camera -ccflags-y += -Werror - -nvhost-isp-objs = \ - isp_isr_v1.o \ - isp.o - -obj-$(CONFIG_TEGRA_GRHOST_ISP) += nvhost-isp.o - -ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -nvhost-isp-t186-objs = \ - isp_isr_v2.o - -obj-$(CONFIG_TEGRA_GRHOST_ISP) += nvhost-isp-t186.o -endif diff --git a/drivers/video/tegra/host/nvcsi/Makefile b/drivers/video/tegra/host/nvcsi/Makefile new file mode 100644 index 000000000..b8d2b1a6e --- /dev/null +++ b/drivers/video/tegra/host/nvcsi/Makefile @@ -0,0 +1,11 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Werror + +nvhost-nvcsi-objs = \ + nvcsi.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-nvcsi.o diff --git a/drivers/video/tegra/host/nvcsi/Makefile.nvidia b/drivers/video/tegra/host/nvcsi/Makefile.nvidia deleted file mode 100644 index b8d2b1a6e..000000000 --- a/drivers/video/tegra/host/nvcsi/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Werror - -nvhost-nvcsi-objs = \ - nvcsi.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-nvcsi.o diff --git a/drivers/video/tegra/host/nvdec/Makefile b/drivers/video/tegra/host/nvdec/Makefile new file mode 100644 index 000000000..8536b0486 --- /dev/null +++ b/drivers/video/tegra/host/nvdec/Makefile @@ -0,0 +1,13 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Iarch/arm/mach-tegra + +ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ +endif + +nvhost-nvdec-objs = \ + nvdec.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-nvdec.o diff --git a/drivers/video/tegra/host/nvdec/Makefile.nvidia b/drivers/video/tegra/host/nvdec/Makefile.nvidia deleted file mode 100644 index 8536b0486..000000000 --- a/drivers/video/tegra/host/nvdec/Makefile.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Iarch/arm/mach-tegra - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ -endif - -nvhost-nvdec-objs = \ - nvdec.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-nvdec.o diff --git a/drivers/video/tegra/host/t124/Makefile b/drivers/video/tegra/host/t124/Makefile new file mode 100644 index 000000000..196033dfe --- /dev/null +++ b/drivers/video/tegra/host/t124/Makefile @@ -0,0 +1,11 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Wno-multichar +ccflags-y += -Werror + +nvhost-t124-objs = \ + t124.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t124.o diff --git a/drivers/video/tegra/host/t124/Makefile.nvidia b/drivers/video/tegra/host/t124/Makefile.nvidia deleted file mode 100644 index 196033dfe..000000000 --- a/drivers/video/tegra/host/t124/Makefile.nvidia +++ /dev/null @@ -1,11 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Wno-multichar -ccflags-y += -Werror - -nvhost-t124-objs = \ - t124.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t124.o diff --git a/drivers/video/tegra/host/t186/Makefile b/drivers/video/tegra/host/t186/Makefile new file mode 100644 index 000000000..c6dcdb995 --- /dev/null +++ b/drivers/video/tegra/host/t186/Makefile @@ -0,0 +1,15 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host/host1x +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t186 +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host/t186 +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Wno-multichar +ccflags-y += -Werror + +nvhost-t186-objs = \ + t186.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t186.o diff --git a/drivers/video/tegra/host/t186/Makefile.nvidia b/drivers/video/tegra/host/t186/Makefile.nvidia deleted file mode 100644 index c6dcdb995..000000000 --- a/drivers/video/tegra/host/t186/Makefile.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host/host1x -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t186 -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host/t186 -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Wno-multichar -ccflags-y += -Werror - -nvhost-t186-objs = \ - t186.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t186.o diff --git a/drivers/video/tegra/host/t210/Makefile b/drivers/video/tegra/host/t210/Makefile new file mode 100644 index 000000000..cbf9b6afd --- /dev/null +++ b/drivers/video/tegra/host/t210/Makefile @@ -0,0 +1,13 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t124 +ccflags-y += -Idrivers/video/tegra/host/t124 +ccflags-y += -I$(srctree)/../nvidia/include +ccflags-y += -Wno-multichar +ccflags-y += -Werror + +nvhost-t210-objs = \ + t210.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t210.o diff --git a/drivers/video/tegra/host/t210/Makefile.nvidia b/drivers/video/tegra/host/t210/Makefile.nvidia deleted file mode 100644 index cbf9b6afd..000000000 --- a/drivers/video/tegra/host/t210/Makefile.nvidia +++ /dev/null @@ -1,13 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t124 -ccflags-y += -Idrivers/video/tegra/host/t124 -ccflags-y += -I$(srctree)/../nvidia/include -ccflags-y += -Wno-multichar -ccflags-y += -Werror - -nvhost-t210-objs = \ - t210.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t210.o diff --git a/drivers/video/tegra/host/tsec/Makefile b/drivers/video/tegra/host/tsec/Makefile new file mode 100644 index 000000000..b9412a05b --- /dev/null +++ b/drivers/video/tegra/host/tsec/Makefile @@ -0,0 +1,15 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/dc +ccflags-y += -Werror + +ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ +endif + +nvhost-tsec-objs = \ + tsec.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-tsec.o diff --git a/drivers/video/tegra/host/tsec/Makefile.nvidia b/drivers/video/tegra/host/tsec/Makefile.nvidia deleted file mode 100644 index b9412a05b..000000000 --- a/drivers/video/tegra/host/tsec/Makefile.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/dc -ccflags-y += -Werror - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ -endif - -nvhost-tsec-objs = \ - tsec.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-tsec.o diff --git a/drivers/video/tegra/host/vhost/Makefile b/drivers/video/tegra/host/vhost/Makefile new file mode 100644 index 000000000..fc0079ad9 --- /dev/null +++ b/drivers/video/tegra/host/vhost/Makefile @@ -0,0 +1,18 @@ +GCOV_PROFILE := y +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Werror + +ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) +ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ +endif + +nvhost-vhost-objs = \ + vhost.o \ + vhost_intr.o \ + vhost_syncpt.o \ + vhost_channel.o \ + vhost_cdma.o \ + vhost_client.o + +obj-$(CONFIG_TEGRA_GRHOST) += nvhost-vhost.o diff --git a/drivers/video/tegra/host/vhost/Makefile.nvidia b/drivers/video/tegra/host/vhost/Makefile.nvidia deleted file mode 100644 index fc0079ad9..000000000 --- a/drivers/video/tegra/host/vhost/Makefile.nvidia +++ /dev/null @@ -1,18 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Werror - -ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y) -ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/ -endif - -nvhost-vhost-objs = \ - vhost.o \ - vhost_intr.o \ - vhost_syncpt.o \ - vhost_channel.o \ - vhost_cdma.o \ - vhost_client.o - -obj-$(CONFIG_TEGRA_GRHOST) += nvhost-vhost.o diff --git a/drivers/video/tegra/host/vi/Makefile b/drivers/video/tegra/host/vi/Makefile new file mode 100644 index 000000000..d07f74cbe --- /dev/null +++ b/drivers/video/tegra/host/vi/Makefile @@ -0,0 +1,8 @@ +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host +ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra +ccflags-y += -I$(srctree)/../nvidia/include + +obj-$(CONFIG_VIDEO_TEGRA_VI) += host_vi_notify.o +obj-$(CONFIG_VIDEO_TEGRA_VI) += vi4.o +obj-$(CONFIG_VIDEO_TEGRA_VI) += vi_notify.o diff --git a/drivers/video/tegra/host/vi/Makefile.nvidia b/drivers/video/tegra/host/vi/Makefile.nvidia deleted file mode 100644 index d07f74cbe..000000000 --- a/drivers/video/tegra/host/vi/Makefile.nvidia +++ /dev/null @@ -1,8 +0,0 @@ -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host -ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra -ccflags-y += -I$(srctree)/../nvidia/include - -obj-$(CONFIG_VIDEO_TEGRA_VI) += host_vi_notify.o -obj-$(CONFIG_VIDEO_TEGRA_VI) += vi4.o -obj-$(CONFIG_VIDEO_TEGRA_VI) += vi_notify.o diff --git a/drivers/video/tegra/nvmap/Kconfig b/drivers/video/tegra/nvmap/Kconfig new file mode 100644 index 000000000..753139e9e --- /dev/null +++ b/drivers/video/tegra/nvmap/Kconfig @@ -0,0 +1,138 @@ +menuconfig TEGRA_NVMAP + bool "Tegra GPU memory management driver (nvmap)" + select ARM_DMA_USE_IOMMU if IOMMU_API + select DMA_SHARED_BUFFER + select CRYPTO_LZO + default y + help + Say Y here to include the memory management driver for the Tegra + GPU, multimedia and display subsystems + +if TEGRA_NVMAP + +config NVMAP_HIGHMEM_ONLY + bool "Use only HIGHMEM for nvmap" + depends on IOMMU_API && HIGHMEM + help + Say Y here to restrict nvmap system memory allocations (both + physical system memory and IOVMM) to just HIGHMEM pages. + +config NVMAP_PAGE_POOLS + bool "Use page pools to reduce allocation overhead" + default y + help + say Y here to reduce the alloction overhead, which is significant + for uncached, writecombine and inner cacheable memories as it + involves changing page attributes during every allocation per page + and flushing cache. Alloc time is reduced by allcoating the pages + ahead and keeping them aside. The reserved pages would be released + when system is low on memory and acquired back during release of + memory. + +config NVMAP_PAGE_POOL_DEBUG + bool "Debugging for page pools" + depends on NVMAP_PAGE_POOLS + help + Say Y here to include some debugging info in the page pools. This + adds a bit of unnecessary overhead so only enable this is you + suspect there is an issue with the nvmap page pools. + +config NVMAP_PAGE_POOLS_INIT_FILLUP + bool "Fill up page pools during page pools init" + depends on NVMAP_PAGE_POOLS + default y + help + Say Y here to fill up the page pools during page pool init time. + This helps in faster alloctions right from the early alloction + requests. Page pools fill up during init would increase the boot time. + If increase in boot time is not acceptable, keep this option disabled. + +config NVMAP_PAGE_POOLS_INIT_FILLUP_SIZE + depends on NVMAP_PAGE_POOLS_INIT_FILLUP + hex "Amount of memory to fill up page pools with during bootup in MB" + default 0x64 + +config NVMAP_PAGE_POOL_SIZE + depends on NVMAP_PAGE_POOLS + hex "Page pool size in pages" + default 0x0 + +config NVMAP_CACHE_MAINT_BY_SET_WAYS + bool "Enable cache maintenance by set/ways" + help + Say Y here to reduce cache maintenance overhead by MVA. + This helps in reducing cache maintenance overhead in the systems, + where inner cache includes only L1. For the systems, where inner cache + includes L1 and L2, keep this option disabled. + +config NVMAP_CACHE_MAINT_BY_SET_WAYS_ON_ONE_CPU + bool "Perform cache maint on one cpu only" + depends on NVMAP_CACHE_MAINT_BY_SET_WAYS + help + Say Y here to avoid cache maint on all CPU's during inner cache maint + by set/ways. When L1 and L2 are inner caches, cache maint on one + CPU is enough. When L1 is inner and L2 is outer, cache maint on + all CPU's is necessary during L1 cache maint by set/ways. + +config NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS + bool "Enable outer cache maintenance by set/ways" + help + Say Y here if you want to optimize cache maintenance for ranges + bigger than size of outer cache. This option has no effect on + system without outer cache. + +config NVMAP_DMABUF_STASH + bool "Enable stashing of IOVA maps with dmabuf" + default y + help + Set to Y if you would like nvmap to stash maps when using dma + bufs. This will speed up remapping of the same handle at the cost + of using more IOVA space. + +config NVMAP_DMABUF_STASH_STATS + bool "Enable stat tracking on the stash" + depends on NVMAP_DMABUF_STASH + help + Say Y to enable tracking of basic cache statistics on the dmabuf + stash. This adds some overhead but should be very useful for + debugging memory leaks. + +config NVMAP_FORCE_ZEROED_USER_PAGES + bool "Only alloc zeroed pages for user space" + default y + help + Say Y here to force zeroing of pages allocated for user space. This + avoids leaking kernel secure data to user space. This can add + significant overhead to allocation operations depending on the + allocation size requested. + +config NVMAP_FD_START + hex "FD number to start allocation from" + default 0x400 + help + NvMap handles are represented with FD's in the user processes. + To avoid Linux FD usage limitations, NvMap allocates FD starting + from this number. + +config NVMAP_DEFER_FD_RECYCLE + bool "Defer FD recycle" + help + Say Y here to enable deferred FD recycle. + A released nvmap handle would release memory and FD. This FD + can be reused immediately for subsequent nvmap allocation req in + the same process. Any buggy code in client process that continues to + use FD of released allocation would continue to use new allocation + and can lead to undesired consequences, which can be hard to debug. + Enabling this option would defer recycling FD for longer time and + allows debugging incorrect FD references by clients by returning errors + for the accesses that occur after handle/FD release. + +config NVMAP_DEFER_FD_RECYCLE_MAX_FD + hex "FD number to start free FD recycle" + depends on NVMAP_DEFER_FD_RECYCLE + default 0x8000 + help + Once last allocated FD reaches this number, allocation of subsequent + FD's start from NVMAP_START_FD. + +endif diff --git a/drivers/video/tegra/nvmap/Kconfig.nvidia b/drivers/video/tegra/nvmap/Kconfig.nvidia deleted file mode 100644 index 753139e9e..000000000 --- a/drivers/video/tegra/nvmap/Kconfig.nvidia +++ /dev/null @@ -1,138 +0,0 @@ -menuconfig TEGRA_NVMAP - bool "Tegra GPU memory management driver (nvmap)" - select ARM_DMA_USE_IOMMU if IOMMU_API - select DMA_SHARED_BUFFER - select CRYPTO_LZO - default y - help - Say Y here to include the memory management driver for the Tegra - GPU, multimedia and display subsystems - -if TEGRA_NVMAP - -config NVMAP_HIGHMEM_ONLY - bool "Use only HIGHMEM for nvmap" - depends on IOMMU_API && HIGHMEM - help - Say Y here to restrict nvmap system memory allocations (both - physical system memory and IOVMM) to just HIGHMEM pages. - -config NVMAP_PAGE_POOLS - bool "Use page pools to reduce allocation overhead" - default y - help - say Y here to reduce the alloction overhead, which is significant - for uncached, writecombine and inner cacheable memories as it - involves changing page attributes during every allocation per page - and flushing cache. Alloc time is reduced by allcoating the pages - ahead and keeping them aside. The reserved pages would be released - when system is low on memory and acquired back during release of - memory. - -config NVMAP_PAGE_POOL_DEBUG - bool "Debugging for page pools" - depends on NVMAP_PAGE_POOLS - help - Say Y here to include some debugging info in the page pools. This - adds a bit of unnecessary overhead so only enable this is you - suspect there is an issue with the nvmap page pools. - -config NVMAP_PAGE_POOLS_INIT_FILLUP - bool "Fill up page pools during page pools init" - depends on NVMAP_PAGE_POOLS - default y - help - Say Y here to fill up the page pools during page pool init time. - This helps in faster alloctions right from the early alloction - requests. Page pools fill up during init would increase the boot time. - If increase in boot time is not acceptable, keep this option disabled. - -config NVMAP_PAGE_POOLS_INIT_FILLUP_SIZE - depends on NVMAP_PAGE_POOLS_INIT_FILLUP - hex "Amount of memory to fill up page pools with during bootup in MB" - default 0x64 - -config NVMAP_PAGE_POOL_SIZE - depends on NVMAP_PAGE_POOLS - hex "Page pool size in pages" - default 0x0 - -config NVMAP_CACHE_MAINT_BY_SET_WAYS - bool "Enable cache maintenance by set/ways" - help - Say Y here to reduce cache maintenance overhead by MVA. - This helps in reducing cache maintenance overhead in the systems, - where inner cache includes only L1. For the systems, where inner cache - includes L1 and L2, keep this option disabled. - -config NVMAP_CACHE_MAINT_BY_SET_WAYS_ON_ONE_CPU - bool "Perform cache maint on one cpu only" - depends on NVMAP_CACHE_MAINT_BY_SET_WAYS - help - Say Y here to avoid cache maint on all CPU's during inner cache maint - by set/ways. When L1 and L2 are inner caches, cache maint on one - CPU is enough. When L1 is inner and L2 is outer, cache maint on - all CPU's is necessary during L1 cache maint by set/ways. - -config NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS - bool "Enable outer cache maintenance by set/ways" - help - Say Y here if you want to optimize cache maintenance for ranges - bigger than size of outer cache. This option has no effect on - system without outer cache. - -config NVMAP_DMABUF_STASH - bool "Enable stashing of IOVA maps with dmabuf" - default y - help - Set to Y if you would like nvmap to stash maps when using dma - bufs. This will speed up remapping of the same handle at the cost - of using more IOVA space. - -config NVMAP_DMABUF_STASH_STATS - bool "Enable stat tracking on the stash" - depends on NVMAP_DMABUF_STASH - help - Say Y to enable tracking of basic cache statistics on the dmabuf - stash. This adds some overhead but should be very useful for - debugging memory leaks. - -config NVMAP_FORCE_ZEROED_USER_PAGES - bool "Only alloc zeroed pages for user space" - default y - help - Say Y here to force zeroing of pages allocated for user space. This - avoids leaking kernel secure data to user space. This can add - significant overhead to allocation operations depending on the - allocation size requested. - -config NVMAP_FD_START - hex "FD number to start allocation from" - default 0x400 - help - NvMap handles are represented with FD's in the user processes. - To avoid Linux FD usage limitations, NvMap allocates FD starting - from this number. - -config NVMAP_DEFER_FD_RECYCLE - bool "Defer FD recycle" - help - Say Y here to enable deferred FD recycle. - A released nvmap handle would release memory and FD. This FD - can be reused immediately for subsequent nvmap allocation req in - the same process. Any buggy code in client process that continues to - use FD of released allocation would continue to use new allocation - and can lead to undesired consequences, which can be hard to debug. - Enabling this option would defer recycling FD for longer time and - allows debugging incorrect FD references by clients by returning errors - for the accesses that occur after handle/FD release. - -config NVMAP_DEFER_FD_RECYCLE_MAX_FD - hex "FD number to start free FD recycle" - depends on NVMAP_DEFER_FD_RECYCLE - default 0x8000 - help - Once last allocated FD reaches this number, allocation of subsequent - FD's start from NVMAP_START_FD. - -endif diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile new file mode 100644 index 000000000..d68b9bd5a --- /dev/null +++ b/drivers/video/tegra/nvmap/Makefile @@ -0,0 +1,29 @@ +GCOV_PROFILE := y + +subdir-ccflags-y := -Werror + +ifeq ($(CONFIG_ARM64),y) +ccflags-y += -Iarch/arm/mach-tegra/include +endif + +ccflags-y += -Iarch/arm/mach-tegra +ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/nvmap/ + +obj-y += nvmap.o +obj-y += nvmap_alloc.o +obj-y += nvmap_cache.o +obj-y += nvmap_dev.o +obj-y += nvmap_dmabuf.o +obj-y += nvmap_fault.o +obj-y += nvmap_handle.o +obj-y += nvmap_heap.o +obj-y += nvmap_ioctl.o +obj-y += nvmap_init.o +obj-y += nvmap_tag.o +obj-y += nvmap_mm.o + +obj-$(CONFIG_NVMAP_PAGE_POOLS) += nvmap_pp.o + +ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) +obj-y += nvmap_cache_nvmap_t18x.o +endif diff --git a/drivers/video/tegra/nvmap/Makefile.nvidia b/drivers/video/tegra/nvmap/Makefile.nvidia deleted file mode 100644 index 1f2f78f8a..000000000 --- a/drivers/video/tegra/nvmap/Makefile.nvidia +++ /dev/null @@ -1,35 +0,0 @@ -GCOV_PROFILE := y - -subdir-ccflags-y := -Werror - -ifeq ($(CONFIG_ARM64),y) -ccflags-y += -Iarch/arm/mach-tegra/include -endif - -ccflags-y += -Iarch/arm/mach-tegra -ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/nvmap/ - -obj-y += nvmap.o -obj-y += nvmap_alloc.o -obj-y += nvmap_cache.o -obj-y += nvmap_dev.o -obj-y += nvmap_dmabuf.o -obj-y += nvmap_fault.o -obj-y += nvmap_handle.o -obj-y += nvmap_heap.o -obj-y += nvmap_ioctl.o -obj-y += nvmap_init.o -obj-y += nvmap_tag.o -obj-y += nvmap_mm.o - -obj-$(CONFIG_NVMAP_PAGE_POOLS) += nvmap_pp.o - -ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -obj-y += nvmap_cache_nvmap_t18x.o -endif - -ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) -ifneq ($(wildcard $(srctree)/../t19x/drivers/video/tegra/nvmap/Makefile),) -obj-y += $(call tegra-path,t19x/,drivers/video/tegra/nvmap/) -endif -endif diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig new file mode 100644 index 000000000..031707dbd --- /dev/null +++ b/drivers/watchdog/Kconfig @@ -0,0 +1,23 @@ +if WATCHDOG + +config TEGRA18X_WATCHDOG + tristate "Tegra T18x watchdog" + depends on ARCH_TEGRA_18x_SOC + help + Say Y here to include support for the watchdog timer + embedded in NVIDIA Tegra SoCs. + + To compile this driver as a module, choose M here: the + module will be called tegra18x_wdt. + +config TEGRA_HV_WATCHDOG + tristate "Tegra Hypervisor watchdog" + depends on TEGRA_HV_MANAGER + help + Say Y here to include support for the watchdog timer + embedded in NVIDIA Tegra Hypervisor systems. + + To compile this driver as a module, choose M here: the + module will be called tegra_hv_wdt. + +endif diff --git a/drivers/watchdog/Kconfig.nvidia b/drivers/watchdog/Kconfig.nvidia deleted file mode 100644 index 7647e324a..000000000 --- a/drivers/watchdog/Kconfig.nvidia +++ /dev/null @@ -1,20 +0,0 @@ -config TEGRA18X_WATCHDOG - tristate "Tegra T18x watchdog" - depends on ARCH_TEGRA_18x_SOC - help - Say Y here to include support for the watchdog timer - embedded in NVIDIA Tegra SoCs. - - To compile this driver as a module, choose M here: the - module will be called tegra18x_wdt. - -config TEGRA_HV_WATCHDOG - tristate "Tegra Hypervisor watchdog" - depends on TEGRA_HV_MANAGER - help - Say Y here to include support for the watchdog timer - embedded in NVIDIA Tegra Hypervisor systems. - - To compile this driver as a module, choose M here: the - module will be called tegra_hv_wdt. - diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile new file mode 100644 index 000000000..16abc7edb --- /dev/null +++ b/drivers/watchdog/Makefile @@ -0,0 +1,3 @@ +ccflags-y += -Werror +obj-$(CONFIG_TEGRA18X_WATCHDOG) += tegra_wdt_t18x.o +obj-$(CONFIG_TEGRA_HV_WATCHDOG) += tegra_hv_wdt.o diff --git a/drivers/watchdog/Makefile.nvidia b/drivers/watchdog/Makefile.nvidia deleted file mode 100644 index 16abc7edb..000000000 --- a/drivers/watchdog/Makefile.nvidia +++ /dev/null @@ -1,3 +0,0 @@ -ccflags-y += -Werror -obj-$(CONFIG_TEGRA18X_WATCHDOG) += tegra_wdt_t18x.o -obj-$(CONFIG_TEGRA_HV_WATCHDOG) += tegra_hv_wdt.o diff --git a/sound/pci/Kconfig.nvidia b/sound/pci/Kconfig.nvidia deleted file mode 100644 index 8360f7de1..000000000 --- a/sound/pci/Kconfig.nvidia +++ /dev/null @@ -1 +0,0 @@ -trysource "../nvidia/sound/pci/hda/Kconfig.nvidia" diff --git a/sound/pci/Makefile b/sound/pci/Makefile new file mode 100644 index 000000000..531dfd86e --- /dev/null +++ b/sound/pci/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_SND_HDA_TEGRA) += hda/ diff --git a/sound/pci/Makefile.nvidia b/sound/pci/Makefile.nvidia deleted file mode 100644 index 531dfd86e..000000000 --- a/sound/pci/Makefile.nvidia +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_SND_HDA_TEGRA) += hda/ diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig new file mode 100644 index 000000000..76a302d41 --- /dev/null +++ b/sound/pci/hda/Kconfig @@ -0,0 +1,18 @@ +append_menu "HD-Audio" + +config SND_HDA_TEGRA + tristate "NVIDIA Tegra HD Audio" + depends on ARCH_TEGRA || ARCH_TEGRA_18x_SOC + select SND_HDA + help + Say Y here to support the HDA controller present in NVIDIA + Tegra SoCs + + This options enables support for the HD Audio controller + present in some NVIDIA Tegra SoCs, used to communicate audio + to the HDMI output. + + To compile this driver as a module, choose M here: the module + will be called snd-hda-tegra. + +endmenu diff --git a/sound/pci/hda/Kconfig.nvidia b/sound/pci/hda/Kconfig.nvidia deleted file mode 100644 index f6f30e7db..000000000 --- a/sound/pci/hda/Kconfig.nvidia +++ /dev/null @@ -1,15 +0,0 @@ -config SND_HDA_TEGRA - tristate "NVIDIA Tegra HD Audio" - depends on ARCH_TEGRA || ARCH_TEGRA_18x_SOC - select SND_HDA - help - Say Y here to support the HDA controller present in NVIDIA - Tegra SoCs - - This options enables support for the HD Audio controller - present in some NVIDIA Tegra SoCs, used to communicate audio - to the HDMI output. - - To compile this driver as a module, choose M here: the module - will be called snd-hda-tegra. - diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile new file mode 100644 index 000000000..e21ce3fac --- /dev/null +++ b/sound/pci/hda/Makefile @@ -0,0 +1,4 @@ +subdir-ccflags-y += -I$(srctree)/sound/pci/hda/ + +snd-hda-tegra-objs := hda_tegra.o +obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o diff --git a/sound/pci/hda/Makefile.nvidia b/sound/pci/hda/Makefile.nvidia deleted file mode 100644 index e21ce3fac..000000000 --- a/sound/pci/hda/Makefile.nvidia +++ /dev/null @@ -1,4 +0,0 @@ -subdir-ccflags-y += -I$(srctree)/sound/pci/hda/ - -snd-hda-tegra-objs := hda_tegra.o -obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig new file mode 100644 index 000000000..bc5f8efc5 --- /dev/null +++ b/sound/soc/Kconfig @@ -0,0 +1,6 @@ +if SND_SOC + +source "sound/soc/tegra-alt/Kconfig" +source "sound/soc/tegra-virt-alt/Kconfig" + +endif diff --git a/sound/soc/Kconfig.nvidia b/sound/soc/Kconfig.nvidia deleted file mode 100644 index 58e46d04b..000000000 --- a/sound/soc/Kconfig.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -trysource "../nvidia/sound/soc/tegra-alt/Kconfig.nvidia" -trysource "../nvidia/sound/soc/tegra-virt-alt/Kconfig.nvidia" diff --git a/sound/soc/Makefile b/sound/soc/Makefile new file mode 100644 index 000000000..3170b8e84 --- /dev/null +++ b/sound/soc/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_SND_SOC) += tegra-alt/ +obj-$(CONFIG_SND_SOC) += tegra-virt-alt/ diff --git a/sound/soc/Makefile.nvidia b/sound/soc/Makefile.nvidia deleted file mode 100644 index 3170b8e84..000000000 --- a/sound/soc/Makefile.nvidia +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SND_SOC) += tegra-alt/ -obj-$(CONFIG_SND_SOC) += tegra-virt-alt/ diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig new file mode 100644 index 000000000..92ce7ae14 --- /dev/null +++ b/sound/soc/tegra-alt/Kconfig @@ -0,0 +1,308 @@ +if SND_SOC + +config SND_SOC_TEGRA_ALT_186 + def_bool y + depends on SND_SOC_TEGRA_ALT + depends on ARCH_TEGRA_18x_SOC + +config SND_SOC_TEGRA186_DSPK_ALT + tristate "Tegra186 DSPK driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 + help + Say Y or M if you want to add support for Tegra186 DSPK module. + +config SND_SOC_TEGRA186_ASRC_ALT + tristate "Tegra186 ASRC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 + help + Say Y or M if you want to add support for Tegra186 ASRC module. + +config SND_SOC_TEGRA186_ARAD_ALT + tristate "Tegra186 ARAD driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 + help + Say Y or M if you want to add support for Tegra186 ARAD module. + +config SND_SOC_TEGRA_ALT_FORCE_CARD_REG + tristate "Enable sound card even if audio codec is missing on board" + depends on SND_SOC_TEGRA_ALT + help + Say Y or M if you want to register the sound card even if audio codec + is not connected/present on board. + +config SND_SOC_TEGRA_T186REF_P4573_ALT + tristate "SoC Audio support for P4573 with CS53L30 and RT5658" + depends on SND_SOC_TEGRA_T186REF_ALT + select SND_SOC_CS53L30 + select SND_SOC_RT5659 + help + Say Y or M here. + +config SND_SOC_TEGRA_T186REF_AUTO_ALT + tristate "SoC Audio support for T186Ref Automotive" + depends on SND_SOC_TEGRA_T186REF_ALT + help + Say Y or M here. + +config SND_SOC_TEGRA_T186REF_M3420_ALT + tristate "SoC Audio support for T186 M3420" + depends on SND_SOC_TEGRA_T186REF_ALT + select SND_SOC_AD193X_I2C + help + Say Y or M here. + +config SND_SOC_TEGRA186_ARAD_WAR + def_bool y + depends on SND_SOC_TEGRA186_ARAD_ALT + depends on TEGRA186_AHC + +config SND_SOC_TEGRA186_ASRC_WAR + def_bool n + depends on SND_SOC_TEGRA186_ASRC_ALT + depends on SND_SOC_TEGRA186_ARAD_WAR + +config TEGRA186_ASRC_INT_CLEAR_WAR + def_bool y + depends on SND_SOC_TEGRA186_ASRC_ALT + +config SND_SOC_TEGRA_ALT + tristate "Alternative DAPM-based SoC audio support for the Tegra System-on-Chip" + depends on ARCH_TEGRA + depends on SND_DMAENGINE_PCM + select REGMAP_MMIO + select SND_DYNAMIC_MINORS + help + Say Y or M here if you want support for SoC audio on Tegra, using the + alternative driver that exposes to user-space the full routing capabilities + of the AHUB (Audio HUB) hardware module. + +config SND_SOC_TEGRA_ALT_210 + def_bool y + depends on SND_SOC_TEGRA_ALT + +config SND_SOC_TEGRA210_XBAR_ALT + tristate "Tegra210 XBAR driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 XBAR module. + +config SND_SOC_TEGRA210_ADMAIF_ALT + tristate "Tegra210 ADMIF driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 APBIF module. + +config SND_SOC_TEGRA210_I2S_ALT + tristate "Tegra210 I2S driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 I2S module. + +config SND_SOC_TEGRA210_DMIC_ALT + tristate "Tegra210 DMIC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 DMIC module. + +config SND_SOC_TEGRA210_AMX_ALT + tristate "Tegra210 AMX driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 AMX module. + +config SND_SOC_TEGRA210_ADX_ALT + tristate "Tegra210 ADX driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 ADX module. + +config SND_SOC_TEGRA210_MIXER_ALT + tristate "Tegra210 MIXER driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 MIXER module. + +config SND_SOC_TEGRA210_SFC_ALT + tristate "Tegra210 SFC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 SFC module. + +config SND_SOC_TEGRA210_AFC_ALT + tristate "Tegra210 AFC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 AFC module. + +config SND_SOC_TEGRA210_MVC_ALT + tristate "Tegra210 MVC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 MVC module. + +config SND_SOC_TEGRA210_IQC_ALT + tristate "Tegra210 IQC driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 IQC module. + +config SND_SOC_TEGRA210_SPDIF_ALT + tristate "Tegra210 SPDIF driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 SPDIF module. + +config SND_SOC_TEGRA210_OPE_ALT + tristate "Tegra210 OPE driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 + help + Say Y or M if you want to add support for Tegra210 OPE module. + +config SND_SOC_TEGRA210_ADSP_ALT + tristate "Tegra210 ADSP driver" + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP + select SND_SOC_COMPRESS + help + Say Y or M if you want to add support for Tegra210 ADSP module. + +config SND_SOC_TEGRA_ASOC_MACHINE_ALT + tristate "Tegra ASoC machine driver" + depends on SND_SOC_TEGRA_ALT + help + Say Y or M if you want to add support for Tegra ASoC machine driver + +config SND_SOC_TEGRA_T210REF_MOBILE_ALT + tristate "SoC Audio support for T210Ref mobile" + depends on SND_SOC_TEGRA_ALT && I2C + depends on ARCH_TEGRA_210_SOC + select SND_SOC_TEGRA210_XBAR_ALT + select SND_SOC_TEGRA210_PCM_ALT + select SND_SOC_TEGRA210_ADMA_ALT + select SND_SOC_TEGRA210_ADMAIF_ALT + select SND_SOC_TEGRA210_I2S_ALT + select SND_SOC_TEGRA210_DMIC_ALT + select SND_SOC_TEGRA210_AMX_ALT + select SND_SOC_TEGRA210_ADX_ALT + select SND_SOC_TEGRA210_MIXER_ALT + select SND_SOC_TEGRA210_SFC_ALT + select SND_SOC_TEGRA210_AFC_ALT + select SND_SOC_TEGRA210_MVC_ALT + select SND_SOC_TEGRA210_OPE_ALT + select SND_SOC_TEGRA210_SPDIF_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_SPDIF + select SND_SOC_RT5640 + select SND_SOC_RT5659 + select SND_SOC_TEGRA_ASOC_MACHINE_ALT + help + Say Y or M here. + +config SND_SOC_TEGRA_T210REF_ALT + tristate "SoC Audio support for T210Ref" + depends on SND_SOC_TEGRA_ALT + depends on ARCH_TEGRA_210_SOC + select SND_SOC_TEGRA210_XBAR_ALT + select SND_SOC_TEGRA210_PCM_ALT + select SND_SOC_TEGRA210_ADMA_ALT + select SND_SOC_TEGRA210_ADMAIF_ALT + select SND_SOC_TEGRA210_I2S_ALT + select SND_SOC_TEGRA210_DMIC_ALT + select SND_SOC_TEGRA210_AMX_ALT + select SND_SOC_TEGRA210_ADX_ALT + select SND_SOC_TEGRA210_MIXER_ALT + select SND_SOC_TEGRA210_SFC_ALT + select SND_SOC_TEGRA210_AFC_ALT + select SND_SOC_TEGRA210_MVC_ALT + select SND_SOC_TEGRA210_OPE_ALT + select SND_SOC_TEGRA210_SPDIF_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA_ASOC_HWDEP_ALT + select SND_SOC_SPDIF + select SND_SOC_AD193X_I2C + select SND_SOC_TEGRA_ASOC_MACHINE_ALT + help + Say Y or M here. + +config SND_SOC_TEGRA_T186REF_ALT + tristate "SoC Audio support for T186Ref" + depends on SND_SOC_TEGRA_ALT + depends on ARCH_TEGRA_18x_SOC + select SND_SOC_TEGRA210_XBAR_ALT + select SND_SOC_TEGRA210_PCM_ALT + select SND_SOC_TEGRA210_ADMA_ALT + select SND_SOC_TEGRA210_ADMAIF_ALT + select SND_SOC_TEGRA210_I2S_ALT + select SND_SOC_TEGRA210_DMIC_ALT + select SND_SOC_TEGRA210_AMX_ALT + select SND_SOC_TEGRA210_ADX_ALT + select SND_SOC_TEGRA210_MIXER_ALT + select SND_SOC_TEGRA210_SFC_ALT + select SND_SOC_TEGRA210_AFC_ALT + select SND_SOC_TEGRA210_MVC_ALT + select SND_SOC_TEGRA210_OPE_ALT + select SND_SOC_TEGRA210_SPDIF_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA186_ASRC_ALT + select SND_SOC_TEGRA186_ARAD_ALT + select SND_SOC_TEGRA186_DSPK_ALT + select SND_SOC_TEGRA_ASOC_HWDEP_ALT + select SND_SOC_SPDIF + select SND_SOC_TEGRA_ASOC_MACHINE_ALT + select SND_SOC_COMPRESS + help + Say Y or M here. + +config SND_SOC_TEGRA_T186REF_MOBILE_ALT + tristate "SoC Audio support for T186Ref Mobile" + depends on SND_SOC_TEGRA_ALT + depends on ARCH_TEGRA_18x_SOC + select SND_SOC_TEGRA210_XBAR_ALT + select SND_SOC_TEGRA210_PCM_ALT + select SND_SOC_TEGRA210_ADMA_ALT + select SND_SOC_TEGRA210_ADMAIF_ALT + select SND_SOC_TEGRA210_I2S_ALT + select SND_SOC_TEGRA210_DMIC_ALT + select SND_SOC_TEGRA210_AMX_ALT + select SND_SOC_TEGRA210_ADX_ALT + select SND_SOC_TEGRA210_MIXER_ALT + select SND_SOC_TEGRA210_SFC_ALT + select SND_SOC_TEGRA210_AFC_ALT + select SND_SOC_TEGRA210_MVC_ALT + select SND_SOC_TEGRA210_OPE_ALT + select SND_SOC_TEGRA210_SPDIF_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA186_ASRC_ALT + select SND_SOC_TEGRA186_ARAD_ALT + select SND_SOC_TEGRA186_DSPK_ALT + select SND_SOC_TEGRA_ASOC_HWDEP_ALT + select SND_SOC_SPDIF + select SND_SOC_RT5659 + select SND_SOC_COMPRESS + select SND_SOC_TEGRA_ASOC_MACHINE_ALT + help + Say Y or M here. + +config SND_SOC_TEGRA_T210REF_P2382_ALT + tristate "SoC Audio support for P2382Ref T210" + depends on SND_SOC_TEGRA_ALT + depends on ARCH_TEGRA_210_SOC + select SND_SOC_TEGRA210_XBAR_ALT + select SND_SOC_TEGRA210_PCM_ALT + select SND_SOC_TEGRA210_ADMA_ALT + select SND_SOC_TEGRA210_ADMAIF_ALT + select SND_SOC_TEGRA210_I2S_ALT + select SND_SOC_TEGRA210_AMX_ALT + select SND_SOC_TEGRA210_ADX_ALT + select SND_SOC_TEGRA210_MIXER_ALT + select SND_SOC_TEGRA210_SFC_ALT + select SND_SOC_TEGRA210_AFC_ALT + select SND_SOC_TEGRA210_MVC_ALT + select SND_SOC_TEGRA210_OPE_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA_ASOC_HWDEP_ALT + select SND_SOC_SPDIF + select SND_SOC_TEGRA_ASOC_MACHINE_ALT + help + Say Y or M here + +endif diff --git a/sound/soc/tegra-alt/Kconfig.nvidia b/sound/soc/tegra-alt/Kconfig.nvidia deleted file mode 100644 index 6000cd38c..000000000 --- a/sound/soc/tegra-alt/Kconfig.nvidia +++ /dev/null @@ -1,304 +0,0 @@ -config SND_SOC_TEGRA_ALT_186 - def_bool y - depends on SND_SOC_TEGRA_ALT - depends on ARCH_TEGRA_18x_SOC - -config SND_SOC_TEGRA186_DSPK_ALT - tristate "Tegra186 DSPK driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 DSPK module. - -config SND_SOC_TEGRA186_ASRC_ALT - tristate "Tegra186 ASRC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 ASRC module. - -config SND_SOC_TEGRA186_ARAD_ALT - tristate "Tegra186 ARAD driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 ARAD module. - -config SND_SOC_TEGRA_ALT_FORCE_CARD_REG - tristate "Enable sound card even if audio codec is missing on board" - depends on SND_SOC_TEGRA_ALT - help - Say Y or M if you want to register the sound card even if audio codec - is not connected/present on board. - -config SND_SOC_TEGRA_T186REF_P4573_ALT - tristate "SoC Audio support for P4573 with CS53L30 and RT5658" - depends on SND_SOC_TEGRA_T186REF_ALT - select SND_SOC_CS53L30 - select SND_SOC_RT5659 - help - Say Y or M here. - -config SND_SOC_TEGRA_T186REF_AUTO_ALT - tristate "SoC Audio support for T186Ref Automotive" - depends on SND_SOC_TEGRA_T186REF_ALT - help - Say Y or M here. - -config SND_SOC_TEGRA_T186REF_M3420_ALT - tristate "SoC Audio support for T186 M3420" - depends on SND_SOC_TEGRA_T186REF_ALT - select SND_SOC_AD193X_I2C - help - Say Y or M here. - -config SND_SOC_TEGRA186_ARAD_WAR - def_bool y - depends on SND_SOC_TEGRA186_ARAD_ALT - depends on TEGRA186_AHC - -config SND_SOC_TEGRA186_ASRC_WAR - def_bool n - depends on SND_SOC_TEGRA186_ASRC_ALT - depends on SND_SOC_TEGRA186_ARAD_WAR - -config TEGRA186_ASRC_INT_CLEAR_WAR - def_bool y - depends on SND_SOC_TEGRA186_ASRC_ALT - -config SND_SOC_TEGRA_ALT - tristate "Alternative DAPM-based SoC audio support for the Tegra System-on-Chip" - depends on ARCH_TEGRA - depends on SND_DMAENGINE_PCM - select REGMAP_MMIO - select SND_DYNAMIC_MINORS - help - Say Y or M here if you want support for SoC audio on Tegra, using the - alternative driver that exposes to user-space the full routing capabilities - of the AHUB (Audio HUB) hardware module. - -config SND_SOC_TEGRA_ALT_210 - def_bool y - depends on SND_SOC_TEGRA_ALT - -config SND_SOC_TEGRA210_XBAR_ALT - tristate "Tegra210 XBAR driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 XBAR module. - -config SND_SOC_TEGRA210_ADMAIF_ALT - tristate "Tegra210 ADMIF driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 APBIF module. - -config SND_SOC_TEGRA210_I2S_ALT - tristate "Tegra210 I2S driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 I2S module. - -config SND_SOC_TEGRA210_DMIC_ALT - tristate "Tegra210 DMIC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 DMIC module. - -config SND_SOC_TEGRA210_AMX_ALT - tristate "Tegra210 AMX driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 AMX module. - -config SND_SOC_TEGRA210_ADX_ALT - tristate "Tegra210 ADX driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 ADX module. - -config SND_SOC_TEGRA210_MIXER_ALT - tristate "Tegra210 MIXER driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 MIXER module. - -config SND_SOC_TEGRA210_SFC_ALT - tristate "Tegra210 SFC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 SFC module. - -config SND_SOC_TEGRA210_AFC_ALT - tristate "Tegra210 AFC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 AFC module. - -config SND_SOC_TEGRA210_MVC_ALT - tristate "Tegra210 MVC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 MVC module. - -config SND_SOC_TEGRA210_IQC_ALT - tristate "Tegra210 IQC driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 IQC module. - -config SND_SOC_TEGRA210_SPDIF_ALT - tristate "Tegra210 SPDIF driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 SPDIF module. - -config SND_SOC_TEGRA210_OPE_ALT - tristate "Tegra210 OPE driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 OPE module. - -config SND_SOC_TEGRA210_ADSP_ALT - tristate "Tegra210 ADSP driver" - depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP - select SND_SOC_COMPRESS - help - Say Y or M if you want to add support for Tegra210 ADSP module. - -config SND_SOC_TEGRA_ASOC_MACHINE_ALT - tristate "Tegra ASoC machine driver" - depends on SND_SOC_TEGRA_ALT - help - Say Y or M if you want to add support for Tegra ASoC machine driver - -config SND_SOC_TEGRA_T210REF_MOBILE_ALT - tristate "SoC Audio support for T210Ref mobile" - depends on SND_SOC_TEGRA_ALT && I2C - depends on ARCH_TEGRA_210_SOC - select SND_SOC_TEGRA210_XBAR_ALT - select SND_SOC_TEGRA210_PCM_ALT - select SND_SOC_TEGRA210_ADMA_ALT - select SND_SOC_TEGRA210_ADMAIF_ALT - select SND_SOC_TEGRA210_I2S_ALT - select SND_SOC_TEGRA210_DMIC_ALT - select SND_SOC_TEGRA210_AMX_ALT - select SND_SOC_TEGRA210_ADX_ALT - select SND_SOC_TEGRA210_MIXER_ALT - select SND_SOC_TEGRA210_SFC_ALT - select SND_SOC_TEGRA210_AFC_ALT - select SND_SOC_TEGRA210_MVC_ALT - select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_SPDIF_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - select SND_SOC_SPDIF - select SND_SOC_RT5640 - select SND_SOC_RT5659 - select SND_SOC_TEGRA_ASOC_MACHINE_ALT - help - Say Y or M here. - -config SND_SOC_TEGRA_T210REF_ALT - tristate "SoC Audio support for T210Ref" - depends on SND_SOC_TEGRA_ALT - depends on ARCH_TEGRA_210_SOC - select SND_SOC_TEGRA210_XBAR_ALT - select SND_SOC_TEGRA210_PCM_ALT - select SND_SOC_TEGRA210_ADMA_ALT - select SND_SOC_TEGRA210_ADMAIF_ALT - select SND_SOC_TEGRA210_I2S_ALT - select SND_SOC_TEGRA210_DMIC_ALT - select SND_SOC_TEGRA210_AMX_ALT - select SND_SOC_TEGRA210_ADX_ALT - select SND_SOC_TEGRA210_MIXER_ALT - select SND_SOC_TEGRA210_SFC_ALT - select SND_SOC_TEGRA210_AFC_ALT - select SND_SOC_TEGRA210_MVC_ALT - select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_SPDIF_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - select SND_SOC_TEGRA_ASOC_HWDEP_ALT - select SND_SOC_SPDIF - select SND_SOC_AD193X_I2C - select SND_SOC_TEGRA_ASOC_MACHINE_ALT - help - Say Y or M here. - -config SND_SOC_TEGRA_T186REF_ALT - tristate "SoC Audio support for T186Ref" - depends on SND_SOC_TEGRA_ALT - depends on ARCH_TEGRA_18x_SOC - select SND_SOC_TEGRA210_XBAR_ALT - select SND_SOC_TEGRA210_PCM_ALT - select SND_SOC_TEGRA210_ADMA_ALT - select SND_SOC_TEGRA210_ADMAIF_ALT - select SND_SOC_TEGRA210_I2S_ALT - select SND_SOC_TEGRA210_DMIC_ALT - select SND_SOC_TEGRA210_AMX_ALT - select SND_SOC_TEGRA210_ADX_ALT - select SND_SOC_TEGRA210_MIXER_ALT - select SND_SOC_TEGRA210_SFC_ALT - select SND_SOC_TEGRA210_AFC_ALT - select SND_SOC_TEGRA210_MVC_ALT - select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_SPDIF_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - select SND_SOC_TEGRA186_ASRC_ALT - select SND_SOC_TEGRA186_ARAD_ALT - select SND_SOC_TEGRA186_DSPK_ALT - select SND_SOC_TEGRA_ASOC_HWDEP_ALT - select SND_SOC_SPDIF - select SND_SOC_TEGRA_ASOC_MACHINE_ALT - select SND_SOC_COMPRESS - help - Say Y or M here. - -config SND_SOC_TEGRA_T186REF_MOBILE_ALT - tristate "SoC Audio support for T186Ref Mobile" - depends on SND_SOC_TEGRA_ALT - depends on ARCH_TEGRA_18x_SOC - select SND_SOC_TEGRA210_XBAR_ALT - select SND_SOC_TEGRA210_PCM_ALT - select SND_SOC_TEGRA210_ADMA_ALT - select SND_SOC_TEGRA210_ADMAIF_ALT - select SND_SOC_TEGRA210_I2S_ALT - select SND_SOC_TEGRA210_DMIC_ALT - select SND_SOC_TEGRA210_AMX_ALT - select SND_SOC_TEGRA210_ADX_ALT - select SND_SOC_TEGRA210_MIXER_ALT - select SND_SOC_TEGRA210_SFC_ALT - select SND_SOC_TEGRA210_AFC_ALT - select SND_SOC_TEGRA210_MVC_ALT - select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_SPDIF_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - select SND_SOC_TEGRA186_ASRC_ALT - select SND_SOC_TEGRA186_ARAD_ALT - select SND_SOC_TEGRA186_DSPK_ALT - select SND_SOC_TEGRA_ASOC_HWDEP_ALT - select SND_SOC_SPDIF - select SND_SOC_RT5659 - select SND_SOC_COMPRESS - select SND_SOC_TEGRA_ASOC_MACHINE_ALT - help - Say Y or M here. - -config SND_SOC_TEGRA_T210REF_P2382_ALT - tristate "SoC Audio support for P2382Ref T210" - depends on SND_SOC_TEGRA_ALT - depends on ARCH_TEGRA_210_SOC - select SND_SOC_TEGRA210_XBAR_ALT - select SND_SOC_TEGRA210_PCM_ALT - select SND_SOC_TEGRA210_ADMA_ALT - select SND_SOC_TEGRA210_ADMAIF_ALT - select SND_SOC_TEGRA210_I2S_ALT - select SND_SOC_TEGRA210_AMX_ALT - select SND_SOC_TEGRA210_ADX_ALT - select SND_SOC_TEGRA210_MIXER_ALT - select SND_SOC_TEGRA210_SFC_ALT - select SND_SOC_TEGRA210_AFC_ALT - select SND_SOC_TEGRA210_MVC_ALT - select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - select SND_SOC_TEGRA_ASOC_HWDEP_ALT - select SND_SOC_SPDIF - select SND_SOC_TEGRA_ASOC_MACHINE_ALT - help - Say Y or M here diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile new file mode 100644 index 000000000..3594cef93 --- /dev/null +++ b/sound/soc/tegra-alt/Makefile @@ -0,0 +1,94 @@ +GCOV_PROFILE := y + +subdir-ccflags-y := -Werror + +subdir-ccflags-y += -I$(srctree) +subdir-ccflags-y += -I$(srctree)/sound/soc/codecs/ +subdir-ccflags-y += -I$(srctree)/../nvidia +subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-virt-alt/ +subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-alt/include/ + +#----------------------------- utility drivers -------------------------------------- +CFLAGS_tegra_pcm_alt.o += -Wno-shift-count-overflow + +snd-soc-tegra-alt-utils-objs := utils/tegra_asoc_utils_alt.o \ + utils/tegra_pcm_alt.o \ + utils/tegra_asoc_machine_alt.o \ + utils/tegra_isomgr_bw_alt.o \ + utils/ahub_unit_fpga_clock.o \ + utils/tegra210_xbar_utils_alt.o + +obj-$(CONFIG_SND_SOC_TEGRA_ALT) += snd-soc-tegra-alt-utils.o + +#----------------------------- platform drivers ------------------------------------- +snd-soc-tegra210-alt-admaif-objs := tegra210_admaif_alt.o +snd-soc-tegra210-alt-xbar-objs := tegra210_xbar_alt.o + +# required to fool lkm loader (can be removed later) +ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) + snd-soc-tegra186-alt-xbar-objs := tegra210_xbar_alt.o +endif + +snd-soc-tegra210-alt-i2s-objs := tegra210_i2s_alt.o +snd-soc-tegra210-alt-dmic-objs := tegra210_dmic_alt.o +snd-soc-tegra210-alt-amx-objs := tegra210_amx_alt.o +snd-soc-tegra210-alt-adx-objs := tegra210_adx_alt.o +snd-soc-tegra210-alt-mixer-objs := tegra210_mixer_alt.o +snd-soc-tegra210-alt-sfc-objs := tegra210_sfc_alt.o +snd-soc-tegra210-alt-afc-objs := tegra210_afc_alt.o +snd-soc-tegra210-alt-mvc-objs := tegra210_mvc_alt.o +snd-soc-tegra210-alt-iqc-objs := tegra210_iqc_alt.o +snd-soc-tegra210-alt-spdif-objs := tegra210_spdif_alt.o +snd-soc-tegra210-alt-adsp-objs := tegra210_adsp_alt.o +snd-soc-tegra186-alt-asrc-objs := tegra186_asrc_alt.o +snd-soc-tegra186-alt-arad-objs := tegra186_arad_alt.o +snd-soc-tegra186-alt-dspk-objs := tegra186_dspk_alt.o +snd-soc-tegra210-alt-ope-objs := tegra210_ope_alt.o \ + tegra210_peq_alt.o \ + tegra210_mbdrc_alt.o + +obj-$(CONFIG_SND_SOC_TEGRA210_ADMAIF_ALT) += snd-soc-tegra210-alt-admaif.o +obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra210-alt-xbar.o + +ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) + obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra186-alt-xbar.o +endif + +obj-$(CONFIG_SND_SOC_TEGRA210_I2S_ALT) += snd-soc-tegra210-alt-i2s.o +obj-$(CONFIG_SND_SOC_TEGRA210_DMIC_ALT) += snd-soc-tegra210-alt-dmic.o +obj-$(CONFIG_SND_SOC_TEGRA210_AMX_ALT) += snd-soc-tegra210-alt-amx.o +obj-$(CONFIG_SND_SOC_TEGRA210_ADX_ALT) += snd-soc-tegra210-alt-adx.o +obj-$(CONFIG_SND_SOC_TEGRA210_MIXER_ALT) += snd-soc-tegra210-alt-mixer.o +obj-$(CONFIG_SND_SOC_TEGRA210_SFC_ALT) += snd-soc-tegra210-alt-sfc.o +obj-$(CONFIG_SND_SOC_TEGRA210_AFC_ALT) += snd-soc-tegra210-alt-afc.o +obj-$(CONFIG_SND_SOC_TEGRA210_MVC_ALT) += snd-soc-tegra210-alt-mvc.o +obj-$(CONFIG_SND_SOC_TEGRA210_IQC_ALT) += snd-soc-tegra210-alt-iqc.o +obj-$(CONFIG_SND_SOC_TEGRA210_SPDIF_ALT) += snd-soc-tegra210-alt-spdif.o +obj-$(CONFIG_SND_SOC_TEGRA210_OPE_ALT) += snd-soc-tegra210-alt-ope.o +obj-$(CONFIG_SND_SOC_TEGRA210_ADSP_ALT) += snd-soc-tegra210-alt-adsp.o +obj-$(CONFIG_SND_SOC_TEGRA186_ARAD_ALT) += snd-soc-tegra186-alt-arad.o +obj-$(CONFIG_SND_SOC_TEGRA186_ASRC_ALT) += snd-soc-tegra186-alt-asrc.o +obj-$(CONFIG_SND_SOC_TEGRA186_DSPK_ALT) += snd-soc-tegra186-alt-dspk.o + +#------------------------------------ machine drivers --------------------------------------- +snd-soc-tegra-alt-p1889ref-objs := machine_drivers/tegra_p1889ref_alt.o +snd-soc-tegra-alt-t210ref-objs := machine_drivers/tegra_t210ref_alt.o +snd-soc-tegra-alt-t186ref-objs := machine_drivers/tegra_t186ref_alt.o +snd-soc-tegra-machine-driver-mobile-objs := machine_drivers/tegra_machine_driver_mobile.o +snd-soc-tegra-alt-t186ref-p2382-objs := machine_drivers/tegra_t186ref_p2382_alt.o +snd-soc-tegra-alt-t186ref-bali-objs := machine_drivers/tegra_t186ref_bali_alt.o +snd-soc-tegra-alt-t186ref-p4573-objs := machine_drivers/tegra_t186ref_p4573_alt.o +snd-soc-tegra-alt-t186ref-m3420-objs := machine_drivers/tegra_t186ref_m3420_alt.o +snd-soc-tegra-alt-t210ref-p2382-objs := machine_drivers/tegra_t210ref_p2382_alt.o \ + machine_drivers/tegra_maui_alt.o + +obj-$(CONFIG_SND_SOC_TEGRA_P1889REF_ALT) += snd-soc-tegra-alt-p1889ref.o +obj-$(CONFIG_SND_SOC_TEGRA_T210REF_ALT) += snd-soc-tegra-alt-t210ref.o +obj-$(CONFIG_SND_SOC_TEGRA_T210REF_P2382_ALT) += snd-soc-tegra-alt-t210ref-p2382.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_FPGA_ALT) += snd-soc-tegra-alt-t186ref.o +obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT) += snd-soc-tegra-machine-driver-mobile.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_MOBILE_ALT) += snd-soc-tegra-machine-driver-mobile.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT) += snd-soc-tegra-alt-t186ref-p2382.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT) += snd-soc-tegra-alt-t186ref-bali.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_P4573_ALT) += snd-soc-tegra-alt-t186ref-p4573.o +obj-$(CONFIG_SND_SOC_TEGRA_T186REF_M3420_ALT) += snd-soc-tegra-alt-t186ref-m3420.o diff --git a/sound/soc/tegra-alt/Makefile.nvidia b/sound/soc/tegra-alt/Makefile.nvidia deleted file mode 100644 index 3594cef93..000000000 --- a/sound/soc/tegra-alt/Makefile.nvidia +++ /dev/null @@ -1,94 +0,0 @@ -GCOV_PROFILE := y - -subdir-ccflags-y := -Werror - -subdir-ccflags-y += -I$(srctree) -subdir-ccflags-y += -I$(srctree)/sound/soc/codecs/ -subdir-ccflags-y += -I$(srctree)/../nvidia -subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-virt-alt/ -subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-alt/include/ - -#----------------------------- utility drivers -------------------------------------- -CFLAGS_tegra_pcm_alt.o += -Wno-shift-count-overflow - -snd-soc-tegra-alt-utils-objs := utils/tegra_asoc_utils_alt.o \ - utils/tegra_pcm_alt.o \ - utils/tegra_asoc_machine_alt.o \ - utils/tegra_isomgr_bw_alt.o \ - utils/ahub_unit_fpga_clock.o \ - utils/tegra210_xbar_utils_alt.o - -obj-$(CONFIG_SND_SOC_TEGRA_ALT) += snd-soc-tegra-alt-utils.o - -#----------------------------- platform drivers ------------------------------------- -snd-soc-tegra210-alt-admaif-objs := tegra210_admaif_alt.o -snd-soc-tegra210-alt-xbar-objs := tegra210_xbar_alt.o - -# required to fool lkm loader (can be removed later) -ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) - snd-soc-tegra186-alt-xbar-objs := tegra210_xbar_alt.o -endif - -snd-soc-tegra210-alt-i2s-objs := tegra210_i2s_alt.o -snd-soc-tegra210-alt-dmic-objs := tegra210_dmic_alt.o -snd-soc-tegra210-alt-amx-objs := tegra210_amx_alt.o -snd-soc-tegra210-alt-adx-objs := tegra210_adx_alt.o -snd-soc-tegra210-alt-mixer-objs := tegra210_mixer_alt.o -snd-soc-tegra210-alt-sfc-objs := tegra210_sfc_alt.o -snd-soc-tegra210-alt-afc-objs := tegra210_afc_alt.o -snd-soc-tegra210-alt-mvc-objs := tegra210_mvc_alt.o -snd-soc-tegra210-alt-iqc-objs := tegra210_iqc_alt.o -snd-soc-tegra210-alt-spdif-objs := tegra210_spdif_alt.o -snd-soc-tegra210-alt-adsp-objs := tegra210_adsp_alt.o -snd-soc-tegra186-alt-asrc-objs := tegra186_asrc_alt.o -snd-soc-tegra186-alt-arad-objs := tegra186_arad_alt.o -snd-soc-tegra186-alt-dspk-objs := tegra186_dspk_alt.o -snd-soc-tegra210-alt-ope-objs := tegra210_ope_alt.o \ - tegra210_peq_alt.o \ - tegra210_mbdrc_alt.o - -obj-$(CONFIG_SND_SOC_TEGRA210_ADMAIF_ALT) += snd-soc-tegra210-alt-admaif.o -obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra210-alt-xbar.o - -ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) - obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra186-alt-xbar.o -endif - -obj-$(CONFIG_SND_SOC_TEGRA210_I2S_ALT) += snd-soc-tegra210-alt-i2s.o -obj-$(CONFIG_SND_SOC_TEGRA210_DMIC_ALT) += snd-soc-tegra210-alt-dmic.o -obj-$(CONFIG_SND_SOC_TEGRA210_AMX_ALT) += snd-soc-tegra210-alt-amx.o -obj-$(CONFIG_SND_SOC_TEGRA210_ADX_ALT) += snd-soc-tegra210-alt-adx.o -obj-$(CONFIG_SND_SOC_TEGRA210_MIXER_ALT) += snd-soc-tegra210-alt-mixer.o -obj-$(CONFIG_SND_SOC_TEGRA210_SFC_ALT) += snd-soc-tegra210-alt-sfc.o -obj-$(CONFIG_SND_SOC_TEGRA210_AFC_ALT) += snd-soc-tegra210-alt-afc.o -obj-$(CONFIG_SND_SOC_TEGRA210_MVC_ALT) += snd-soc-tegra210-alt-mvc.o -obj-$(CONFIG_SND_SOC_TEGRA210_IQC_ALT) += snd-soc-tegra210-alt-iqc.o -obj-$(CONFIG_SND_SOC_TEGRA210_SPDIF_ALT) += snd-soc-tegra210-alt-spdif.o -obj-$(CONFIG_SND_SOC_TEGRA210_OPE_ALT) += snd-soc-tegra210-alt-ope.o -obj-$(CONFIG_SND_SOC_TEGRA210_ADSP_ALT) += snd-soc-tegra210-alt-adsp.o -obj-$(CONFIG_SND_SOC_TEGRA186_ARAD_ALT) += snd-soc-tegra186-alt-arad.o -obj-$(CONFIG_SND_SOC_TEGRA186_ASRC_ALT) += snd-soc-tegra186-alt-asrc.o -obj-$(CONFIG_SND_SOC_TEGRA186_DSPK_ALT) += snd-soc-tegra186-alt-dspk.o - -#------------------------------------ machine drivers --------------------------------------- -snd-soc-tegra-alt-p1889ref-objs := machine_drivers/tegra_p1889ref_alt.o -snd-soc-tegra-alt-t210ref-objs := machine_drivers/tegra_t210ref_alt.o -snd-soc-tegra-alt-t186ref-objs := machine_drivers/tegra_t186ref_alt.o -snd-soc-tegra-machine-driver-mobile-objs := machine_drivers/tegra_machine_driver_mobile.o -snd-soc-tegra-alt-t186ref-p2382-objs := machine_drivers/tegra_t186ref_p2382_alt.o -snd-soc-tegra-alt-t186ref-bali-objs := machine_drivers/tegra_t186ref_bali_alt.o -snd-soc-tegra-alt-t186ref-p4573-objs := machine_drivers/tegra_t186ref_p4573_alt.o -snd-soc-tegra-alt-t186ref-m3420-objs := machine_drivers/tegra_t186ref_m3420_alt.o -snd-soc-tegra-alt-t210ref-p2382-objs := machine_drivers/tegra_t210ref_p2382_alt.o \ - machine_drivers/tegra_maui_alt.o - -obj-$(CONFIG_SND_SOC_TEGRA_P1889REF_ALT) += snd-soc-tegra-alt-p1889ref.o -obj-$(CONFIG_SND_SOC_TEGRA_T210REF_ALT) += snd-soc-tegra-alt-t210ref.o -obj-$(CONFIG_SND_SOC_TEGRA_T210REF_P2382_ALT) += snd-soc-tegra-alt-t210ref-p2382.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_FPGA_ALT) += snd-soc-tegra-alt-t186ref.o -obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT) += snd-soc-tegra-machine-driver-mobile.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_MOBILE_ALT) += snd-soc-tegra-machine-driver-mobile.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT) += snd-soc-tegra-alt-t186ref-p2382.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT) += snd-soc-tegra-alt-t186ref-bali.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_P4573_ALT) += snd-soc-tegra-alt-t186ref-p4573.o -obj-$(CONFIG_SND_SOC_TEGRA_T186REF_M3420_ALT) += snd-soc-tegra-alt-t186ref-m3420.o diff --git a/sound/soc/tegra-virt-alt/Kconfig b/sound/soc/tegra-virt-alt/Kconfig new file mode 100644 index 000000000..70314480f --- /dev/null +++ b/sound/soc/tegra-virt-alt/Kconfig @@ -0,0 +1,31 @@ +if SND_SOC + +config SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS + tristate "IVC client for Tegra virt audio" + depends on TEGRA_HV_MANAGER + select SND_SOC_TEGRA_VIRT_IVC_COMM + help + Say Y or M here if you want to add support for tegra virtual ivc communication + for audio client. This ivc communication module is common for all virtualized + tegra platforms. This is used by both pcm and control interfaces. This module + uses hypervisor IVC APIs for communication with audio server. + +config SND_SOC_TEGRA_VIRT_IVC_COMM + bool "IVC client enabler for virt audio" + help + Say Y or N here if you want to add support for tegra virtual ivc communication + for audio client. + +config SND_SOC_TEGRA_VIRT_T210REF_PCM + tristate "Tegra210 virt PCM driver" + depends on TEGRA_HV_MANAGER + depends on SND_SOC_TEGRA_ALT + select SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + help + Say Y or M if you want to add support for Tegra210 para-virtualized PCM audio. + The pcm driver exposes a number of playback and capture pcm interfaces. It uses + the native pcm driver for dma interface and ivc communication module for ivc. + The number of interfaces exposed is configurable via device tree. + +endif diff --git a/sound/soc/tegra-virt-alt/Kconfig.nvidia b/sound/soc/tegra-virt-alt/Kconfig.nvidia deleted file mode 100644 index 6a9a348a6..000000000 --- a/sound/soc/tegra-virt-alt/Kconfig.nvidia +++ /dev/null @@ -1,27 +0,0 @@ -config SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS - tristate "IVC client for Tegra virt audio" - depends on TEGRA_HV_MANAGER - select SND_SOC_TEGRA_VIRT_IVC_COMM - help - Say Y or M here if you want to add support for tegra virtual ivc communication - for audio client. This ivc communication module is common for all virtualized - tegra platforms. This is used by both pcm and control interfaces. This module - uses hypervisor IVC APIs for communication with audio server. - -config SND_SOC_TEGRA_VIRT_IVC_COMM - bool "IVC client enabler for virt audio" - help - Say Y or N here if you want to add support for tegra virtual ivc communication - for audio client. - -config SND_SOC_TEGRA_VIRT_T210REF_PCM - tristate "Tegra210 virt PCM driver" - depends on TEGRA_HV_MANAGER - depends on SND_SOC_TEGRA_ALT - select SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP - help - Say Y or M if you want to add support for Tegra210 para-virtualized PCM audio. - The pcm driver exposes a number of playback and capture pcm interfaces. It uses - the native pcm driver for dma interface and ivc communication module for ivc. - The number of interfaces exposed is configurable via device tree. diff --git a/sound/soc/tegra-virt-alt/Makefile b/sound/soc/tegra-virt-alt/Makefile new file mode 100644 index 000000000..8484e331a --- /dev/null +++ b/sound/soc/tegra-virt-alt/Makefile @@ -0,0 +1,22 @@ +GCOV_PROFILE := y + +subdir-ccflags-y := -Werror +ccflags-y += -I$(overlay)/$(src)/../tegra-alt +ccflags-y += -I$(overlay)/$(src)/../tegra-alt/include/ +ccflags-y += -I$(overlay)/$(src)/../tegra-alt/machine_drivers/ +ccflags-y += -I$(overlay)/$(src)/../codecs + +# Tegra platform Support +snd-soc-tegra-virt-alt-ivc-objs := tegra_virt_alt_ivc.o + +obj-$(CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS) += snd-soc-tegra-virt-alt-ivc.o + +snd-soc-tegra210-virt-alt-admaif-objs := tegra210_virt_alt_admaif.o \ + tegra_asoc_xbar_virt_alt.o \ + tegra_asoc_util_virt_alt.o \ + tegra_asoc_machine_virt_alt.o \ + tegra_asoc_metadata_util_alt.o + +snd-soc-tegra-virt-t210ref-pcm-objs := tegra_virt_ref_alt.o +obj-$(CONFIG_SND_SOC_TEGRA_VIRT_T210REF_PCM) += snd-soc-tegra210-virt-alt-admaif.o +obj-$(CONFIG_SND_SOC_TEGRA_VIRT_T210REF_PCM) += snd-soc-tegra-virt-t210ref-pcm.o diff --git a/sound/soc/tegra-virt-alt/Makefile.nvidia b/sound/soc/tegra-virt-alt/Makefile.nvidia deleted file mode 100644 index 8379a5b28..000000000 --- a/sound/soc/tegra-virt-alt/Makefile.nvidia +++ /dev/null @@ -1,22 +0,0 @@ -GCOV_PROFILE := y - -subdir-ccflags-y := -Werror -ccflags-y += -I$(src)/../tegra-alt -ccflags-y += -I$(src)/../tegra-alt/include/ -ccflags-y += -I$(src)/../tegra-alt/machine_drivers/ -ccflags-y += -I$(src)/../codecs - -# Tegra platform Support -snd-soc-tegra-virt-alt-ivc-objs := tegra_virt_alt_ivc.o - -obj-$(CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS) += snd-soc-tegra-virt-alt-ivc.o - -snd-soc-tegra210-virt-alt-admaif-objs := tegra210_virt_alt_admaif.o \ - tegra_asoc_xbar_virt_alt.o \ - tegra_asoc_util_virt_alt.o \ - tegra_asoc_machine_virt_alt.o \ - tegra_asoc_metadata_util_alt.o - -snd-soc-tegra-virt-t210ref-pcm-objs := tegra_virt_ref_alt.o -obj-$(CONFIG_SND_SOC_TEGRA_VIRT_T210REF_PCM) += snd-soc-tegra210-virt-alt-admaif.o -obj-$(CONFIG_SND_SOC_TEGRA_VIRT_T210REF_PCM) += snd-soc-tegra-virt-t210ref-pcm.o -- cgit v1.2.2