openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: Amlogic updates for v5.2 

- add GPIO line names for odroid-c1 boards
  - support internal clock measure driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAlyei6kACgkQWTcYmtP7
 xmUPmQ/5AVzjBJYyAzR2nrw7j1paKMG1LdofxGUqzPEuteG0EOzbQePvVVUqQbaU
 LFU6SkZEhOnb1pUIQh5dQjbmsbZoh44aT+XJof/0kKUqrJzlVgsy3kRzt3SMzPsq
 c4qRxQ/o1Or6x79UTzCfiZ2CwFyK6UDXBwI5yh6HsnLS9JpKg2B+nBgWEUiY+f2S
 okQdmT3CUXU7q0fo772rktriwZ6Hk0ICQL4hc3l6jHqea1B7EWsj0BU2FrJlf4mQ
 e75HykJLkSSPLs9Duw+kHKOtAV6OfSMjfqMJTAiHRytVdLk8lCRlfTzfDx2Jy0AO
 Y3Skv4bKBOdxH9a1wmGKiXYsYe4DsOVskEqcPIRosEUYa4HGurWvCPGL/b0Gk447
 d6Wzg1riBCAukkB2ac+04WhulVHmEAbytOapFj31Ut78mIbOjS+WpyI/2d+llhDa
 E6y/VuR0x/RpxS9IVd8WElfIxGZ5WYrc7RlA7XSv4PMnrAeQrzmlCfdj5DGHGE5u
 escQpQwvyu+56DCWmuQHYFYC1u3TFq1k96bnOompWHYRLQl/YmTzJybOMzaNAj2C
 Pjr4qlZ7XwixFriDZi16VxhKoJbOrgqnjFa/WQTlwsPLEKxelgKF9VWHv7Aov0YI
 jufkovEc7BCwCRqp1fjm/wfM+XsyHrYTgd1fibvjPeQeuIdnGOk=
 =7/hU
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

ARM: dts: Amlogic updates for v5.2
 - add GPIO line names for odroid-c1 boards
 - support internal clock measure driver

* tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson8b: odroidc1: add the GPIO line names
  ARM: dts: meson8b: add the internal clock measurer
  ARM: dts: meson8: add the internal clock measurer

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 12:14:29 -07:00
parent 0159225bc9 07f9da2900
commit 1c93235a6d
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/meson8.dtsi
View File

@ -345,6 +345,11 @@ pwm_ef: pwm@86c0 {
status = "disabled";
};
clock-measure@8758 {
compatible = "amlogic,meson8-clk-measure";
reg = <0x8758 0x1c>;
};
pinctrl_cbus: pinctrl@9880 {
compatible = "amlogic,meson8-cbus-pinctrl";
reg = <0x9880 0x10>;

52
arch/arm/boot/dts/meson8b-odroidc1.dts
View File

@ -234,7 +234,59 @@ eth_phy: ethernet-phy@0 {
};
};
&gpio {
gpio-line-names = /* Bank GPIOX */
"J2 Header Pin 35", "J2 Header Pin 36",
"J2 Header Pin 32", "J2 Header Pin 31",
"J2 Header Pin 29", "J2 Header Pin 18",
"J2 Header Pin 22", "J2 Header Pin 16",
"J2 Header Pin 23", "J2 Header Pin 21",
"J2 Header Pin 19", "J2 Header Pin 33",
"J2 Header Pin 8", "J2 Header Pin 10",
"J2 Header Pin 15", "J2 Header Pin 13",
"J2 Header Pin 24", "J2 Header Pin 26",
/* Bank GPIOY */
"Revision (upper)", "Revision (lower)",
"J2 Header Pin 7", "", "J2 Header Pin 12",
"J2 Header Pin 11", "", "", "",
"TFLASH_VDD_EN", "", "",
/* Bank GPIODV */
"VCCK_PWM (PWM_C)", "I2CA_SDA", "I2CA_SCL",
"I2CB_SDA", "I2CB_SCL", "VDDEE_PWM (PWM_D)",
"",
/* Bank GPIOH */
"HDMI_HPD", "HDMI_I2C_SDA", "HDMI_I2C_SCL",
"ETH_PHY_INTR", "ETH_PHY_NRST", "ETH_TXD1",
"ETH_TXD0", "ETH_TXD3", "ETH_TXD2",
"ETH_RGMII_TX_CLK",
/* Bank CARD */
"SD_DATA1 (SDB_D1)", "SD_DATA0 (SDB_D0)",
"SD_CLK", "SD_CMD", "SD_DATA3 (SDB_D3)",
"SD_DATA2 (SDB_D2)", "SD_CDN (SD_DET_N)",
/* Bank BOOT */
"SDC_D0 (EMMC)", "SDC_D1 (EMMC)",
"SDC_D2 (EMMC)", "SDC_D3 (EMMC)",
"SDC_D4 (EMMC)", "SDC_D5 (EMMC)",
"SDC_D6 (EMMC)", "SDC_D7 (EMMC)",
"SDC_CLK (EMMC)", "SDC_RSTn (EMMC)",
"SDC_CMD (EMMC)", "BOOT_SEL", "", "", "",
"", "", "", "",
/* Bank DIF */
"ETH_RXD1", "ETH_RXD0", "ETH_RX_DV",
"RGMII_RX_CLK", "ETH_RXD3", "ETH_RXD2",
"ETH_TXEN", "ETH_PHY_REF_CLK_25MOUT",
"ETH_MDC", "ETH_MDIO";
};
&gpio_ao {
gpio-line-names = "UART TX", "UART RX", "",
"TF_3V3N_1V8_EN", "USB_HUB_RST_N",
"USB_OTG_PWREN", "J7 Header Pin 2",
"IR_IN", "J7 Header Pin 4",
"J7 Header Pin 6", "J7 Header Pin 5",
"J7 Header Pin 7", "HDMI_CEC",
"SYS_LED", "", "";
/*
* WARNING: The USB Hub on the Odroid-C1/C1+ needs a reset signal
* to be turned high in order to be detected by the USB Controller.

5
arch/arm/boot/dts/meson8b.dtsi
View File

@ -294,6 +294,11 @@ pwm_ef: pwm@86c0 {
status = "disabled";
};
clock-measure@8758 {
compatible = "amlogic,meson8b-clk-measure";
reg = <0x8758 0x1c>;
};
pinctrl_cbus: pinctrl@9880 {
compatible = "amlogic,meson8b-cbus-pinctrl";
reg = <0x9880 0x10>;