From: Jagan Teki Date: Fri, 12 Apr 2019 18:22:30 +0530 Subject: [U-Boot] [PATCH 1/7] arm: allwinner: r40: Sync R40 dts(i) files from Linux 5.1-rc2 In-Reply-To: <20190412125236.12748-1-jagan@amarulasolutions.com> References: <20190412125236.12748-1-jagan@amarulasolutions.com> Message-ID: <20190412125236.12748-2-jagan@amarulasolutions.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Sync sun8i-r40 dts(i) files from Linux 5.1-rc2 Linux commit details about the sun8i-r40* sync: "ARM: dts: sun8i: r40: bananapi-m2-ultra: Add Bluetooth device node" (sha1: 1e5f1db4ccd8348a21da55bff82f4263000879ef) Linux commit details about the sun8i-v40* sync: "ARM: dts: sunxi: Fix I2C bus warnings" (sha1: 0729b4af5753b65aa031f58c435da53dbbf56d19) Cc: Pablo Sebasti=C3=A1n Greco Signed-off-by: Jagan Teki --- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 91 ++++- arch/arm/dts/sun8i-r40.dtsi | 364 ++++++++++++++++++- arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- 3 files changed, 449 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/su= n8i-r40-bananapi-m2-ultra.dts index 25fb048c7d..c488aaacbd 100644 --- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -59,6 +59,17 @@ stdout-path =3D "serial0:115200n8"; }; =20 + connector { + compatible =3D "hdmi-connector"; + type =3D "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint =3D <&hdmi_out_con>; + }; + }; + }; + leds { compatible =3D "gpio-leds"; =20 @@ -91,9 +102,21 @@ wifi_pwrseq: wifi_pwrseq { compatible =3D "mmc-pwrseq-simple"; reset-gpios =3D <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 WIFI_EN */ + clocks =3D <&ccu CLK_OUTA>; + clock-names =3D "ext_clock"; }; }; =20 +&ahci { + ahci-supply =3D <®_dldo4>; + phy-supply =3D <®_eldo3>; + status =3D "okay"; +}; + +&de { + status =3D "okay"; +}; + &ehci1 { status =3D "okay"; }; @@ -118,6 +141,16 @@ }; }; =20 +&hdmi { + status =3D "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint =3D <&hdmi_con_in>; + }; +}; + &i2c0 { status =3D "okay"; =20 @@ -134,8 +167,7 @@ &mmc0 { vmmc-supply =3D <®_dcdc1>; bus-width =3D <4>; - cd-gpios =3D <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */ - cd-inverted; + cd-gpios =3D <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */ status =3D "okay"; }; =20 @@ -166,6 +198,11 @@ status =3D "okay"; }; =20 +&pio { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&clk_out_a_pin>; +}; + ®_aldo2 { regulator-always-on; regulator-min-microvolt =3D <2500000>; @@ -220,18 +257,68 @@ regulator-name =3D "vcc-wifi-io"; }; =20 +/* + * Our WiFi chip needs both DLDO2 and DLDO3 to be powered at the same + * time, with the two being in sync, to be able to meet maximum power + * consumption during transmits. Since this is not really supported + * right now, just use the two as always on, and we will fix it later. + */ + ®_dldo2 { + regulator-always-on; regulator-min-microvolt =3D <3300000>; regulator-max-microvolt =3D <3300000>; regulator-name =3D "vcc-wifi"; }; =20 +®_dldo3 { + regulator-always-on; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-name =3D "vcc-wifi-2"; +}; + +®_dldo4 { + regulator-min-microvolt =3D <2500000>; + regulator-max-microvolt =3D <2500000>; + regulator-name =3D "vdd2v5-sata"; +}; + +®_eldo3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + regulator-name =3D "vdd1v2-sata"; +}; + +&tcon_tv0 { + status =3D "okay"; +}; + &uart0 { pinctrl-names =3D "default"; pinctrl-0 =3D <&uart0_pb_pins>; status =3D "okay"; }; =20 +&uart3 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&uart3_pg_pins>, <&uart3_rts_cts_pg_pins>; + uart-has-rtscts; + status =3D "okay"; + + bluetooth { + compatible =3D "brcm,bcm43438-bt"; + clocks =3D <&ccu CLK_OUTA>; + clock-names =3D "lpo"; + vbat-supply =3D <®_dldo2>; + vddio-supply =3D <®_dldo1>; + device-wakeup-gpios =3D <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */ + /* TODO host wake line connected to PMIC GPIO pins */ + shutdown-gpios =3D <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */ + max-speed =3D <1500000>; + }; +}; + &usbphy { usb1_vbus-supply =3D <®_vcc5v0>; usb2_vbus-supply =3D <®_vcc5v0>; diff --git a/arch/arm/dts/sun8i-r40.dtsi b/arch/arm/dts/sun8i-r40.dtsi index bd97ca3dc2..06b685869f 100644 --- a/arch/arm/dts/sun8i-r40.dtsi +++ b/arch/arm/dts/sun8i-r40.dtsi @@ -42,8 +42,10 @@ */ =20 #include +#include #include #include +#include =20 / { #address-cells =3D <1>; @@ -59,6 +61,7 @@ #clock-cells =3D <0>; compatible =3D "fixed-clock"; clock-frequency =3D <24000000>; + clock-accuracy =3D <50000>; clock-output-names =3D "osc24M"; }; =20 @@ -66,7 +69,8 @@ #clock-cells =3D <0>; compatible =3D "fixed-clock"; clock-frequency =3D <32768>; - clock-output-names =3D "osc32k"; + clock-accuracy =3D <20000>; + clock-output-names =3D "ext-osc32k"; }; }; =20 @@ -99,12 +103,75 @@ }; }; =20 + de: display-engine { + compatible =3D "allwinner,sun8i-r40-display-engine"; + allwinner,pipelines =3D <&mixer0>, <&mixer1>; + status =3D "disabled"; + }; + soc { compatible =3D "simple-bus"; #address-cells =3D <1>; #size-cells =3D <1>; ranges; =20 + display_clocks: clock at 1000000 { + compatible =3D "allwinner,sun8i-r40-de2-clk", + "allwinner,sun8i-h3-de2-clk"; + reg =3D <0x01000000 0x100000>; + clocks =3D <&ccu CLK_DE>, + <&ccu CLK_BUS_DE>; + clock-names =3D "mod", + "bus"; + resets =3D <&ccu RST_BUS_DE>; + #clock-cells =3D <1>; + #reset-cells =3D <1>; + }; + + mixer0: mixer at 1100000 { + compatible =3D "allwinner,sun8i-r40-de2-mixer-0"; + reg =3D <0x01100000 0x100000>; + clocks =3D <&display_clocks CLK_BUS_MIXER0>, + <&display_clocks CLK_MIXER0>; + clock-names =3D "bus", + "mod"; + resets =3D <&display_clocks RST_MIXER0>; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + mixer0_out: port at 1 { + reg =3D <1>; + mixer0_out_tcon_top: endpoint { + remote-endpoint =3D <&tcon_top_mixer0_in_mixer0>; + }; + }; + }; + }; + + mixer1: mixer at 1200000 { + compatible =3D "allwinner,sun8i-r40-de2-mixer-1"; + reg =3D <0x01200000 0x100000>; + clocks =3D <&display_clocks CLK_BUS_MIXER1>, + <&display_clocks CLK_MIXER1>; + clock-names =3D "bus", + "mod"; + resets =3D <&display_clocks RST_WB>; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + mixer1_out: port at 1 { + reg =3D <1>; + mixer1_out_tcon_top: endpoint { + remote-endpoint =3D <&tcon_top_mixer1_in_mixer1>; + }; + }; + }; + }; + nmi_intc: interrupt-controller at 1c00030 { compatible =3D "allwinner,sun7i-a20-sc-nmi"; interrupt-controller; @@ -248,23 +315,38 @@ ccu: clock at 1c20000 { compatible =3D "allwinner,sun8i-r40-ccu"; reg =3D <0x01c20000 0x400>; - clocks =3D <&osc24M>, <&osc32k>; + clocks =3D <&osc24M>, <&rtc 0>; clock-names =3D "hosc", "losc"; #clock-cells =3D <1>; #reset-cells =3D <1>; }; =20 + rtc: rtc at 1c20400 { + compatible =3D "allwinner,sun8i-r40-rtc", + "allwinner,sun8i-h3-rtc"; + reg =3D <0x01c20400 0x400>; + interrupts =3D ; + clock-output-names =3D "osc32k", "osc32k-out"; + clocks =3D <&osc32k>; + #clock-cells =3D <1>; + }; + pio: pinctrl at 1c20800 { compatible =3D "allwinner,sun8i-r40-pinctrl"; reg =3D <0x01c20800 0x400>; interrupts =3D ; - clocks =3D <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clocks =3D <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>; clock-names =3D "apb", "hosc", "losc"; gpio-controller; interrupt-controller; #interrupt-cells =3D <3>; #gpio-cells =3D <3>; =20 + clk_out_a_pin: clk-out-a-pin { + pins =3D "PI12"; + function =3D "clk_out_a"; + }; + gmac_rgmii_pins: gmac-rgmii-pins { pins =3D "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", @@ -312,6 +394,16 @@ pins =3D "PB22", "PB23"; function =3D "uart0"; }; + + uart3_pg_pins: uart3-pg-pins { + pins =3D "PG6", "PG7"; + function =3D "uart3"; + }; + + uart3_rts_cts_pg_pins: uart3-rts-cts-pg-pins { + pins =3D "PG8", "PG9"; + function =3D "uart3"; + }; }; =20 wdt: watchdog at 1c20c90 { @@ -464,6 +556,19 @@ #size-cells =3D <0>; }; =20 + ahci: sata at 1c18000 { + compatible =3D "allwinner,sun8i-r40-ahci"; + reg =3D <0x01c18000 0x1000>; + interrupts =3D ; + clocks =3D <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>; + resets =3D <&ccu RST_BUS_SATA>; + resets-name =3D "ahci"; + #address-cells =3D <1>; + #size-cells =3D <0>; + status =3D "disabled"; + + }; + gmac: ethernet at 1c50000 { compatible =3D "allwinner,sun8i-r40-gmac"; syscon =3D <&ccu>; @@ -474,8 +579,6 @@ reset-names =3D "stmmaceth"; clocks =3D <&ccu CLK_BUS_GMAC>; clock-names =3D "stmmaceth"; - #address-cells =3D <1>; - #size-cells =3D <0>; status =3D "disabled"; =20 gmac_mdio: mdio { @@ -485,6 +588,213 @@ }; }; =20 + tcon_top: tcon-top at 1c70000 { + compatible =3D "allwinner,sun8i-r40-tcon-top"; + reg =3D <0x01c70000 0x1000>; + clocks =3D <&ccu CLK_BUS_TCON_TOP>, + <&ccu CLK_TCON_TV0>, + <&ccu CLK_TVE0>, + <&ccu CLK_TCON_TV1>, + <&ccu CLK_TVE1>, + <&ccu CLK_DSI_DPHY>; + clock-names =3D "bus", + "tcon-tv0", + "tve0", + "tcon-tv1", + "tve1", + "dsi"; + clock-output-names =3D "tcon-top-tv0", + "tcon-top-tv1", + "tcon-top-dsi"; + resets =3D <&ccu RST_BUS_TCON_TOP>; + #clock-cells =3D <1>; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + tcon_top_mixer0_in: port at 0 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <0>; + + tcon_top_mixer0_in_mixer0: endpoint at 0 { + reg =3D <0>; + remote-endpoint =3D <&mixer0_out_tcon_top>; + }; + }; + + tcon_top_mixer0_out: port at 1 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <1>; + + tcon_top_mixer0_out_tcon_lcd0: endpoint at 0 { + reg =3D <0>; + }; + + tcon_top_mixer0_out_tcon_lcd1: endpoint at 1 { + reg =3D <1>; + }; + + tcon_top_mixer0_out_tcon_tv0: endpoint at 2 { + reg =3D <2>; + remote-endpoint =3D <&tcon_tv0_in_tcon_top_mixer0>; + }; + + tcon_top_mixer0_out_tcon_tv1: endpoint at 3 { + reg =3D <3>; + remote-endpoint =3D <&tcon_tv1_in_tcon_top_mixer0>; + }; + }; + + tcon_top_mixer1_in: port at 2 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <2>; + + tcon_top_mixer1_in_mixer1: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&mixer1_out_tcon_top>; + }; + }; + + tcon_top_mixer1_out: port at 3 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <3>; + + tcon_top_mixer1_out_tcon_lcd0: endpoint at 0 { + reg =3D <0>; + }; + + tcon_top_mixer1_out_tcon_lcd1: endpoint at 1 { + reg =3D <1>; + }; + + tcon_top_mixer1_out_tcon_tv0: endpoint at 2 { + reg =3D <2>; + remote-endpoint =3D <&tcon_tv0_in_tcon_top_mixer1>; + }; + + tcon_top_mixer1_out_tcon_tv1: endpoint at 3 { + reg =3D <3>; + remote-endpoint =3D <&tcon_tv1_in_tcon_top_mixer1>; + }; + }; + + tcon_top_hdmi_in: port at 4 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <4>; + + tcon_top_hdmi_in_tcon_tv0: endpoint at 0 { + reg =3D <0>; + remote-endpoint =3D <&tcon_tv0_out_tcon_top>; + }; + + tcon_top_hdmi_in_tcon_tv1: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&tcon_tv1_out_tcon_top>; + }; + }; + + tcon_top_hdmi_out: port at 5 { + reg =3D <5>; + + tcon_top_hdmi_out_hdmi: endpoint { + remote-endpoint =3D <&hdmi_in_tcon_top>; + }; + }; + }; + }; + + tcon_tv0: lcd-controller at 1c73000 { + compatible =3D "allwinner,sun8i-r40-tcon-tv"; + reg =3D <0x01c73000 0x1000>; + interrupts =3D ; + clocks =3D <&ccu CLK_BUS_TCON_TV0>, <&tcon_top 0>; + clock-names =3D "ahb", "tcon-ch1"; + resets =3D <&ccu RST_BUS_TCON_TV0>; + reset-names =3D "lcd"; + status =3D "disabled"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + tcon_tv0_in: port at 0 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <0>; + + tcon_tv0_in_tcon_top_mixer0: endpoint at 0 { + reg =3D <0>; + remote-endpoint =3D <&tcon_top_mixer0_out_tcon_tv0>; + }; + + tcon_tv0_in_tcon_top_mixer1: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&tcon_top_mixer1_out_tcon_tv0>; + }; + }; + + tcon_tv0_out: port at 1 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <1>; + + tcon_tv0_out_tcon_top: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&tcon_top_hdmi_in_tcon_tv0>; + }; + }; + }; + }; + + tcon_tv1: lcd-controller at 1c74000 { + compatible =3D "allwinner,sun8i-r40-tcon-tv"; + reg =3D <0x01c74000 0x1000>; + interrupts =3D ; + clocks =3D <&ccu CLK_BUS_TCON_TV1>, <&tcon_top 1>; + clock-names =3D "ahb", "tcon-ch1"; + resets =3D <&ccu RST_BUS_TCON_TV1>; + reset-names =3D "lcd"; + status =3D "disabled"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + tcon_tv1_in: port at 0 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <0>; + + tcon_tv1_in_tcon_top_mixer0: endpoint at 0 { + reg =3D <0>; + remote-endpoint =3D <&tcon_top_mixer0_out_tcon_tv1>; + }; + + tcon_tv1_in_tcon_top_mixer1: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&tcon_top_mixer1_out_tcon_tv1>; + }; + }; + + tcon_tv1_out: port at 1 { + #address-cells =3D <1>; + #size-cells =3D <0>; + reg =3D <1>; + + tcon_tv1_out_tcon_top: endpoint at 1 { + reg =3D <1>; + remote-endpoint =3D <&tcon_top_hdmi_in_tcon_tv1>; + }; + }; + }; + }; + gic: interrupt-controller at 1c81000 { compatible =3D "arm,gic-400"; reg =3D <0x01c81000 0x1000>, @@ -495,6 +805,50 @@ #interrupt-cells =3D <3>; interrupts =3D ; }; + + hdmi: hdmi at 1ee0000 { + compatible =3D "allwinner,sun8i-r40-dw-hdmi", + "allwinner,sun8i-a83t-dw-hdmi"; + reg =3D <0x01ee0000 0x10000>; + reg-io-width =3D <1>; + interrupts =3D ; + clocks =3D <&ccu CLK_BUS_HDMI0>, <&ccu CLK_HDMI_SLOW>, + <&ccu CLK_HDMI>; + clock-names =3D "iahb", "isfr", "tmds"; + resets =3D <&ccu RST_BUS_HDMI1>; + reset-names =3D "ctrl"; + phys =3D <&hdmi_phy>; + phy-names =3D "hdmi-phy"; + status =3D "disabled"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + hdmi_in: port at 0 { + reg =3D <0>; + + hdmi_in_tcon_top: endpoint { + remote-endpoint =3D <&tcon_top_hdmi_out_hdmi>; + }; + }; + + hdmi_out: port at 1 { + reg =3D <1>; + }; + }; + }; + + hdmi_phy: hdmi-phy at 1ef0000 { + compatible =3D "allwinner,sun8i-r40-hdmi-phy"; + reg =3D <0x01ef0000 0x10000>; + clocks =3D <&ccu CLK_BUS_HDMI1>, <&ccu CLK_HDMI_SLOW>, + <&ccu 7>, <&ccu 16>; + clock-names =3D "bus", "mod", "pll-0", "pll-1"; + resets =3D <&ccu RST_BUS_HDMI0>; + reset-names =3D "phy"; + #phy-cells =3D <0>; + }; }; =20 timer { diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/su= n8i-v40-bananapi-m2-berry.dts index 35859d8f32..bf97f6244c 100644 --- a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts @@ -95,7 +95,7 @@ &i2c0 { status =3D "okay"; =20 - axp22x: pmic at 68 { + axp22x: pmic at 34 { compatible =3D "x-powers,axp221"; reg =3D <0x34>; interrupt-parent =3D <&nmi_intc>; --=20 2.18.0.321.gffc6fa0e3