1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
638 lines
11 KiB
Diff
638 lines
11 KiB
Diff
From d85b2ad35a2ab320b9c0530992ee532f10a6aeb2 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Anderson <dianders@chromium.org>
|
|
Date: Fri, 24 May 2019 16:33:09 -0700
|
|
Subject: [PATCH 44/54] ARM: dts: rockchip: Add pin names for rk3288-veyron
|
|
jaq, mickey, speedy
|
|
|
|
This is like commit 0ca87bd5baa6 ("ARM: dts: rockchip: Add pin names
|
|
for rk3288-veyron-jerry") and commit ca3516b32cd9 ("ARM: dts:
|
|
rockchip: Add pin names for rk3288-veyron-minnie") but for 3 more
|
|
veyron boards.
|
|
|
|
A few notes:
|
|
- While there is most certainly duplication between all the veyron
|
|
boards, it still feels like it is sane to just have each board have
|
|
a full list of its pin names. The format of "gpio-line-names" does
|
|
not lend itself to one-off overriding and besides it seems sane to
|
|
more fully match schematic names. Also note that the extra
|
|
duplication here is only in source code and is unlikely to ever
|
|
change (since these boards are shipped). Duplication in the .dtb
|
|
files is unavoidable.
|
|
- veyron-jaq and veyron-mighty are very closely related and so I have
|
|
shared a single list for them both with comments on how they are
|
|
different. This is just a typo fix on one of the boards, a possible
|
|
missing signal on one of the boards (or perhaps I was never given
|
|
the most recent schematics?) and dealing with the fact that one of
|
|
the two boards has full sized SD.
|
|
|
|
Signed-off-by: Douglas Anderson <dianders@chromium.org>
|
|
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3288-veyron-jaq.dts | 207 +++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/rk3288-veyron-mickey.dts | 151 +++++++++++++++++++++
|
|
arch/arm/boot/dts/rk3288-veyron-speedy.dts | 207 +++++++++++++++++++++++++++++
|
|
3 files changed, 565 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts
|
|
index e248f55ee8d2..fcd119168cb6 100644
|
|
--- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts
|
|
@@ -135,6 +135,213 @@
|
|
pinctrl-0 = <&vcc50_hdmi_en>;
|
|
};
|
|
|
|
+&gpio0 {
|
|
+ gpio-line-names = "PMIC_SLEEP_AP",
|
|
+ "DDRIO_PWROFF",
|
|
+ "DDRIO_RETEN",
|
|
+ "TS3A227E_INT_L",
|
|
+ "PMIC_INT_L",
|
|
+ "PWR_KEY_L",
|
|
+ "AP_LID_INT_L",
|
|
+ "EC_IN_RW",
|
|
+
|
|
+ "AC_PRESENT_AP",
|
|
+ /*
|
|
+ * RECOVERY_SW_L is Chrome OS ABI. Schematics call
|
|
+ * it REC_MODE_L.
|
|
+ */
|
|
+ "RECOVERY_SW_L",
|
|
+ "OTP_OUT",
|
|
+ "HOST1_PWR_EN",
|
|
+ "USBOTG_PWREN_H",
|
|
+ "AP_WARM_RESET_H",
|
|
+ "nFALUT2",
|
|
+ "I2C0_SDA_PMIC",
|
|
+
|
|
+ "I2C0_SCL_PMIC",
|
|
+ "SUSPEND_L",
|
|
+ "USB_INT";
|
|
+};
|
|
+
|
|
+&gpio2 {
|
|
+ gpio-line-names = "CONFIG0",
|
|
+ "CONFIG1",
|
|
+ "CONFIG2",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "CONFIG3",
|
|
+
|
|
+ "",
|
|
+ "EMMC_RST_L",
|
|
+ "",
|
|
+ "",
|
|
+ "BL_PWR_EN",
|
|
+ "AVDD_1V8_DISP_EN";
|
|
+};
|
|
+
|
|
+&gpio3 {
|
|
+ gpio-line-names = "FLASH0_D0",
|
|
+ "FLASH0_D1",
|
|
+ "FLASH0_D2",
|
|
+ "FLASH0_D3",
|
|
+ "FLASH0_D4",
|
|
+ "FLASH0_D5",
|
|
+ "FLASH0_D6",
|
|
+ "FLASH0_D7",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "FLASH0_CS2/EMMC_CMD",
|
|
+ "",
|
|
+ "FLASH0_DQS/EMMC_CLKO";
|
|
+};
|
|
+
|
|
+&gpio4 {
|
|
+ gpio-line-names = "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "UART0_RXD",
|
|
+ "UART0_TXD",
|
|
+ "UART0_CTS",
|
|
+ "UART0_RTS",
|
|
+ "SDIO0_D0",
|
|
+ "SDIO0_D1",
|
|
+ "SDIO0_D2",
|
|
+ "SDIO0_D3",
|
|
+
|
|
+ "SDIO0_CMD",
|
|
+ "SDIO0_CLK",
|
|
+ "BT_DEV_WAKE", /* Maybe missing from mighty? */
|
|
+ "",
|
|
+ "WIFI_ENABLE_H",
|
|
+ "BT_ENABLE_L",
|
|
+ "WIFI_HOST_WAKE",
|
|
+ "BT_HOST_WAKE";
|
|
+};
|
|
+
|
|
+&gpio5 {
|
|
+ gpio-line-names = "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "SPI0_CLK",
|
|
+ "SPI0_CS0",
|
|
+ "SPI0_TXD",
|
|
+ "SPI0_RXD",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "VCC50_HDMI_EN";
|
|
+};
|
|
+
|
|
+&gpio6 {
|
|
+ gpio-line-names = "I2S0_SCLK",
|
|
+ "I2S0_LRCK_RX",
|
|
+ "I2S0_LRCK_TX",
|
|
+ "I2S0_SDI",
|
|
+ "I2S0_SDO0",
|
|
+ "HP_DET_H",
|
|
+ "ALS_INT",
|
|
+ "INT_CODEC",
|
|
+
|
|
+ "I2S0_CLK",
|
|
+ "I2C2_SDA",
|
|
+ "I2C2_SCL",
|
|
+ "MICDET",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "SDMMC_D0",
|
|
+ "SDMMC_D1",
|
|
+ "SDMMC_D2",
|
|
+ "SDMMC_D3",
|
|
+ "SDMMC_CLK",
|
|
+ "SDMMC_CMD";
|
|
+};
|
|
+
|
|
+&gpio7 {
|
|
+ gpio-line-names = "LCDC_BL",
|
|
+ "PWM_LOG",
|
|
+ "BL_EN",
|
|
+ "TRACKPAD_INT",
|
|
+ "TPM_INT_H",
|
|
+ "SDMMC_DET_L",
|
|
+ /*
|
|
+ * AP_FLASH_WP_L is Chrome OS ABI. Schematics call
|
|
+ * it FW_WP_AP.
|
|
+ */
|
|
+ "AP_FLASH_WP_L",
|
|
+ "EC_INT",
|
|
+
|
|
+ "CPU_NMI",
|
|
+ "DVSOK",
|
|
+ "SDMMC_WP", /* mighty only */
|
|
+ "EDP_HPD",
|
|
+ "DVS1",
|
|
+ "nFALUT1", /* nFAULT1 on jaq */
|
|
+ "LCD_EN",
|
|
+ "DVS2",
|
|
+
|
|
+ "VCC5V_GOOD_H",
|
|
+ "I2C4_SDA_TP",
|
|
+ "I2C4_SCL_TP",
|
|
+ "I2C5_SDA_HDMI",
|
|
+ "I2C5_SCL_HDMI",
|
|
+ "5V_DRV",
|
|
+ "UART2_RXD",
|
|
+ "UART2_TXD";
|
|
+};
|
|
+
|
|
+&gpio8 {
|
|
+ gpio-line-names = "RAM_ID0",
|
|
+ "RAM_ID1",
|
|
+ "RAM_ID2",
|
|
+ "RAM_ID3",
|
|
+ "I2C1_SDA_TPM",
|
|
+ "I2C1_SCL_TPM",
|
|
+ "SPI2_CLK",
|
|
+ "SPI2_CS0",
|
|
+
|
|
+ "SPI2_RXD",
|
|
+ "SPI2_TXD";
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
backlight {
|
|
bl_pwr_en: bl_pwr_en {
|
|
diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
index 945e80801292..aa352d40c991 100644
|
|
--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
|
|
@@ -252,6 +252,157 @@
|
|
};
|
|
};
|
|
|
|
+&gpio0 {
|
|
+ gpio-line-names = "PMIC_SLEEP_AP",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "PMIC_INT_L",
|
|
+ "POWER_BUTTON_L",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ /*
|
|
+ * RECOVERY_SW_L is Chrome OS ABI. Schematics call
|
|
+ * it REC_MODE_L.
|
|
+ */
|
|
+ "RECOVERY_SW_L",
|
|
+ "OT_RESET",
|
|
+ "",
|
|
+ "",
|
|
+ "AP_WARM_RESET_H",
|
|
+ "",
|
|
+ "I2C0_SDA_PMIC",
|
|
+
|
|
+ "I2C0_SCL_PMIC",
|
|
+ "",
|
|
+ "nFALUT";
|
|
+};
|
|
+
|
|
+&gpio2 {
|
|
+ gpio-line-names = "CONFIG0",
|
|
+ "CONFIG1",
|
|
+ "CONFIG2",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "CONFIG3",
|
|
+
|
|
+ "",
|
|
+ "EMMC_RST_L";
|
|
+};
|
|
+
|
|
+&gpio3 {
|
|
+ gpio-line-names = "FLASH0_D0",
|
|
+ "FLASH0_D1",
|
|
+ "FLASH0_D2",
|
|
+ "FLASH0_D3",
|
|
+ "FLASH0_D4",
|
|
+ "FLASH0_D5",
|
|
+ "FLASH0_D6",
|
|
+ "FLASH0_D7",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "FLASH0_CS2/EMMC_CMD",
|
|
+ "",
|
|
+ "FLASH0_DQS/EMMC_CLKO";
|
|
+};
|
|
+
|
|
+&gpio4 {
|
|
+ gpio-line-names = "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "UART0_RXD",
|
|
+ "UART0_TXD",
|
|
+ "UART0_CTS_L",
|
|
+ "UART0_RTS_L",
|
|
+ "SDIO0_D0",
|
|
+ "SDIO0_D1",
|
|
+ "SDIO0_D2",
|
|
+ "SDIO0_D3",
|
|
+
|
|
+ "SDIO0_CMD",
|
|
+ "SDIO0_CLK",
|
|
+ "BT_DEV_WAKE",
|
|
+ "",
|
|
+ "WIFI_ENABLE_H",
|
|
+ "BT_ENABLE_L",
|
|
+ "WIFI_HOST_WAKE",
|
|
+ "BT_HOST_WAKE";
|
|
+};
|
|
+
|
|
+&gpio7 {
|
|
+ gpio-line-names = "",
|
|
+ "PWM_LOG",
|
|
+ "",
|
|
+ "",
|
|
+ "TPM_INT_H",
|
|
+ "SDMMC_DET_L",
|
|
+ /*
|
|
+ * AP_FLASH_WP_L is Chrome OS ABI. Schematics call
|
|
+ * it FW_WP_AP.
|
|
+ */
|
|
+ "AP_FLASH_WP_L",
|
|
+ "",
|
|
+
|
|
+ "CPU_NMI",
|
|
+ "DVSOK",
|
|
+ "HDMI_WAKE",
|
|
+ "POWER_HDMI_ON",
|
|
+ "DVS1",
|
|
+ "",
|
|
+ "",
|
|
+ "DVS2",
|
|
+
|
|
+ "HDMI_CEC",
|
|
+ "",
|
|
+ "",
|
|
+ "I2C5_SDA_HDMI",
|
|
+ "I2C5_SCL_HDMI",
|
|
+ "",
|
|
+ "UART2_RXD",
|
|
+ "UART2_TXD";
|
|
+};
|
|
+
|
|
+&gpio8 {
|
|
+ gpio-line-names = "RAM_ID0",
|
|
+ "RAM_ID1",
|
|
+ "RAM_ID2",
|
|
+ "RAM_ID3",
|
|
+ "I2C1_SDA_TPM",
|
|
+ "I2C1_SCL_TPM",
|
|
+ "SPI2_CLK",
|
|
+ "SPI2_CS0",
|
|
+
|
|
+ "SPI2_RXD",
|
|
+ "SPI2_TXD";
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
hdmi {
|
|
power_hdmi_on: power-hdmi-on {
|
|
diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts
|
|
index 9a87017347ea..9b140db04456 100644
|
|
--- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts
|
|
@@ -113,6 +113,213 @@
|
|
pinctrl-0 = <&vcc50_hdmi_en>;
|
|
};
|
|
|
|
+&gpio0 {
|
|
+ gpio-line-names = "PMIC_SLEEP_AP",
|
|
+ "DDRIO_PWROFF",
|
|
+ "DDRIO_RETEN",
|
|
+ "TS3A227E_INT_L",
|
|
+ "PMIC_INT_L",
|
|
+ "PWR_KEY_L",
|
|
+ "AP_LID_INT_L",
|
|
+ "EC_IN_RW",
|
|
+
|
|
+ "AC_PRESENT_AP",
|
|
+ /*
|
|
+ * RECOVERY_SW_L is Chrome OS ABI. Schematics call
|
|
+ * it REC_MODE_L.
|
|
+ */
|
|
+ "RECOVERY_SW_L",
|
|
+ "OTP_OUT",
|
|
+ "HOST1_PWR_EN",
|
|
+ "USBOTG_PWREN_H",
|
|
+ "AP_WARM_RESET_H",
|
|
+ "nFALUT2",
|
|
+ "I2C0_SDA_PMIC",
|
|
+
|
|
+ "I2C0_SCL_PMIC",
|
|
+ "SUSPEND_L",
|
|
+ "USB_INT";
|
|
+};
|
|
+
|
|
+&gpio2 {
|
|
+ gpio-line-names = "CONFIG0",
|
|
+ "CONFIG1",
|
|
+ "CONFIG2",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "CONFIG3",
|
|
+
|
|
+ "PWRLIMIT#_CPU",
|
|
+ "EMMC_RST_L",
|
|
+ "",
|
|
+ "",
|
|
+ "BL_PWR_EN",
|
|
+ "AVDD_1V8_DISP_EN";
|
|
+};
|
|
+
|
|
+&gpio3 {
|
|
+ gpio-line-names = "FLASH0_D0",
|
|
+ "FLASH0_D1",
|
|
+ "FLASH0_D2",
|
|
+ "FLASH0_D3",
|
|
+ "FLASH0_D4",
|
|
+ "FLASH0_D5",
|
|
+ "FLASH0_D6",
|
|
+ "FLASH0_D7",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "FLASH0_CS2/EMMC_CMD",
|
|
+ "",
|
|
+ "FLASH0_DQS/EMMC_CLKO";
|
|
+};
|
|
+
|
|
+&gpio4 {
|
|
+ gpio-line-names = "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "UART0_RXD",
|
|
+ "UART0_TXD",
|
|
+ "UART0_CTS",
|
|
+ "UART0_RTS",
|
|
+ "SDIO0_D0",
|
|
+ "SDIO0_D1",
|
|
+ "SDIO0_D2",
|
|
+ "SDIO0_D3",
|
|
+
|
|
+ "SDIO0_CMD",
|
|
+ "SDIO0_CLK",
|
|
+ "BT_DEV_WAKE",
|
|
+ "",
|
|
+ "WIFI_ENABLE_H",
|
|
+ "BT_ENABLE_L",
|
|
+ "WIFI_HOST_WAKE",
|
|
+ "BT_HOST_WAKE";
|
|
+};
|
|
+
|
|
+&gpio5 {
|
|
+ gpio-line-names = "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "SPI0_CLK",
|
|
+ "SPI0_CS0",
|
|
+ "SPI0_TXD",
|
|
+ "SPI0_RXD",
|
|
+
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "VCC50_HDMI_EN";
|
|
+};
|
|
+
|
|
+&gpio6 {
|
|
+ gpio-line-names = "I2S0_SCLK",
|
|
+ "I2S0_LRCK_RX",
|
|
+ "I2S0_LRCK_TX",
|
|
+ "I2S0_SDI",
|
|
+ "I2S0_SDO0",
|
|
+ "HP_DET_H",
|
|
+ "ALS_INT", /* not connected */
|
|
+ "INT_CODEC",
|
|
+
|
|
+ "I2S0_CLK",
|
|
+ "I2C2_SDA",
|
|
+ "I2C2_SCL",
|
|
+ "MICDET",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+ "",
|
|
+
|
|
+ "SDMMC_D0",
|
|
+ "SDMMC_D1",
|
|
+ "SDMMC_D2",
|
|
+ "SDMMC_D3",
|
|
+ "SDMMC_CLK",
|
|
+ "SDMMC_CMD";
|
|
+};
|
|
+
|
|
+&gpio7 {
|
|
+ gpio-line-names = "LCDC_BL",
|
|
+ "PWM_LOG",
|
|
+ "BL_EN",
|
|
+ "TRACKPAD_INT",
|
|
+ "TPM_INT_H",
|
|
+ "SDMMC_DET_L",
|
|
+ /*
|
|
+ * AP_FLASH_WP_L is Chrome OS ABI. Schematics call
|
|
+ * it FW_WP_AP.
|
|
+ */
|
|
+ "AP_FLASH_WP_L",
|
|
+ "EC_INT",
|
|
+
|
|
+ "CPU_NMI",
|
|
+ "DVS_OK",
|
|
+ "",
|
|
+ "EDP_HOTPLUG",
|
|
+ "DVS1",
|
|
+ "nFALUT1",
|
|
+ "LCD_EN",
|
|
+ "DVS2",
|
|
+
|
|
+ "VCC5V_GOOD_H",
|
|
+ "I2C4_SDA_TP",
|
|
+ "I2C4_SCL_TP",
|
|
+ "I2C5_SDA_HDMI",
|
|
+ "I2C5_SCL_HDMI",
|
|
+ "5V_DRV",
|
|
+ "UART2_RXD",
|
|
+ "UART2_TXD";
|
|
+};
|
|
+
|
|
+&gpio8 {
|
|
+ gpio-line-names = "RAM_ID0",
|
|
+ "RAM_ID1",
|
|
+ "RAM_ID2",
|
|
+ "RAM_ID3",
|
|
+ "I2C1_SDA_TPM",
|
|
+ "I2C1_SCL_TPM",
|
|
+ "SPI2_CLK",
|
|
+ "SPI2_CS0",
|
|
+
|
|
+ "SPI2_RXD",
|
|
+ "SPI2_TXD";
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
backlight {
|
|
bl_pwr_en: bl_pwr_en {
|
|
--
|
|
2.11.0
|
|
|