From 74a74be23feb5d44121f059e1ab96787be4b7532 Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Thu, 15 Dec 2016 14:22:05 +0100 Subject: apalis-tk1: Mainline kernel machine This patch adds mainline linux based Apalis TK1 machine. It includes compatible recipes for libdrm, mesa, Xorg, and weston. Signed-off-by: Dominik Sliwa Acked-by: Max Krummenacher --- ...0001-apalis-tk1-remove-spurious-new-lines.patch | 113 +++++++++++++ ...tk1-fix-pcie-clock-and-reset-not-conformi.patch | 147 +++++++++++++++++ ...oradex_apalis_tk1_t30-customize-defconfig.patch | 181 +++++++++++++++++++++ .../0002-apalis-tk1-temp-alert-pull-up.patch | 34 ++++ ...2-igb-integrate-tools-only-device-support.patch | 74 +++++++++ ...-tk1-optional-displayport-hot-plug-detect.patch | 29 ++++ ...tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch | 136 ++++++++++++++++ ...-apalis-tk1-adjust-pin-muxing-for-v1.1-hw.patch | 114 +++++++++++++ ...ra-apalis-tk1-hack-to-make-sd1-functional.patch | 52 ++++++ ...lis-tk1-working-sd-card-detect-on-v1.1-hw.patch | 37 +++++ ...6-apalis-tk1-update-compatibility-comment.patch | 30 ++++ 11 files changed, 947 insertions(+) create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis-tk1-remove-spurious-new-lines.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0001-toradex_apalis_tk1_t30-customize-defconfig.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0002-apalis-tk1-temp-alert-pull-up.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0002-igb-integrate-tools-only-device-support.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis-tk1-optional-displayport-hot-plug-detect.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0004-apalis-tk1-adjust-pin-muxing-for-v1.1-hw.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0004-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0005-apalis-tk1-working-sd-card-detect-on-v1.1-hw.patch create mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.9/0006-apalis-tk1-update-compatibility-comment.patch (limited to 'recipes-kernel/linux/linux-toradex-mainline-4.9') diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis-tk1-remove-spurious-new-lines.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis-tk1-remove-spurious-new-lines.patch new file mode 100644 index 0000000..d6615e9 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis-tk1-remove-spurious-new-lines.patch @@ -0,0 +1,113 @@ +From 9986ed08d8135318f19a2f5906427bd816bace93 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Tue, 22 Nov 2016 00:56:25 +0100 +Subject: [RESEND PATCH 1/6] apalis-tk1: remove spurious new lines + +Remove some spurious new lines. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis-eval.dts | 1 - + arch/arm/boot/dts/tegra124-apalis.dtsi | 12 ------------ + 2 files changed, 13 deletions(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts +index 653044a..2b5a0f3 100644 +--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts ++++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts +@@ -232,7 +232,6 @@ + + backlight: backlight { + compatible = "pwm-backlight"; +- + /* BKL1_PWM */ + pwms = <&pwm 3 5000000>; + brightness-levels = <255 231 223 207 191 159 127 0>; +diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi +index 0819721..6aa4952 100644 +--- a/arch/arm/boot/dts/tegra124-apalis.dtsi ++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi +@@ -56,7 +56,6 @@ + + pcie-controller@01003000 { + status = "okay"; +- + avddio-pex-supply = <&vdd_1v05>; + avdd-pex-pll-supply = <&vdd_1v05>; + avdd-pll-erefe-supply = <&avdd_1v05>; +@@ -85,7 +84,6 @@ + hdmi@54280000 { + pll-supply = <®_1v05_avdd_hdmi_pll>; + vdd-supply = <®_3v3_avdd_hdmi>; +- + nvidia,ddc-i2c-bus = <&hdmi_ddc>; + nvidia,hpd-gpio = + <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; +@@ -1607,15 +1605,11 @@ + compatible = "ams,as3722"; + reg = <0x40>; + interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; +- + ams,system-power-controller; +- + #interrupt-cells = <2>; + interrupt-controller; +- + gpio-controller; + #gpio-cells = <2>; +- + pinctrl-names = "default"; + pinctrl-0 = <&as3722_default>; + +@@ -1790,7 +1784,6 @@ + reg = <0x4c>; + interrupt-parent = <&gpio>; + interrupts = ; +- + #thermal-sensor-cells = <1>; + }; + }; +@@ -1823,7 +1816,6 @@ + sata@70020000 { + phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>; + phy-names = "sata-0"; +- + avdd-supply = <&vdd_1v05>; + hvdd-supply = <®_3v3>; + vddio-supply = <&vdd_1v05>; +@@ -1837,7 +1829,6 @@ + <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, + <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>; + phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0"; +- + avddio-pex-supply = <&vdd_1v05>; + avdd-pll-erefe-supply = <&avdd_1v05>; + avdd-pll-utmip-supply = <&vddio_1v8>; +@@ -1919,7 +1910,6 @@ + usb2-0 { + status = "okay"; + mode = "otg"; +- + vbus-supply = <®_usbo1_vbus>; + }; + +@@ -1927,7 +1917,6 @@ + usb2-1 { + status = "okay"; + mode = "host"; +- + vbus-supply = <®_usbh_vbus>; + }; + +@@ -1935,7 +1924,6 @@ + usb2-2 { + status = "okay"; + mode = "host"; +- + vbus-supply = <®_usbh_vbus>; + }; + +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch new file mode 100644 index 0000000..c958ff6 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch @@ -0,0 +1,147 @@ +From a2286569bb02b2ef881302eedbd944f8482beabe Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Thu, 15 Dec 2016 10:24:58 +0100 +Subject: [PATCH 1/4] apalis_t30/tk1: fix pcie clock and reset not conforming + to specification + +Fix PCIe clock and reset not conforming to specification by moving PCIe +reset handling including the PLX PEX 8605 errata 5 workaround from the +board platform data into the right places timing wise in the PCIe driver +itself. + +Also add a kernel command line argument to allow using the Apalis GPIO7 +as a regular GPIO rather than for above mentioned PLX PEX 8605 +workaround: + +pex_perst=0 + +Signed-off-by: Marcel Ziswiler +Acked-by: Dominik Sliwa +(cherry picked from toradex_tk1_l4t_r21.5 commit +3e2259b04c2e2c029f742e9dda06a3a2739977d4) +(cherry picked from tegra commit +a2f63805703b43d55d91ae17f10d0049bf0f625e) + +--- + + drivers/pci/host/pci-tegra.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 83 insertions(+) + +diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c +index 8dfccf7..1452fe4 100644 +--- a/drivers/pci/host/pci-tegra.c ++++ b/drivers/pci/host/pci-tegra.c +@@ -55,6 +55,34 @@ + #include + #include + ++//#define CONFIG_MACH_APALIS_T30 ++#define CONFIG_MACH_APALIS_TK1 ++#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1) ++#include ++ ++#include "../../../arch/arm/boot/dts/include/dt-bindings/gpio/tegra-gpio.h" ++ ++#ifdef CONFIG_MACH_APALIS_T30 ++#define APALIS_GPIO7 TEGRA_GPIO(S, 7) ++ ++#define LAN_RESET_N -1 ++ ++#define PEX_PERST_N APALIS_GPIO7 ++ ++#define RESET_MOCI_N TEGRA_GPIO(I, 4) ++#endif ++ ++#ifdef CONFIG_MACH_APALIS_TK1 ++#define APALIS_GPIO7 TEGRA_GPIO(DD, 1) ++ ++#define LAN_RESET_N TEGRA_GPIO(S, 2) ++ ++#define PEX_PERST_N APALIS_GPIO7 ++ ++#define RESET_MOCI_N TEGRA_GPIO(U, 4) ++#endif ++#endif ++ + #define INT_PCI_MSI_NR (8 * 32) + + /* register definitions */ +@@ -322,6 +350,21 @@ struct tegra_pcie_bus { + unsigned int nr; + }; + ++#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1) ++/* To disable the PCIe switch reset errata workaround */ ++int g_pex_perst = 1; ++ ++/* To disable the PCIe switch reset errata workaround */ ++static int __init disable_pex_perst(char *s) ++{ ++ if (!(*s) || !strcmp(s, "0")) ++ g_pex_perst = 0; ++ ++ return 0; ++} ++__setup("pex_perst=", disable_pex_perst); ++#endif /* CONFIG_MACH_APALIS_T30 || CONFIG_MACH_APALIS_TK1 */ ++ + static inline struct tegra_pcie *sys_to_pcie(struct pci_sys_data *sys) + { + return sys->private_data; +@@ -528,6 +571,27 @@ static void tegra_pcie_port_reset(struct tegra_pcie_port *port) + unsigned long ctrl = tegra_pcie_port_get_pex_ctrl(port); + unsigned long value; + ++#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1) ++ /* ++ * Reset PLX PEX 8605 PCIe Switch plus PCIe devices on Apalis Evaluation ++ * Board ++ */ ++ if (g_pex_perst) ++ gpio_request(PEX_PERST_N, "PEX_PERST_N"); ++ gpio_request(RESET_MOCI_N, "RESET_MOCI_N"); ++ if (g_pex_perst) ++ gpio_direction_output(PEX_PERST_N, 0); ++ gpio_direction_output(RESET_MOCI_N, 0); ++ ++#ifdef CONFIG_MACH_APALIS_TK1 ++ /* Reset I210 Gigabit Ethernet Controller */ ++ if (LAN_RESET_N) { ++ gpio_request(LAN_RESET_N, "LAN_RESET_N"); ++ gpio_direction_output(LAN_RESET_N, 0); ++ } ++#endif /* CONFIG_MACH_APALIS_TK1 */ ++#endif /* CONFIG_MACH_APALIS_T30 || CONFIG_MACH_APALIS_TK1 */ ++ + /* pulse reset signal */ + value = afi_readl(port->pcie, ctrl); + value &= ~AFI_PEX_CTRL_RST; +@@ -538,6 +602,25 @@ static void tegra_pcie_port_reset(struct tegra_pcie_port *port) + value = afi_readl(port->pcie, ctrl); + value |= AFI_PEX_CTRL_RST; + afi_writel(port->pcie, value, ctrl); ++ ++#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1) ++ /* Must be asserted for 100 ms after power and clocks are stable */ ++ if (g_pex_perst) ++ gpio_set_value(PEX_PERST_N, 1); ++ /* ++ * Err_5: PEX_REFCLK_OUTpx/nx Clock Outputs is not Guaranteed Until ++ * 900 us After PEX_PERST# De-assertion ++ */ ++ if (g_pex_perst) ++ mdelay(1); ++ gpio_set_value(RESET_MOCI_N, 1); ++ ++#ifdef CONFIG_MACH_APALIS_TK1 ++ /* Release I210 Gigabit Ethernet Controller Reset */ ++ if (LAN_RESET_N) ++ gpio_set_value(LAN_RESET_N, 1); ++#endif /* CONFIG_MACH_APALIS_TK1 */ ++#endif /* CONFIG_MACH_APALIS_T30 || CONFIG_MACH_APALIS_TK1 */ + } + + static void tegra_pcie_port_enable(struct tegra_pcie_port *port) +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-toradex_apalis_tk1_t30-customize-defconfig.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-toradex_apalis_tk1_t30-customize-defconfig.patch new file mode 100644 index 0000000..6f1a010 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0001-toradex_apalis_tk1_t30-customize-defconfig.patch @@ -0,0 +1,181 @@ +From dbb1d8b04577f892dbaa0a5d086a0ec2c08dc00f Mon Sep 17 00:00:00 2001 +From: Dominik Sliwa +Date: Thu, 15 Dec 2016 10:40:06 +0100 +Subject: [PATCH] toradex_apalis_tk1_t30: customize defconfig + +--- + arch/arm/configs/tegra_defconfig | 45 ++++++++++++++++++++++++---------------- + 1 file changed, 27 insertions(+), 18 deletions(-) + +diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig +index 6012a1e..48f87cd 100644 +--- a/arch/arm/configs/tegra_defconfig ++++ b/arch/arm/configs/tegra_defconfig +@@ -1,16 +1,15 @@ + CONFIG_SYSVIPC=y +-CONFIG_FHANDLE=y + CONFIG_IRQ_DOMAIN_DEBUG=y + CONFIG_NO_HZ=y + CONFIG_HIGH_RES_TIMERS=y + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y + CONFIG_CGROUPS=y +-CONFIG_CGROUP_DEBUG=y +-CONFIG_CGROUP_FREEZER=y +-CONFIG_CGROUP_CPUACCT=y + CONFIG_CGROUP_SCHED=y + CONFIG_RT_GROUP_SCHED=y ++CONFIG_CGROUP_FREEZER=y ++CONFIG_CGROUP_CPUACCT=y ++CONFIG_CGROUP_DEBUG=y + CONFIG_BLK_DEV_INITRD=y + # CONFIG_ELF_CORE is not set + CONFIG_EMBEDDED=y +@@ -24,14 +23,10 @@ CONFIG_PARTITION_ADVANCED=y + # CONFIG_IOSCHED_DEADLINE is not set + # CONFIG_IOSCHED_CFQ is not set + CONFIG_ARCH_TEGRA=y +-CONFIG_ARCH_TEGRA_2x_SOC=y +-CONFIG_ARCH_TEGRA_3x_SOC=y +-CONFIG_ARCH_TEGRA_114_SOC=y +-CONFIG_ARCH_TEGRA_124_SOC=y + CONFIG_PCI=y ++CONFIG_PCIEPORTBUS=y + CONFIG_PCI_MSI=y + CONFIG_PCI_TEGRA=y +-CONFIG_PCIEPORTBUS=y + CONFIG_SMP=y + CONFIG_PREEMPT=y + CONFIG_AEABI=y +@@ -41,7 +36,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 + CONFIG_ZBOOT_ROM_BSS=0x0 + CONFIG_KEXEC=y + CONFIG_CPU_FREQ=y +-CONFIG_CPU_FREQ_STAT_DETAILS=y + CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y + CONFIG_CPUFREQ_DT=y + CONFIG_CPU_IDLE=y +@@ -59,7 +53,6 @@ CONFIG_IP_PNP_RARP=y + CONFIG_INET_ESP=y + # CONFIG_INET_XFRM_MODE_TUNNEL is not set + # CONFIG_INET_XFRM_MODE_BEET is not set +-# CONFIG_INET_LRO is not set + # CONFIG_INET_DIAG is not set + CONFIG_IPV6_ROUTER_PREF=y + CONFIG_IPV6_OPTIMISTIC_DAD=y +@@ -110,9 +103,21 @@ CONFIG_USB_PEGASUS=y + CONFIG_USB_USBNET=y + CONFIG_USB_NET_SMSC75XX=y + CONFIG_USB_NET_SMSC95XX=y ++CONFIG_ATH9K=m ++CONFIG_ATH9K_CHANNEL_CONTEXT=y ++CONFIG_ATH9K_HTC=m ++CONFIG_ATH10K=m ++CONFIG_ATH10K_PCI=m ++# CONFIG_WLAN_VENDOR_ATMEL is not set + CONFIG_BRCMFMAC=m ++CONFIG_IWLWIFI=m ++CONFIG_IWLDVM=m ++CONFIG_IWLMVM=m + CONFIG_RT2X00=y + CONFIG_RT2800USB=m ++CONFIG_RTL_CARDS=m ++CONFIG_RTL8192CU=m ++CONFIG_RSI_91X=m + CONFIG_INPUT_JOYDEV=y + CONFIG_INPUT_EVDEV=y + CONFIG_KEYBOARD_GPIO=y +@@ -131,8 +136,8 @@ CONFIG_INPUT_MPU3050=y + # CONFIG_DEVKMEM is not set + CONFIG_SERIAL_8250=y + CONFIG_SERIAL_8250_CONSOLE=y +-CONFIG_SERIAL_TEGRA=y + CONFIG_SERIAL_OF_PLATFORM=y ++CONFIG_SERIAL_TEGRA=y + # CONFIG_HW_RANDOM is not set + # CONFIG_I2C_COMPAT is not set + CONFIG_I2C_CHARDEV=y +@@ -151,11 +156,11 @@ CONFIG_GPIO_PCA953X_IRQ=y + CONFIG_GPIO_PALMAS=y + CONFIG_GPIO_TPS6586X=y + CONFIG_GPIO_TPS65910=y +-CONFIG_BATTERY_SBS=y +-CONFIG_CHARGER_TPS65090=y + CONFIG_POWER_RESET=y + CONFIG_POWER_RESET_AS3722=y + CONFIG_POWER_RESET_GPIO=y ++CONFIG_BATTERY_SBS=y ++CONFIG_CHARGER_TPS65090=y + CONFIG_SENSORS_LM90=y + CONFIG_SENSORS_LM95245=y + CONFIG_WATCHDOG=y +@@ -188,6 +193,7 @@ CONFIG_USB_GSPCA=y + CONFIG_DRM=y + CONFIG_DRM_NOUVEAU=m + CONFIG_DRM_TEGRA=y ++CONFIG_DRM_TEGRA_STAGING=y + CONFIG_DRM_PANEL_SIMPLE=y + # CONFIG_LCD_CLASS_DEVICE is not set + # CONFIG_BACKLIGHT_GENERIC is not set +@@ -216,9 +222,10 @@ CONFIG_SND_SOC_TEGRA_WM9712=y + CONFIG_SND_SOC_TEGRA_TRIMSLICE=y + CONFIG_SND_SOC_TEGRA_ALC5632=y + CONFIG_SND_SOC_TEGRA_MAX98090=y ++CONFIG_SND_SOC_TEGRA_SGTL5000=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y +-CONFIG_USB_XHCI_TEGRA=y ++CONFIG_USB_XHCI_TEGRA=m + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_TEGRA=y + CONFIG_USB_ACM=y +@@ -229,11 +236,9 @@ CONFIG_MMC_BLOCK_MINORS=16 + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_PLTFM=y + CONFIG_MMC_SDHCI_TEGRA=y +-CONFIG_NEW_LEDS=y + CONFIG_LEDS_CLASS=y + CONFIG_LEDS_GPIO=y + CONFIG_LEDS_PWM=y +-CONFIG_LEDS_TRIGGERS=y + CONFIG_LEDS_TRIGGER_TIMER=y + CONFIG_LEDS_TRIGGER_ONESHOT=y + CONFIG_LEDS_TRIGGER_HEARTBEAT=y +@@ -253,6 +258,7 @@ CONFIG_RTC_DRV_TEGRA=y + CONFIG_DMADEVICES=y + CONFIG_TEGRA20_APB_DMA=y + CONFIG_STAGING=y ++CONFIG_R8188EU=m + CONFIG_SENSORS_ISL29018=y + CONFIG_SENSORS_ISL29028=y + CONFIG_MFD_NVEC=y +@@ -262,6 +268,10 @@ CONFIG_NVEC_POWER=y + CONFIG_NVEC_PAZ00=y + CONFIG_TEGRA_IOMMU_GART=y + CONFIG_TEGRA_IOMMU_SMMU=y ++CONFIG_ARCH_TEGRA_2x_SOC=y ++CONFIG_ARCH_TEGRA_3x_SOC=y ++CONFIG_ARCH_TEGRA_114_SOC=y ++CONFIG_ARCH_TEGRA_124_SOC=y + CONFIG_MEMORY=y + CONFIG_IIO=y + CONFIG_AK8975=y +@@ -286,6 +286,7 @@ CONFIG_EXT3_FS=y + CONFIG_EXT3_FS_POSIX_ACL=y + CONFIG_EXT3_FS_SECURITY=y + # CONFIG_DNOTIFY is not set ++CONFIG_AUTOFS4_FS=y + CONFIG_VFAT_FS=y + CONFIG_TMPFS=y + CONFIG_TMPFS_POSIX_ACL=y +@@ -289,7 +299,6 @@ CONFIG_NLS_CODEPAGE_437=y + CONFIG_NLS_ISO8859_1=y + CONFIG_PRINTK_TIME=y + CONFIG_DEBUG_INFO=y +-CONFIG_DEBUG_FS=y + CONFIG_MAGIC_SYSRQ=y + CONFIG_DEBUG_SLAB=y + CONFIG_DEBUG_VM=y +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-apalis-tk1-temp-alert-pull-up.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-apalis-tk1-temp-alert-pull-up.patch new file mode 100644 index 0000000..be59f28 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-apalis-tk1-temp-alert-pull-up.patch @@ -0,0 +1,34 @@ +From 34ef168249df6e467ecdb0333eef7f95f87ab195 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Tue, 22 Nov 2016 00:57:47 +0100 +Subject: [RESEND PATCH 2/6] apalis-tk1: temp alert pull-up + +Pull-up GPIO_PI6 connected to TMP451's ALERT#/THERM2#. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi +index 6aa4952..0534601 100644 +--- a/arch/arm/boot/dts/tegra124-apalis.dtsi ++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi +@@ -1151,11 +1151,11 @@ + nvidia,enable-input = ; + }; + +- /* GPIO_PI6 aka TEMP_ALERT_L */ ++ /* GPIO_PI6 aka TMP451 ALERT#/THERM2# */ + pi6 { + nvidia,pins = "pi6"; + nvidia,function = "rsvd1"; +- nvidia,pull = ; ++ nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-igb-integrate-tools-only-device-support.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-igb-integrate-tools-only-device-support.patch new file mode 100644 index 0000000..f4e85db --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0002-igb-integrate-tools-only-device-support.patch @@ -0,0 +1,74 @@ +From 11901a29054e437c9f9241382512faf276f08df4 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Thu, 15 Dec 2016 10:55:11 +0100 +Subject: [PATCH 2/4] igb: integrate tools only device support + +Springville/i211 with a blank Flash/iNVM use different PCI IDs. Extend +the driver to load despite i210/i211 data sheets claiming tools only, +not for driver. + +Signed-off-by: Marcel Ziswiler +Acked-by: Dominik Sliwa + +(cherry picked from toradex_tk1_l4t_r21.5 commit +783780c43fd4e1473fb64790c8b9e0adb2be04a3) +(cherry picked from tegra commit +2c7123458270c9b3ec9b5ed668f9d55a7f8dbad9) + +--- + + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 ++ + drivers/net/ethernet/intel/igb/e1000_hw.h | 2 ++ + drivers/net/ethernet/intel/igb/igb_main.c | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c +index a61447f..53d9ae7 100644 +--- a/drivers/net/ethernet/intel/igb/e1000_82575.c ++++ b/drivers/net/ethernet/intel/igb/e1000_82575.c +@@ -610,6 +610,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) + case E1000_DEV_ID_I350_SGMII: + mac->type = e1000_i350; + break; ++ case E1000_DEV_ID_I210_TOOLS_ONLY: + case E1000_DEV_ID_I210_COPPER: + case E1000_DEV_ID_I210_FIBER: + case E1000_DEV_ID_I210_SERDES: +@@ -618,6 +619,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) + case E1000_DEV_ID_I210_SERDES_FLASHLESS: + mac->type = e1000_i210; + break; ++ case E1000_DEV_ID_I211_TOOLS_ONLY: + case E1000_DEV_ID_I211_COPPER: + mac->type = e1000_i211; + break; +diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h +index 2fb2213..69ebb81 100644 +--- a/drivers/net/ethernet/intel/igb/e1000_hw.h ++++ b/drivers/net/ethernet/intel/igb/e1000_hw.h +@@ -58,6 +58,8 @@ struct e1000_hw; + #define E1000_DEV_ID_I350_FIBER 0x1522 + #define E1000_DEV_ID_I350_SERDES 0x1523 + #define E1000_DEV_ID_I350_SGMII 0x1524 ++#define E1000_DEV_ID_I210_TOOLS_ONLY 0x1531 ++#define E1000_DEV_ID_I211_TOOLS_ONLY 0x1532 + #define E1000_DEV_ID_I210_COPPER 0x1533 + #define E1000_DEV_ID_I210_FIBER 0x1536 + #define E1000_DEV_ID_I210_SERDES 0x1537 +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index a761001..680abcd 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -77,7 +77,9 @@ static const struct pci_device_id igb_pci_tbl[] = { + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) }, ++ { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_TOOLS_ONLY), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER), board_82575 }, ++ { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_TOOLS_ONLY), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES), board_82575 }, +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis-tk1-optional-displayport-hot-plug-detect.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis-tk1-optional-displayport-hot-plug-detect.patch new file mode 100644 index 0000000..7adc524 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis-tk1-optional-displayport-hot-plug-detect.patch @@ -0,0 +1,29 @@ +From 9172020334268e0e49478afd8a520554df3c612c Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Tue, 22 Nov 2016 00:58:26 +0100 +Subject: [RESEND PATCH 3/6] apalis-tk1: optional displayport hot-plug detect + +Configure DP_HPD_PFF0 pin as optional DisplayPort hot-plug detect. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi +index 0534601..747ce81 100644 +--- a/arch/arm/boot/dts/tegra124-apalis.dtsi ++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi +@@ -255,7 +255,7 @@ + }; + dp_hpd_pff0 { + nvidia,pins = "dp_hpd_pff0"; +- nvidia,function = "rsvd2"; ++ nvidia,function = "dp"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch new file mode 100644 index 0000000..cd53bc6 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0003-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch @@ -0,0 +1,136 @@ +From 259b864ce38d18f7de945f957ee2e11ea4429812 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Thu, 15 Dec 2016 10:55:54 +0100 +Subject: [PATCH 3/4] apalis_t30/tk1: igb: no nvm and Ethernet MAC address + handling + +Only warn rather than fail on NVM validation failures on Apalis T30 and +Apalis TK1. + +Revise Ethernet MAC address assignment: should now handle up to two +instances of custom user MACs (2nd one with a 0x100000 offset). This +way customer does not have to worry about NVM on a secondary Ethernet +on the carrier board and still gets a valid official MAC address from +us (e.g. analogous to how we did it on our Protea carrier board). + +Use the Toradex OUI as default MAC address if no valid one is +encountered. + +Tested on samples of Apalis T30 2GB V1.0B, V1.0C, V1.1A, Apalis T30 1GB +V1.0A, V1.1A and Apalis T30 1GB IT V1.1A both with blank NVMs as well +as iNVMs programmed with Intel's defaults. + +Tested on samples of Apalis TK1 2GB V1.0A, V1.0B and V1.1A both with +blank NVMs as well as iNVMs programmed with Intel's defaults. + +Signed-off-by: Marcel Ziswiler +Acked-by: Dominik Sliwa + +(cherry picked from toradex_tk1_l4t_r21.5 commit +70efa60d96c9f05d91d8875eee97446df7f9e877) +(cherry picked from tegra commit +c4c3c7449bdb15c53bfebb0a29c73b24ea810d23) + +--- + + drivers/net/ethernet/intel/igb/igb_main.c | 60 +++++++++++++++++++++++++++++-- + 1 file changed, 57 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 680abcd..3df0e4e 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -55,6 +55,7 @@ + #include + #endif + #include ++#include + #include "igb.h" + + #define MAJ 5 +@@ -69,6 +70,9 @@ static const char igb_driver_string[] = + static const char igb_copyright[] = + "Copyright (c) 2007-2014 Intel Corporation."; + ++static char g_mac_addr[ETH_ALEN]; ++static int g_usr_mac = 0; ++ + static const struct e1000_info *igb_info_tbl[] = { + [board_82575] = &e1000_82575_info, + }; +@@ -258,6 +262,37 @@ static int debug = -1; + module_param(debug, int, 0); + MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); + ++/* Retrieve user set MAC address */ ++static int __init setup_igb_mac(char *macstr) ++{ ++ int i, j; ++ unsigned char result, value; ++ ++ for (i = 0; i < ETH_ALEN; i++) { ++ result = 0; ++ ++ if (i != 5 && *(macstr + 2) != ':') ++ return -1; ++ ++ for (j = 0; j < 2; j++) { ++ if (isxdigit(*macstr) && (value = isdigit(*macstr) ? ++ *macstr - '0' : toupper(*macstr) - 'A' + 10) < 16) { ++ result = result * 16 + value; ++ macstr++; ++ } else ++ return -1; ++ } ++ ++ macstr++; ++ g_mac_addr[i] = result; ++ } ++ ++ g_usr_mac = 1; ++ ++ return 0; ++} ++__setup("igb_mac=", setup_igb_mac); ++ + struct igb_reg_info { + u32 ofs; + char *name; +@@ -2511,12 +2546,31 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + dev_err(&pdev->dev, "NVM Read Error\n"); + } + ++ if (g_usr_mac && (g_usr_mac < 3)) { ++ /* Get user set MAC address */ ++ if (g_usr_mac == 2) { ++ /* 0x100000 offset for 2nd Ethernet MAC */ ++ g_mac_addr[3] += 0x10; ++ if (g_mac_addr[3] < 0x10) ++ dev_warn(&pdev->dev, ++ "MAC addr byte 3 (0x%02x) wrap around" ++ "\n", ++ g_mac_addr[3]); ++ } ++ memcpy(hw->mac.addr, g_mac_addr, ETH_ALEN); ++ g_usr_mac++; ++ } ++ + memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len); + + if (!is_valid_ether_addr(netdev->dev_addr)) { +- dev_err(&pdev->dev, "Invalid MAC Address\n"); +- err = -EIO; +- goto err_eeprom; ++ /* Use Toradex OUI as default */ ++ char default_mac_addr[ETH_ALEN] = { ++ 0x0, 0x14, 0x2d, 0x0, 0x0, 0x0 ++ }; ++ dev_warn(&pdev->dev, "using Toradex OUI as default igb MAC\n"); ++ memcpy(hw->mac.addr, default_mac_addr, ETH_ALEN); ++ memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len); + } + + /* get firmware version for ethtool -i */ +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-apalis-tk1-adjust-pin-muxing-for-v1.1-hw.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-apalis-tk1-adjust-pin-muxing-for-v1.1-hw.patch new file mode 100644 index 0000000..6841716 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-apalis-tk1-adjust-pin-muxing-for-v1.1-hw.patch @@ -0,0 +1,114 @@ +From 8c753a8354ae5927667b2a450eab2f49ceaac36b Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Tue, 22 Nov 2016 00:59:43 +0100 +Subject: [RESEND PATCH 4/6] apalis-tk1: adjust pin muxing for v1.1 hw + +Configure Apalis MMC1 D6 GPIO on SDMMC3_CLK_LB_IN as reserved function +without any pull-up/down. + +Configure GPIO_PV2 as SD1_CD# according to latest V1.1 HW. + +Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output driver enabled aka +not tristated and input driver enabled as well as it features some +magic properties even though the external loopback is disabled and the +internal loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 register's +SDMMC_SPARE1 bits being set to 0xfffd according to the TRM! This pin is +now a not-connect on V1.1 HW in order to avoid any interference. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis.dtsi | 53 +++++++++++++++------------------- + 1 file changed, 23 insertions(+), 30 deletions(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi +index 747ce81..2bfc579 100644 +--- a/arch/arm/boot/dts/tegra124-apalis.dtsi ++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi +@@ -414,18 +414,10 @@ + nvidia,tristate = ; + nvidia,enable-input = ; + }; +- /* +- * Don't use MMC1_D6 aka SDMMC3_CLK_LB_IN for now as it +- * features some magic properties even though the +- * external loopback is disabled and the internal +- * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 +- * register's SDMMC_SPARE1 bits being set to 0xfffd +- * according to the TRM! +- */ + sdmmc3_clk_lb_in_pee5 { /* D6 GPIO */ + nvidia,pins = "sdmmc3_clk_lb_in_pee5"; +- nvidia,function = "sdmmc3"; +- nvidia,pull = ; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; +@@ -520,20 +512,12 @@ + nvidia,tristate = ; + nvidia,enable-input = ; + }; +- /* +- * Don't use SD1_CD# aka SDMMC3_CLK_LB_OUT for now as it +- * features some magic properties even though the +- * external loopback is disabled and the internal +- * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 +- * register's SDMMC_SPARE1 bits being set to 0xfffd +- * according to the TRM! +- */ +- sdmmc3_clk_lb_out_pee4 { /* CD# GPIO */ +- nvidia,pins = "sdmmc3_clk_lb_out_pee4"; +- nvidia,function = "rsvd2"; +- nvidia,pull = ; ++ sdmmc3_cd_n_pv2 { /* CD# GPIO */ ++ nvidia,pins = "sdmmc3_cd_n_pv2"; ++ nvidia,function = "rsvd3"; ++ nvidia,pull = ; + nvidia,tristate = ; +- nvidia,enable-input = ; ++ nvidia,enable-input = ; + }; + + /* Apalis SPDIF */ +@@ -1512,13 +1496,6 @@ + nvidia,tristate = ; + nvidia,enable-input = ; + }; +- sdmmc3_cd_n_pv2 { /* NC */ +- nvidia,pins = "sdmmc3_cd_n_pv2"; +- nvidia,function = "rsvd3"; +- nvidia,pull = ; +- nvidia,tristate = ; +- nvidia,enable-input = ; +- }; + gpio_x1_aud_px1 { /* NC */ + nvidia,pins = "gpio_x1_aud_px1"; + nvidia,function = "rsvd2"; +@@ -1568,6 +1545,22 @@ + nvidia,tristate = ; + nvidia,enable-input = ; + }; ++ /* ++ * Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output ++ * driver enabled aka not tristated and input driver ++ * enabled as well as it features some magic properties ++ * even though the external loopback is disabled and the ++ * internal loopback used as per ++ * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 ++ * bits being set to 0xfffd according to the TRM! ++ */ ++ sdmmc3_clk_lb_out_pee4 { /* NC */ ++ nvidia,pins = "sdmmc3_clk_lb_out_pee4"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ }; + }; + }; + +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch new file mode 100644 index 0000000..9426107 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0004-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch @@ -0,0 +1,52 @@ +From 3012bd5c49b1f0ce750767194f76e556fbe7e6e6 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Thu, 15 Dec 2016 10:56:26 +0100 +Subject: [PATCH 4/4] mmc: tegra: apalis-tk1: hack to make sd1 functional + +Disable the external loopback and use the internal loopback as per +SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being set to +0xfffd according to the TRM. + +Signed-off-by: Marcel Ziswiler +Acked-by: Dominik Sliwa + +(cherry picked from toradex_tk1_l4t_r21.5 commit +fc14b7601e5ca587afd97936ef3fd599f4e9281c) + +--- + + drivers/mmc/host/sdhci-tegra.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c +index 20b6ff5..6c84334 100644 +--- a/drivers/mmc/host/sdhci-tegra.c ++++ b/drivers/mmc/host/sdhci-tegra.c +@@ -42,6 +42,7 @@ + #define SDHCI_MISC_CTRL_ENABLE_SDR50 0x10 + #define SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300 0x20 + #define SDHCI_MISC_CTRL_ENABLE_DDR50 0x200 ++#define SDHCI_MISC_CTRL_ENABLE_EXT_LOOPBACK 0x20000 + + #define SDHCI_TEGRA_AUTO_CAL_CONFIG 0x1e4 + #define SDHCI_AUTO_CAL_START BIT(31) +@@ -178,6 +179,16 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) + clk_ctrl |= SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE; + } + ++#define CONFIG_MACH_APALIS_TK1 ++#ifdef CONFIG_MACH_APALIS_TK1 ++ /* ++ * Disable the external loopback and use the internal loopback as per ++ * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being set to ++ * 0xfffd according to the TRM. ++ */ ++ misc_ctrl &= ~SDHCI_MISC_CTRL_ENABLE_EXT_LOOPBACK; ++#endif /* CONFIG_MACH_APALIS_TK1 */ ++ + sdhci_writel(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL); + sdhci_writel(host, clk_ctrl, SDHCI_TEGRA_VENDOR_CLOCK_CTRL); + +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0005-apalis-tk1-working-sd-card-detect-on-v1.1-hw.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0005-apalis-tk1-working-sd-card-detect-on-v1.1-hw.patch new file mode 100644 index 0000000..1a091dd --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0005-apalis-tk1-working-sd-card-detect-on-v1.1-hw.patch @@ -0,0 +1,37 @@ +From 042f3f04daed2a1163a5b35b47ab8c9a8e6bf29d Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Tue, 22 Nov 2016 01:00:50 +0100 +Subject: [RESEND PATCH 5/6] apalis-tk1: working sd card detect on v1.1 hw + +Add sd card detect SD1_CD# applicable for V1.1 modules using GPIO_PV2. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis-eval.dts | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts +index 2b5a0f3..2715692 100644 +--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts ++++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts +@@ -187,14 +187,8 @@ + /* Apalis SD1 */ + sdhci@700b0400 { + status = "okay"; +- /* +- * Don't use SD1_CD# aka SDMMC3_CLK_LB_OUT for now as it +- * features some magic properties even though the external +- * loopback is disabled and the internal loopback used as per +- * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being +- * set to 0xfffd according to the TRM! +- * cd-gpios = <&gpio TEGRA_GPIO(EE, 4) GPIO_ACTIVE_LOW>; +- */ ++ /* SD1_CD# */ ++ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; + bus-width = <4>; + vqmmc-supply = <&vddio_sdmmc3>; + }; +-- +2.9.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.9/0006-apalis-tk1-update-compatibility-comment.patch b/recipes-kernel/linux/linux-toradex-mainline-4.9/0006-apalis-tk1-update-compatibility-comment.patch new file mode 100644 index 0000000..71743aa --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-4.9/0006-apalis-tk1-update-compatibility-comment.patch @@ -0,0 +1,30 @@ +From e73b61059b07d263d76a887f0354cbdb108a47b8 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Thu, 24 Nov 2016 01:35:48 +0100 +Subject: [RESEND PATCH 6/6] apalis-tk1: update compatibility comment + +Now with the new V1.1A HW card detect being implemented update resp. +compatibility information. + +Signed-off-by: Marcel Ziswiler +--- + + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi +index 2bfc579..2276073 100644 +--- a/arch/arm/boot/dts/tegra124-apalis.dtsi ++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi +@@ -44,7 +44,7 @@ + + /* + * Toradex Apalis TK1 Module Device Tree +- * Compatible for Revisions 2GB: V1.0A ++ * Compatible for Revisions 2GB: V1.0A, V1.0B, V1.1A + */ + / { + model = "Toradex Apalis TK1"; +-- +2.9.3 + -- cgit v1.2.3