mirror of https://gitee.com/openkylin/linux.git
Amlogic 64-bit DT updates for v4.14
- add GPIO line names to a few boards - MMC regulator settle time updates - misc cleanups/fixups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJZlRZZAAoJEFk3GJrT+8Zl23sQAKSgVMFRKMTvw3MhZ2CT0v3F kKCpg4QzBaScA1+tPbbZ2GMMKOfJQmCqVUBushPBNwfavpLPqy0UFj5FB10ELJvq yN00Wb5377wEMvAxK/VdTPZRkHhCBgrgaFUUiKfZNMHdvVwP0m6/u8+8e2kETJ2Z Bc+xORBEE8ZfR9NuqN9wgjA96ccrxCmb8J96n5aVOu0oyFnQKyM6YHEjK85cB8sh 5HVcCDd+tbpH/YgDn4OED75n7LlxtyHVOF42Nu2FmJC5w4j/uKY4eid+hILl7TQf LRC8CX+fV59n219U/uC8uHluMAMhuRV7z+XfEbDfHn6SKlrt9c9avcoOX+6Wg10/ XrQuUYyp4fgKt0diCRSJ5ziwz4xgXQPexP9pwqX6U18lBs1cE7Mio2gvDBtsj+zy QFsHJrVfZSJ+oSTK39/uiJBuE+NnIL18rH/k1VWsxLVOzg5cActDvmwYhdE7pCLX iYmIF7pThFOCQ/KS5F3ghFGykiS3RxTG75yqy7KSjQ7p1N9u20JhkUYlpxpB7sMo hjdroT7ZaRokmM295+Kz5vRP3vQ3qZty5UO2Ofz96JW3oLGUWACXnZkfUhCNQHGQ roR/hR5ihCsmx9tWvPS/e2mc9bG7WEaDrisO/FvYelkkzRVOJW+Xk9g2lSTGJzCM Xk+BPoiw4Bz/aUiTa7nU =6xzU -----END PGP SIGNATURE----- Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64 Pull "Amlogic 64-bit DT updates for v4.14" from Kevin Hilman: - add GPIO line names to a few boards - MMC regulator settle time updates - misc cleanups/fixups * tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: dts: meson-gx: use stable UART bindings with correct gate clock ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names ARM64: dts: meson-gxl-khadas-vim: Add GPIO lines names ARM64: dts: meson-gxbb: p20x: add card regulator settle times dt-bindings: amlogic: add unstable statement ARM64: dts: meson-gx: Add SoC info register ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros
This commit is contained in:
Arnd Bergmann
commit
395cd0e66e
|
|
@ -1,6 +1,18 @@
|
|||
Amlogic MesonX device tree bindings
|
||||
-------------------------------------------
|
||||
|
||||
Work in progress statement:
|
||||
|
||||
Device tree files and bindings applying to Amlogic SoCs and boards are
|
||||
considered "unstable". Any Amlogic device tree binding may change at
|
||||
any time. Be sure to use a device tree binary and a kernel image
|
||||
generated from the same source tree.
|
||||
|
||||
Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a
|
||||
stable binding/ABI.
|
||||
|
||||
---------------------------------------------------------------
|
||||
|
||||
Boards with the Amlogic Meson6 SoC shall have the following properties:
|
||||
Required root node property:
|
||||
compatible: "amlogic,meson6"
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ reset: reset-controller@4404 {
|
|||
};
|
||||
|
||||
uart_A: serial@84c0 {
|
||||
compatible = "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
||||
reg = <0x0 0x84c0 0x0 0x14>;
|
||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>;
|
||||
|
|
@ -233,7 +233,7 @@ uart_A: serial@84c0 {
|
|||
};
|
||||
|
||||
uart_B: serial@84dc {
|
||||
compatible = "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
||||
reg = <0x0 0x84dc 0x0 0x14>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>;
|
||||
|
|
@ -279,7 +279,7 @@ pwm_ef: pwm@86c0 {
|
|||
};
|
||||
|
||||
uart_C: serial@8700 {
|
||||
compatible = "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
||||
reg = <0x0 0x8700 0x0 0x14>;
|
||||
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>;
|
||||
|
|
@ -374,19 +374,23 @@ clkc_AO: clock-controller@040 {
|
|||
#reset-cells = <1>;
|
||||
};
|
||||
|
||||
sec_AO: ao-secure@140 {
|
||||
compatible = "amlogic,meson-gx-ao-secure", "syscon";
|
||||
reg = <0x0 0x140 0x0 0x140>;
|
||||
amlogic,has-chip-id;
|
||||
};
|
||||
|
||||
uart_AO: serial@4c0 {
|
||||
compatible = "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
|
||||
reg = <0x0 0x004c0 0x0 0x14>;
|
||||
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart_AO_B: serial@4e0 {
|
||||
compatible = "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
|
||||
reg = <0x0 0x004e0 0x0 0x14>;
|
||||
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
|
@ -437,9 +441,9 @@ hiubus: hiubus@c883c000 {
|
|||
mailbox: mailbox@404 {
|
||||
compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
|
||||
reg = <0 0x404 0 0x4c>;
|
||||
interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
|
||||
<0 209 IRQ_TYPE_EDGE_RISING>,
|
||||
<0 210 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
|
||||
<GIC_SPI 209 IRQ_TYPE_EDGE_RISING>,
|
||||
<GIC_SPI 210 IRQ_TYPE_EDGE_RISING>;
|
||||
#mbox-cells = <1>;
|
||||
};
|
||||
};
|
||||
|
|
@ -448,7 +452,7 @@ ethmac: ethernet@c9410000 {
|
|||
compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
|
||||
reg = <0x0 0xc9410000 0x0 0x10000
|
||||
0x0 0xc8834540 0x0 0x4>;
|
||||
interrupts = <0 8 1>;
|
||||
interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "macirq";
|
||||
status = "disabled";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -175,6 +175,64 @@ &ir {
|
|||
pinctrl-names = "default";
|
||||
};
|
||||
|
||||
&pinctrl_aobus {
|
||||
gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In",
|
||||
"VCCK En", "CON1 Header Pin31",
|
||||
"I2S Header Pin6", "IR In", "I2S Header Pin7",
|
||||
"I2S Header Pin3", "I2S Header Pin4",
|
||||
"I2S Header Pin5", "HDMI CEC", "SYS LED";
|
||||
};
|
||||
|
||||
&pinctrl_periphs {
|
||||
gpio-line-names = /* Bank GPIOZ */
|
||||
"Eth MDIO", "Eth MDC", "Eth RGMII RX Clk",
|
||||
"Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2",
|
||||
"Eth RX D3", "Eth RGMII TX Clk", "Eth TX En",
|
||||
"Eth TX D0", "Eth TX D1", "Eth TX D2", "Eth TX D3",
|
||||
"Eth PHY nRESET", "Eth PHY Intc",
|
||||
/* Bank GPIOH */
|
||||
"HDMI HPD", "HDMI DDC SDA", "HDMI DDC SCL",
|
||||
"CON1 Header Pin33",
|
||||
/* Bank BOOT */
|
||||
"eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3", "eMMC D4",
|
||||
"eMMC D5", "eMMC D6", "eMMC D7", "eMMC Clk",
|
||||
"eMMC Reset", "eMMC CMD",
|
||||
"", "", "", "", "eMMC DS",
|
||||
"", "",
|
||||
/* Bank CARD */
|
||||
"SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD",
|
||||
"SDCard D3", "SDCard D2", "SDCard Det",
|
||||
/* Bank GPIODV */
|
||||
"", "", "", "", "", "", "", "", "", "", "", "", "",
|
||||
"", "", "", "", "", "", "", "", "", "", "",
|
||||
"I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK",
|
||||
"VDDEE Regulator", "VCCK Regulator",
|
||||
/* Bank GPIOY */
|
||||
"CON1 Header Pin7", "CON1 Header Pin11",
|
||||
"CON1 Header Pin13", "CON1 Header Pin15",
|
||||
"CON1 Header Pin18", "CON1 Header Pin19",
|
||||
"CON1 Header Pin22", "CON1 Header Pin21",
|
||||
"CON1 Header Pin24", "CON1 Header Pin23",
|
||||
"CON1 Header Pin26", "CON1 Header Pin29",
|
||||
"CON1 Header Pin32", "CON1 Header Pin8",
|
||||
"CON1 Header Pin10", "CON1 Header Pin16",
|
||||
"CON1 Header Pin12",
|
||||
/* Bank GPIOX */
|
||||
"WIFI SDIO D0", "WIFI SDIO D1", "WIFI SDIO D2",
|
||||
"WIFI SDIO D3", "WIFI SDIO CLK", "WIFI SDIO CMD",
|
||||
"WIFI Power Enable", "WIFI WAKE HOST",
|
||||
"Bluetooth PCM DOUT", "Bluetooth PCM DIN",
|
||||
"Bluetooth PCM SYNC", "Bluetooth PCM CLK",
|
||||
"Bluetooth UART TX", "Bluetooth UART RX",
|
||||
"Bluetooth UART CTS", "Bluetooth UART RTS",
|
||||
"", "", "", "WIFI 32K", "Bluetooth Enable",
|
||||
"Bluetooth WAKE HOST",
|
||||
/* Bank GPIOCLK */
|
||||
"", "CON1 Header Pin35", "", "",
|
||||
/* GPIO_TEST_N */
|
||||
"";
|
||||
};
|
||||
|
||||
&pwm_ef {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pwm_e_pins>;
|
||||
|
|
|
|||
|
|
@ -84,6 +84,9 @@ vddio_card: gpio-regulator {
|
|||
/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */
|
||||
states = <1800000 0
|
||||
3300000 1>;
|
||||
|
||||
regulator-settling-time-up-us = <10000>;
|
||||
regulator-settling-time-down-us = <150000>;
|
||||
};
|
||||
|
||||
vddio_boot: regulator-vddio_boot {
|
||||
|
|
|
|||
|
|
@ -682,6 +682,31 @@ &spifc {
|
|||
clocks = <&clkc CLKID_SPI>;
|
||||
};
|
||||
|
||||
&uart_A {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_AO {
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_AO_B {
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_B {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
|
||||
clock-names = "xtal", "core", "baud";
|
||||
};
|
||||
|
||||
&uart_C {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
|
||||
clock-names = "xtal", "core", "baud";
|
||||
};
|
||||
|
||||
&vpu {
|
||||
compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -105,6 +105,62 @@ &ir {
|
|||
linux,rc-map-name = "rc-geekbox";
|
||||
};
|
||||
|
||||
&pinctrl_aobus {
|
||||
gpio-line-names = "UART TX",
|
||||
"UART RX",
|
||||
"Power Key In",
|
||||
"J9 Header Pin35",
|
||||
"J9 Header Pin16",
|
||||
"J9 Header Pin15",
|
||||
"J9 Header Pin33",
|
||||
"IR In",
|
||||
"HDMI CEC",
|
||||
"SYS LED";
|
||||
};
|
||||
|
||||
&pinctrl_periphs {
|
||||
gpio-line-names = /* Bank GPIOZ */
|
||||
"", "", "", "", "", "", "",
|
||||
"", "", "", "", "", "", "",
|
||||
"Power OFF",
|
||||
"VCCK Enable",
|
||||
/* Bank GPIOH */
|
||||
"HDMI HPD", "HDMI SDA", "HDMI SCL",
|
||||
"HDMI_5V_EN", "SPDIF",
|
||||
"J9 Header Pin37",
|
||||
"J9 Header Pin30",
|
||||
"J9 Header Pin29",
|
||||
"J9 Header Pin32",
|
||||
"J9 Header Pin31",
|
||||
/* Bank BOOT */
|
||||
"eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3",
|
||||
"eMMC D4", "eMMC D5", "eMMC D6", "eMMC D7",
|
||||
"eMMC Clk", "eMMC Reset", "eMMC CMD",
|
||||
"", "BOOT_MODE", "", "", "eMMC Data Strobe",
|
||||
/* Bank CARD */
|
||||
"SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD",
|
||||
"SDCard D3", "SDCard D2", "SDCard Det",
|
||||
/* Bank GPIODV */
|
||||
"", "", "", "", "", "", "", "", "", "", "", "",
|
||||
"", "", "", "", "", "", "", "", "", "", "", "",
|
||||
"I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK",
|
||||
"VCCK Regulator", "VDDEE Regulator",
|
||||
/* Bank GPIOX */
|
||||
"WIFI SDIO D0", "WIFI SDIO D1", "WIFI SDIO D2",
|
||||
"WIFI SDIO D3", "WIFI SDIO CLK", "WIFI SDIO CMD",
|
||||
"WIFI Power Enable", "WIFI WAKE HOST",
|
||||
"Bluetooth PCM DOUT", "Bluetooth PCM DIN",
|
||||
"Bluetooth PCM SYNC", "Bluetooth PCM CLK",
|
||||
"Bluetooth UART TX", "Bluetooth UART RX",
|
||||
"Bluetooth UART CTS", "Bluetooth UART RTS",
|
||||
"WIFI 32K", "Bluetooth Enable",
|
||||
"Bluetooth WAKE HOST",
|
||||
/* Bank GPIOCLK */
|
||||
"", "J9 Header Pin39",
|
||||
/* GPIO_TEST_N */
|
||||
"";
|
||||
};
|
||||
|
||||
&pwm_AO_ab {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>;
|
||||
|
|
|
|||
|
|
@ -623,6 +623,31 @@ &spifc {
|
|||
clocks = <&clkc CLKID_SPI>;
|
||||
};
|
||||
|
||||
&uart_A {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
|
||||
clock-names = "xtal", "core", "baud";
|
||||
};
|
||||
|
||||
&uart_AO {
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_AO_B {
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_B {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
|
||||
clock-names = "xtal", "core", "baud";
|
||||
};
|
||||
|
||||
&uart_C {
|
||||
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
|
||||
clock-names = "xtal", "core", "baud";
|
||||
};
|
||||
|
||||
&vpu {
|
||||
compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue