system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-16 16:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amlogic 32-bit DT updates for v4.21

Browse source 
- support more timers on meson8
 - add the stdout-path property on several boards
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAlwATkAACgkQWTcYmtP7
 xmUJ5w/+KMrv+9D9uqdRRBjMxyGfYURCsY+sA/iT1TPjBruVCl9Js6uQ77h8NZ5W
 oCkEmrL2t8oSK4q8BqR7F9ayzloM5G3i7ruIzgVQE0pHWdVxvJa+zlsrnCI9/Gsv
 Swy9zpXzHIcRZNiMewBYwvB/cO/qYmNxjnWi3NintE6NSv0Syl0q6MMoTlUSdyoE
 MFednj/OcQyt8csBeJljVhZ6P7VLaag2WHIe7JqTa53qUU/qRGA18g8qb7UnHmUC
 BWJaFzzfXG8Tr9nP1ddo3WTeHskgzWiuObnXw64ep2wMcVU+HsbPGiMyWLXzpjrM
 8IEOFGTuxNeY7M9Rs7jhyFWAqP9Ls0USiiOOuHiyFENumVc3WCVXTl7toTXbW1qc
 kVyE4BbdAIwd2Zbwr6gimr2Q0Gzz2oHK09+gBGrAvgZvt+Kwf7QCOMoGlokAVkMX
 h+wJyqC+2PABV/Desl3ocjMQtuLRfIL6/NyFfcWqSXLMLhXPqMfNQ+k3p/ZcgH9d
 9Q0zre83NeBCgNk7QejZW85XHfkyekqkPGnWJHQkOO5XHJmaaRTmUM7wiV6l6emE
 3JBil39sHkPsiInYd6yvbZs4g5InOXvTDf43fHBeWRMxBBpxpGf57HYa9ib7r6MJ
 asnfxjBwdYcwzWg+Gb7Ri0Jmi4xUxROrhuiMKLfbDCLmt+yIPBE=
 =9yK+
 -----END PGP SIGNATURE-----

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

Amlogic 32-bit DT updates for v4.21
- support more timers on meson8
- add the stdout-path property on several boards

* tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson: add the clock inputs for the Meson timer
  ARM: dts: meson: add the TIMER B/C/D interrupts
  ARM: dts: meson: consistently disable pin bias
  ARM: dts: meson8b: mxq: add the /chosen/stdout-path property
  ARM: dts: meson8: minix-neo-x8: add the /chosen/stdout-path property
  ARM: dts: meson6: atv1200: add the /chosen/stdout-path property
  dt-bindings: timer: meson6_timer: document the clock inputs
  dt-bindings: timer: meson6_timer: document all interrupts

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-11-30 15:18:03 -08:00
parent e14a6df960 7b141abe4a
commit 4c4332761e
9 changed files with 63 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
View file

@ -4,12 +4,19 @@ Required properties:
- compatible : should be "amlogic,meson6-timer"
- reg : Specifies base physical address and size of the registers.
- interrupts : The interrupt of the first timer
- interrupts : The four interrupts, one for each timer event
- clocks : phandles to the pclk (system clock) and XTAL clocks
- clock-names : must contain "pclk" and "xtal"
Example:
timer@c1109940 {
compatible = "amlogic,meson6-timer";
reg = <0xc1109940 0x14>;
interrupts = <0 10 1>;
interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>, <&clk81>;
clock-names = "xtal", "pclk";
};

7
arch/arm/boot/dts/meson.dtsi
View file

@ -197,10 +197,13 @@ wdt: watchdog@9900 {
interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
};
timer@9940 {
timer_abcde: timer@9940 {
compatible = "amlogic,meson6-timer";
reg = <0x9940 0x18>;
interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>;
interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;
};
};

4
arch/arm/boot/dts/meson6-atv1200.dts
View file

@ -56,6 +56,10 @@ aliases {
serial0 = &uart_AO;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x40000000 0x80000000>;
};

5
arch/arm/boot/dts/meson6.dtsi
View file

@ -88,6 +88,11 @@ &efuse {
status = "disabled";
};
&timer_abcde {
clocks = <&xtal>, <&clk81>;
clock-names = "xtal", "pclk";
};
&uart_AO {
clocks = <&xtal>, <&clk81>, <&clk81>;
clock-names = "xtal", "pclk", "baud";

4
arch/arm/boot/dts/meson8-minix-neo-x8.dts
View file

@ -52,6 +52,10 @@ aliases {
serial0 = &uart_AO;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x40000000 0x80000000>;
};

17
arch/arm/boot/dts/meson8.dtsi
View file

@ -163,6 +163,7 @@ uart_ao_a_pins: uart_ao_a {
mux {
groups = "uart_tx_ao_a", "uart_rx_ao_a";
function = "uart_ao";
bias-disable;
};
};
@ -170,6 +171,7 @@ i2c_ao_pins: i2c_mst_ao {
mux {
groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao";
function = "i2c_mst_ao";
bias-disable;
};
};
@ -177,6 +179,7 @@ ir_recv_pins: remote {
mux {
groups = "remote_input";
function = "remote";
bias-disable;
};
};
@ -184,6 +187,7 @@ pwm_f_ao_pins: pwm-f-ao {
mux {
groups = "pwm_f_ao";
function = "pwm_f_ao";
bias-disable;
};
};
};
@ -238,6 +242,7 @@ mux {
groups = "sd_d0_a", "sd_d1_a", "sd_d2_a",
"sd_d3_a", "sd_clk_a", "sd_cmd_a";
function = "sd_a";
bias-disable;
};
};
@ -246,6 +251,7 @@ mux {
groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",
"sd_d3_b", "sd_clk_b", "sd_cmd_b";
function = "sd_b";
bias-disable;
};
};
@ -254,6 +260,7 @@ mux {
groups = "sd_d0_c", "sd_d1_c", "sd_d2_c",
"sd_d3_c", "sd_clk_c", "sd_cmd_c";
function = "sd_c";
bias-disable;
};
};
@ -261,6 +268,7 @@ spi_nor_pins: nor {
mux {
groups = "nor_d", "nor_q", "nor_c", "nor_cs";
function = "nor";
bias-disable;
};
};
@ -272,6 +280,7 @@ mux {
"eth_rxd1", "eth_rxd0", "eth_mdio",
"eth_mdc";
function = "ethernet";
bias-disable;
};
};
@ -279,6 +288,7 @@ pwm_e_pins: pwm-e {
mux {
groups = "pwm_e";
function = "pwm_e";
bias-disable;
};
};
@ -287,6 +297,7 @@ mux {
groups = "uart_tx_a1",
"uart_rx_a1";
function = "uart_a";
bias-disable;
};
};
@ -295,6 +306,7 @@ mux {
groups = "uart_cts_a1",
"uart_rts_a1";
function = "uart_a";
bias-disable;
};
};
};
@ -375,6 +387,11 @@ &spifc {
clocks = <&clkc CLKID_CLK81>;
};
&timer_abcde {
clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
clock-names = "xtal", "pclk";
};
&uart_AO {
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;

4
arch/arm/boot/dts/meson8b-mxq.dts
View file

@ -55,6 +55,10 @@ aliases {
serial0 = &uart_AO;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x40000000 0x40000000>;
};

14
arch/arm/boot/dts/meson8b.dtsi
View file

@ -146,6 +146,7 @@ uart_ao_a_pins: uart_ao_a {
mux {
groups = "uart_tx_ao_a", "uart_rx_ao_a";
function = "uart_ao";
bias-disable;
};
};
@ -153,6 +154,7 @@ ir_recv_pins: remote {
mux {
groups = "remote_input";
function = "remote";
bias-disable;
};
};
};
@ -220,6 +222,7 @@ mux {
"eth_txd2",
"eth_txd3";
function = "ethernet";
bias-disable;
};
};
@ -235,6 +238,7 @@ mux {
"eth_mdio_en",
"eth_mdc";
function = "ethernet";
bias-disable;
};
};
@ -242,6 +246,7 @@ i2c_a_pins: i2c-a {
mux {
groups = "i2c_sda_a", "i2c_sck_a";
function = "i2c_a";
bias-disable;
};
};
@ -250,6 +255,7 @@ mux {
groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",
"sd_d3_b", "sd_clk_b", "sd_cmd_b";
function = "sd_b";
bias-disable;
};
};
@ -257,6 +263,7 @@ pwm_c1_pins: pwm-c1 {
mux {
groups = "pwm_c1";
function = "pwm_c";
bias-disable;
};
};
@ -265,6 +272,7 @@ mux {
groups = "uart_tx_b0",
"uart_rx_b0";
function = "uart_b";
bias-disable;
};
};
@ -273,6 +281,7 @@ mux {
groups = "uart_cts_b0",
"uart_rts_b0";
function = "uart_b";
bias-disable;
};
};
};
@ -361,6 +370,11 @@ &sdio {
clock-names = "core", "clkin";
};
&timer_abcde {
clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
clock-names = "xtal", "pclk";
};
&uart_AO {
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;

1
arch/arm/boot/dts/meson8m2.dtsi
View file

@ -45,6 +45,7 @@ mux {
"eth_rxd1", "eth_rxd0",
"eth_mdio", "eth_mdc";
function = "ethernet";
bias-disable;
};
};
};