Skip to content

L
linux
Commit 5b8ea6bf authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'v5.3-rockchip-dts32-1' of... 

Merge tag 'v5.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

A lot more love for rk3288 in general and veyron specially with changes
all over the place.

* tag 'v5.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (21 commits)
  ARM: dts: rockchip: Split GPIO keys for veyron into multiple devices
  ARM: dts: rockchip: Add HDMI i2c unwedging for rk3288-veyron
  ARM: dts: rockchip: Add unwedge pinctrl entries for dw_hdmi on rk3288
  ARM: dts: rockchip: Switch to builtin HDMI DDC bus on rk3288-veyron
  ARM: dts: rockchip: Add pin names for rk3288-veyron jaq, mickey, speedy
  ARM: dts: rockchip: fix pwm-cells for rk3288's pwm3
  ARM: dts: rockchip: Configure the GPU thermal zone for mickey
  ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey
  ARM: dts: rockchip: remove GPU 500 MHz OPP on rk3288
  ARM: dts: rockchip: Use GPU as cooling device for the GPU thermal zone of the rk3288
  ARM: dts: rockchip: Add #cooling-cells entry for rk3288 GPU
  ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend
  ARM: dts: rockchip: Add pin names for rk3288-veyron-jerry
  ARM: dts: rockchip: Add pin names for rk3288-veyron-minnie
  ARM: dts: raise GPU trip point temperature for speedy to 80 degC
  ARM: dts: rockchip: raise GPU trip point temperatures for veyron
  ARM: dts: rockchip: raise CPU trip point temperature for veyron to 100 degC
  ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200
  ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again
  ARM: dts: rockchip: Remove bogus 'i2s_clk_out' from rk3288-veyron-mickey
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0763d0c2 b8925b7c
Hide whitespace changes
Inline Side-by-side
Showing with 1143 additions and 66 deletions
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
View file @ 5b8ea6bf
...@@ -70,6 +70,21 @@ gpio-charger { ...@@ -70,6 +70,21 @@ gpio-charger {
pinctrl-0 = <&ac_present_ap>; pinctrl-0 = <&ac_present_ap>;
}; };
lid_switch: lid-switch {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&ap_lid_int_l>;
lid {
label = "Lid";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <SW_LID>;
linux,input-type = <EV_SW>;
debounce-interval = <1>;
};
};
panel: panel { panel: panel {
compatible ="innolux,n116bge", "simple-panel"; compatible ="innolux,n116bge", "simple-panel";
status = "okay"; status = "okay";
...@@ -149,18 +164,6 @@ &edp_phy { ...@@ -149,18 +164,6 @@ &edp_phy {
status = "okay"; status = "okay";
}; };
&gpio_keys {
pinctrl-0 = <&pwr_key_l &ap_lid_int_l>;
lid {
label = "Lid";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <0>; /* SW_LID */
linux,input-type = <5>; /* EV_SW */
debounce-interval = <1>;
};
};
&pwm0 { &pwm0 {
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/rk3288-veyron-jaq.dts
View file @ 5b8ea6bf
...@@ -135,6 +135,213 @@ &vcc50_hdmi { ...@@ -135,6 +135,213 @@ &vcc50_hdmi {
pinctrl-0 = <&vcc50_hdmi_en>; 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 { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
......
arch/arm/boot/dts/rk3288-veyron-jerry.dts
View file @ 5b8ea6bf
...@@ -103,6 +103,213 @@ &vcc50_hdmi { ...@@ -103,6 +103,213 @@ &vcc50_hdmi {
pinctrl-0 = <&vcc50_hdmi_en>; 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",
"nFAULT2",
"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",
"",
"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",
"",
"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",
"",
"EDP_HPD",
"DVS1",
"nFAULT1",
"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 { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
......
arch/arm/boot/dts/rk3288-veyron-mickey.dts
View file @ 5b8ea6bf
...@@ -75,9 +75,7 @@ cpu_crit: cpu_crit { ...@@ -75,9 +75,7 @@ cpu_crit: cpu_crit {
cooling-maps { cooling-maps {
/* /*
* After 1st level, throttle the CPU down to as low as 1.4 GHz * After 1st level, throttle the CPU down to as low as 1.4 GHz
* and don't let the GPU go faster than 400 MHz. Note that we * and don't let the GPU go faster than 400 MHz.
* won't throttle the GPU lower than 400 MHz due to CPU
* heat--we'll let the GPU do the rest itself.
*/ */
cpu_warm_limit_cpu { cpu_warm_limit_cpu {
trip = <&cpu_alert_warm>; trip = <&cpu_alert_warm>;
...@@ -86,6 +84,10 @@ cpu_warm_limit_cpu { ...@@ -86,6 +84,10 @@ cpu_warm_limit_cpu {
<&cpu2 THERMAL_NO_LIMIT 4>, <&cpu2 THERMAL_NO_LIMIT 4>,
<&cpu3 THERMAL_NO_LIMIT 4>; <&cpu3 THERMAL_NO_LIMIT 4>;
}; };
cpu_warm_limit_gpu {
trip = <&cpu_alert_warm>;
cooling-device = <&gpu 1 1>;
};
/* /*
* Add some discrete steps to help throttling system deal * Add some discrete steps to help throttling system deal
...@@ -125,11 +127,80 @@ cpu_very_hot_limit_cpu { ...@@ -125,11 +127,80 @@ cpu_very_hot_limit_cpu {
<&cpu2 8 THERMAL_NO_LIMIT>, <&cpu2 8 THERMAL_NO_LIMIT>,
<&cpu3 8 THERMAL_NO_LIMIT>; <&cpu3 8 THERMAL_NO_LIMIT>;
}; };
/* At very hot, don't let GPU go over 300 MHz */
cpu_very_hot_limit_gpu {
trip = <&cpu_alert_very_hot>;
cooling-device = <&gpu 2 2>;
};
}; };
}; };
&emmc { &gpu_thermal {
/delete-property/mmc-hs200-1_8v; /delete-node/ trips;
/delete-node/ cooling-maps;
trips {
gpu_alert_warmish: gpu_alert_warmish {
temperature = <60000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
gpu_alert_warm: gpu_alert_warm {
temperature = <65000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
gpu_alert_hotter: gpu_alert_hotter {
temperature = <84000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
gpu_alert_very_very_hot: gpu_alert_very_very_hot {
temperature = <86000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
gpu_crit: gpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
/* After 1st level throttle the GPU down to as low as 400 MHz */
gpu_warmish_limit_gpu {
trip = <&gpu_alert_warmish>;
cooling-device = <&gpu THERMAL_NO_LIMIT 1>;
};
/*
* Slightly after we throttle the GPU, we'll also make sure that
* the CPU can't go faster than 1.4 GHz. Note that we won't
* throttle the CPU lower than 1.4 GHz due to GPU heat--we'll
* let the CPU do the rest itself.
*/
gpu_warm_limit_cpu {
trip = <&gpu_alert_warm>;
cooling-device = <&cpu0 4 4>,
<&cpu1 4 4>,
<&cpu2 4 4>,
<&cpu3 4 4>;
};
/* When hot, GPU goes down to 300 MHz */
gpu_hotter_limit_gpu {
trip = <&gpu_alert_hotter>;
cooling-device = <&gpu 2 2>;
};
/* When really hot, don't let GPU go _above_ 300 MHz */
gpu_very_very_hot_limit_gpu {
trip = <&gpu_alert_very_very_hot>;
cooling-device = <&gpu 2 THERMAL_NO_LIMIT>;
};
};
}; };
&i2c2 { &i2c2 {
...@@ -142,8 +213,6 @@ &i2c4 { ...@@ -142,8 +213,6 @@ &i2c4 {
&i2s { &i2s {
status = "okay"; status = "okay";
clock-names = "i2s_hclk", "i2s_clk", "i2s_clk_out";
clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
}; };
&rk808 { &rk808 {
...@@ -183,6 +252,157 @@ vcc18_lcd: LDO_REG8 { ...@@ -183,6 +252,157 @@ vcc18_lcd: LDO_REG8 {
}; };
}; };
&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 { &pinctrl {
hdmi { hdmi {
power_hdmi_on: power-hdmi-on { power_hdmi_on: power-hdmi-on {
......
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View file @ 5b8ea6bf
...@@ -48,6 +48,26 @@ vcc18_lcd: vcc18-lcd { ...@@ -48,6 +48,26 @@ vcc18_lcd: vcc18-lcd {
regulator-boot-on; regulator-boot-on;
vin-supply = <&vcc18_wl>; vin-supply = <&vcc18_wl>;
}; };
volume_buttons: volume-buttons {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&volum_down_l &volum_up_l>;
volum_down {
label = "Volum_down";
gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>;
};
volum_up {
label = "Volum_up";
gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <100>;
};
};
}; };
&backlight { &backlight {
...@@ -90,28 +110,6 @@ &backlight { ...@@ -90,28 +110,6 @@ &backlight {
pwm-off-delay-ms = <200>; pwm-off-delay-ms = <200>;
}; };
&emmc {
/delete-property/mmc-hs200-1_8v;
};
&gpio_keys {
pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;
volum_down {
label = "Volum_down";
gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>;
};
volum_up {
label = "Volum_up";
gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <100>;
};
};
&i2c_tunnel { &i2c_tunnel {
battery: bq27500@55 { battery: bq27500@55 {
compatible = "ti,bq27500"; compatible = "ti,bq27500";
...@@ -188,6 +186,218 @@ &vcc50_hdmi { ...@@ -188,6 +186,218 @@ &vcc50_hdmi {
pinctrl-0 = <&vcc50_hdmi_en>; 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",
"PROCHOT#",
"EMMC_RST_L",
"",
"",
"BL_PWR_EN",
"AVDD_1V8_DISP_EN",
"TOUCH_INT",
"TOUCH_RST",
"I2C3_SCL_TP",
"I2C3_SDA_TP";
};
&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",
"dev_wake",
"",
"WIFI_ENABLE_H",
"BT_ENABLE_L",
"WIFI_HOST_WAKE",
"BT_HOST_WAKE";
};
&gpio5 {
gpio-line-names = "",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"Volum_Up#",
"Volum_Down#",
"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",
"",
"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",
"SDMMC_WP",
"EDP_HPD",
"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 { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
......
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View file @ 5b8ea6bf
...@@ -35,7 +35,7 @@ &edp { ...@@ -35,7 +35,7 @@ &edp {
force-hpd; force-hpd;
}; };
&gpio_keys { &lid_switch {
pinctrl-0 = <&pwr_key_h &ap_lid_int_l>; pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;
power { power {
......
arch/arm/boot/dts/rk3288-veyron-speedy.dts
View file @ 5b8ea6bf
...@@ -64,6 +64,10 @@ &cpu_alert1 { ...@@ -64,6 +64,10 @@ &cpu_alert1 {
temperature = <70000>; temperature = <70000>;
}; };
&cpu_crit {
temperature = <90000>;
};
&edp { &edp {
/delete-property/pinctrl-names; /delete-property/pinctrl-names;
/delete-property/pinctrl-0; /delete-property/pinctrl-0;
...@@ -71,6 +75,14 @@ &edp { ...@@ -71,6 +75,14 @@ &edp {
force-hpd; force-hpd;
}; };
&gpu_alert0 {
temperature = <80000>;
};
&gpu_crit {
temperature = <90000>;
};
&panel { &panel {
power-supply= <&panel_regulator>; power-supply= <&panel_regulator>;
}; };
...@@ -101,6 +113,213 @@ &vcc50_hdmi { ...@@ -101,6 +113,213 @@ &vcc50_hdmi {
pinctrl-0 = <&vcc50_hdmi_en>; 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 { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
......
arch/arm/boot/dts/rk3288-veyron.dtsi
View file @ 5b8ea6bf
...@@ -23,11 +23,11 @@ memory { ...@@ -23,11 +23,11 @@ memory {
reg = <0x0 0x0 0x0 0x80000000>; reg = <0x0 0x0 0x0 0x80000000>;
}; };
gpio_keys: gpio-keys { power_button: power-button {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwr_key_l>; pinctrl-0 = <&pwr_key_l>;
power { power {
label = "Power"; label = "Power";
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
...@@ -123,6 +123,10 @@ &cpu0 { ...@@ -123,6 +123,10 @@ &cpu0 {
cpu0-supply = <&vdd_cpu>; cpu0-supply = <&vdd_cpu>;
}; };
&cpu_crit {
temperature = <100000>;
};
/* rk3288-c used in Veyron Chrome-devices has slightly changed OPPs */ /* rk3288-c used in Veyron Chrome-devices has slightly changed OPPs */
&cpu_opp_table { &cpu_opp_table {
/delete-node/ opp-312000000; /delete-node/ opp-312000000;
...@@ -162,8 +166,18 @@ &gpu { ...@@ -162,8 +166,18 @@ &gpu {
status = "okay"; status = "okay";
}; };
&gpu_alert0 {
temperature = <72500>;
};
&gpu_crit {
temperature = <100000>;
};
&hdmi { &hdmi {
ddc-i2c-bus = <&i2c5>; pinctrl-names = "default", "unwedge";
pinctrl-0 = <&hdmi_ddc>;
pinctrl-1 = <&hdmi_ddc_unwedge>;
status = "okay"; status = "okay";
}; };
...@@ -334,14 +348,6 @@ &i2c4 { ...@@ -334,14 +348,6 @@ &i2c4 {
i2c-scl-rising-time-ns = <300>; /* 225ns measured */ i2c-scl-rising-time-ns = <300>; /* 225ns measured */
}; };
&i2c5 {
status = "okay";
clock-frequency = <100000>;
i2c-scl-falling-time-ns = <300>;
i2c-scl-rising-time-ns = <1000>;
};
&io_domains { &io_domains {
status = "okay"; status = "okay";
...@@ -394,6 +400,7 @@ &tsadc { ...@@ -394,6 +400,7 @@ &tsadc {
rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
rockchip,hw-tshut-temp = <125000>;
}; };
&uart0 { &uart0 {
......
arch/arm/boot/dts/rk3288.dtsi
View file @ 5b8ea6bf
...@@ -231,6 +231,7 @@ timer { ...@@ -231,6 +231,7 @@ timer {
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
clock-frequency = <24000000>; clock-frequency = <24000000>;
arm,no-tick-in-suspend;
}; };
timer: timer@ff810000 { timer: timer@ff810000 {
...@@ -551,10 +552,7 @@ cooling-maps { ...@@ -551,10 +552,7 @@ cooling-maps {
map0 { map0 {
trip = <&gpu_alert0>; trip = <&gpu_alert0>;
cooling-device = cooling-device =
<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
}; };
}; };
}; };
...@@ -682,7 +680,7 @@ pwm0: pwm@ff680000 { ...@@ -682,7 +680,7 @@ pwm0: pwm@ff680000 {
#pwm-cells = <3>; #pwm-cells = <3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
clocks = <&cru PCLK_PWM>; clocks = <&cru PCLK_RKPWM>;
clock-names = "pwm"; clock-names = "pwm";
status = "disabled"; status = "disabled";
}; };
...@@ -693,7 +691,7 @@ pwm1: pwm@ff680010 { ...@@ -693,7 +691,7 @@ pwm1: pwm@ff680010 {
#pwm-cells = <3>; #pwm-cells = <3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm1_pin>; pinctrl-0 = <&pwm1_pin>;
clocks = <&cru PCLK_PWM>; clocks = <&cru PCLK_RKPWM>;
clock-names = "pwm"; clock-names = "pwm";
status = "disabled"; status = "disabled";
}; };
...@@ -704,7 +702,7 @@ pwm2: pwm@ff680020 { ...@@ -704,7 +702,7 @@ pwm2: pwm@ff680020 {
#pwm-cells = <3>; #pwm-cells = <3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm2_pin>; pinctrl-0 = <&pwm2_pin>;
clocks = <&cru PCLK_PWM>; clocks = <&cru PCLK_RKPWM>;
clock-names = "pwm"; clock-names = "pwm";
status = "disabled"; status = "disabled";
}; };
...@@ -712,10 +710,10 @@ pwm2: pwm@ff680020 { ...@@ -712,10 +710,10 @@ pwm2: pwm@ff680020 {
pwm3: pwm@ff680030 { pwm3: pwm@ff680030 {
compatible = "rockchip,rk3288-pwm"; compatible = "rockchip,rk3288-pwm";
reg = <0x0 0xff680030 0x0 0x10>; reg = <0x0 0xff680030 0x0 0x10>;
#pwm-cells = <2>; #pwm-cells = <3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm3_pin>; pinctrl-0 = <&pwm3_pin>;
clocks = <&cru PCLK_PWM>; clocks = <&cru PCLK_RKPWM>;
clock-names = "pwm"; clock-names = "pwm";
status = "disabled"; status = "disabled";
}; };
...@@ -1285,6 +1283,7 @@ gpu: gpu@ffa30000 { ...@@ -1285,6 +1283,7 @@ gpu: gpu@ffa30000 {
interrupt-names = "job", "mmu", "gpu"; interrupt-names = "job", "mmu", "gpu";
clocks = <&cru ACLK_GPU>; clocks = <&cru ACLK_GPU>;
operating-points-v2 = <&gpu_opp_table>; operating-points-v2 = <&gpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */
power-domains = <&power RK3288_PD_GPU>; power-domains = <&power RK3288_PD_GPU>;
status = "disabled"; status = "disabled";
}; };
...@@ -1308,10 +1307,6 @@ opp-400000000 { ...@@ -1308,10 +1307,6 @@ opp-400000000 {
opp-hz = /bits/ 64 <400000000>; opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <1100000>; opp-microvolt = <1100000>;
}; };
opp-500000000 {
opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <1200000>;
};
opp-600000000 { opp-600000000 {
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1250000>; opp-microvolt = <1250000>;
...@@ -1552,6 +1547,15 @@ hdmi_ddc: hdmi-ddc { ...@@ -1552,6 +1547,15 @@ hdmi_ddc: hdmi-ddc {
rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>, rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>,
<7 RK_PC4 2 &pcfg_pull_none>; <7 RK_PC4 2 &pcfg_pull_none>;
}; };
hdmi_ddc_unwedge: hdmi-ddc-unwedge {
rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO &pcfg_output_low>,
<7 RK_PC4 2 &pcfg_pull_none>;
};
};
pcfg_output_low: pcfg-output-low {
output-low;
}; };
pcfg_pull_up: pcfg-pull-up { pcfg_pull_up: pcfg-pull-up {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7