Skip to content

Commit

Permalink
FROMGIT: ARM: dts: sync Amlogic GX DT to Linux v6.4
Browse files Browse the repository at this point in the history 
Sync Amlogic GXBB, GXL & GXM DTs from Linux v6.4, and also
switch to GXL MDIO MUX driver to adapt to DT change,

Most of the changes are only cosmetic or doesn't concern U-Boot,
the most important change for U-Boot is the GXL mdio mux compatible
switch to amlogic,gxl-mdio-mux.

Link: https://lore.kernel.org/r/20231213-u-boot-gxl-mdio-mux-v2-2-c56bb02a75ea@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
  • Loading branch information
@superna9999 @chewitt
superna9999 authored and chewitt committed Mar 6, 2024
1 parent 1b22c08 commit bc6be58
Show file tree
Hide file tree
Showing 25 changed files with 196 additions and 90 deletions.
4 changes: 2 additions & 2 deletions arch/arm/dts/meson-gx-libretech-pc.dtsi
View file
Expand Up @@ -17,7 +17,7 @@
io-channel-names = "buttons";
keyup-threshold-microvolt = <1800000>;

update-button {
button-update {
label = "update";
linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <1300000>;
Expand Down Expand Up @@ -416,7 +416,7 @@
pinctrl-names = "default";
status = "okay";

gd25lq128: spi-flash@0 {
gd25lq128: flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
Expand Down
21 changes: 14 additions & 7 deletions arch/arm/dts/meson-gx.dtsi
View file
Expand Up @@ -49,6 +49,12 @@
no-map;
};

/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
secmon_reserved_bl32: secmon@5300000 {
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};

linux,cma {
compatible = "shared-dma-pool";
reusable;
Expand Down Expand Up @@ -126,6 +132,7 @@

l2: l2-cache0 {
compatible = "cache";
cache-level = <2>;
};
};

Expand Down Expand Up @@ -226,7 +233,7 @@
reg = <0x14 0x10>;
};

eth_mac: eth_mac@34 {
eth_mac: eth-mac@34 {
reg = <0x34 0x10>;
};

Expand All @@ -243,7 +250,7 @@
scpi_clocks: clocks {
compatible = "arm,scpi-clocks";

scpi_dvfs: scpi_clocks@0 {
scpi_dvfs: clocks-0 {
compatible = "arm,scpi-dvfs-clocks";
#clock-cells = <1>;
clock-indices = <0>;
Expand Down Expand Up @@ -444,7 +451,7 @@

sysctrl_AO: sys-ctrl@0 {
compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";
reg = <0x0 0x0 0x0 0x100>;
reg = <0x0 0x0 0x0 0x100>;

clkc_AO: clock-controller {
compatible = "amlogic,meson-gx-aoclkc";
Expand Down Expand Up @@ -525,7 +532,7 @@
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>;

hwrng: rng {
hwrng: rng@0 {
compatible = "amlogic,meson-rng";
reg = <0x0 0x0 0x0 0x4>;
};
Expand Down Expand Up @@ -596,21 +603,21 @@
sd_emmc_a: mmc@70000 {
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
reg = <0x0 0x70000 0x0 0x800>;
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};

sd_emmc_b: mmc@72000 {
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
reg = <0x0 0x72000 0x0 0x800>;
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};

sd_emmc_c: mmc@74000 {
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
reg = <0x0 0x74000 0x0 0x800>;
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
};
Expand Down
13 changes: 12 additions & 1 deletion arch/arm/dts/meson-gxbb-nanopi-k2.dts
View file
Expand Up @@ -385,9 +385,20 @@

/* Bluetooth on AP6212 */
&uart_A {
status = "disabled";
status = "okay";
pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
pinctrl-names = "default";
uart-has-rtscts;

bluetooth {
compatible = "brcm,bcm43438-bt";
clocks = <&wifi_32k>;
clock-names = "lpo";
vbat-supply = <&vddio_ao3v3>;
vddio-supply = <&vddio_ao18>;
host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
};
};

/* 40-pin CON1 */
Expand Down
26 changes: 11 additions & 15 deletions arch/arm/dts/meson-gxbb-odroidc2.dts
View file
Expand Up @@ -250,21 +250,6 @@
};
};

&gpio_ao {
/*
* WARNING: The USB Hub on the Odroid-C2 needs a reset signal
* to be turned high in order to be detected by the USB Controller
* This signal should be handled by a USB specific power sequence
* in order to reset the Hub when USB bus is powered down.
*/
hog-0 {
gpio-hog;
gpios = <GPIOAO_4 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "usb-hub-reset";
};
};

&hdmi_tx {
status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
Expand Down Expand Up @@ -414,5 +399,16 @@
};

&usb1 {
dr_mode = "host";
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

hub@1 {
/* Genesys Logic GL852G USB 2.0 hub */
compatible = "usb5e3,610";
reg = <1>;
vdd-supply = <&p5v0>;
reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
};
};
18 changes: 16 additions & 2 deletions arch/arm/dts/meson-gxbb.dtsi
View file
Expand Up @@ -300,8 +300,8 @@
};

&gpio_intc {
compatible = "amlogic,meson-gpio-intc",
"amlogic,meson-gxbb-gpio-intc";
compatible = "amlogic,meson-gxbb-gpio-intc",
"amlogic,meson-gpio-intc";
status = "okay";
};

Expand Down Expand Up @@ -427,6 +427,20 @@
};
};

spi_idle_high_pins: spi-idle-high-pins {
mux {
groups = "spi_sclk";
bias-pull-up;
};
};

spi_idle_low_pins: spi-idle-low-pins {
mux {
groups = "spi_sclk";
bias-pull-down;
};
};

spi_ss0_pins: spi-ss0 {
mux {
groups = "spi_ss0";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/meson-gxl-s805x-libretech-ac.dts
View file
Expand Up @@ -298,7 +298,7 @@
pinctrl-0 = <&nor_pins>;
pinctrl-names = "default";

w25q32: spi-flash@0 {
w25q32: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
Expand Down
12 changes: 9 additions & 3 deletions arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts
View file
Expand Up @@ -86,11 +86,11 @@
};

&efuse {
bt_mac: bt_mac@6 {
bt_mac: bt-mac@6 {
reg = <0x6 0x6>;
};

wifi_mac: wifi_mac@C {
wifi_mac: wifi-mac@c {
reg = <0xc 0x6>;
};
};
Expand Down Expand Up @@ -213,6 +213,12 @@
pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
pinctrl-names = "default";
uart-has-rtscts;

bluetooth {
compatible = "realtek,rtl8822cs-bt";
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
};
};

&uart_C {
Expand All @@ -233,7 +239,7 @@
pinctrl-names = "default";
pinctrl-0 = <&i2c_b_pins>;

pcf8563: pcf8563@51 {
pcf8563: rtc@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
status = "okay";
Expand Down
16 changes: 1 addition & 15 deletions arch/arm/dts/meson-gxl-s905x-khadas-vim.dts
View file
Expand Up @@ -140,7 +140,6 @@
compatible = "haoyu,hym8563";
reg = <0x51>;
#clock-cells = <0>;
clock-frequency = <32768>;
clock-output-names = "xin32k";
};
};
Expand Down Expand Up @@ -218,20 +217,7 @@
};

&sd_emmc_a {
brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
};
};

&uart_A {
bluetooth {
compatible = "brcm,bcm43438-bt";
shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
max-speed = <2000000>;
clocks = <&wifi32k>;
clock-names = "lpo";
};
max-frequency = <100000000>;
};

/* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts
View file
Expand Up @@ -284,7 +284,7 @@
pinctrl-0 = <&nor_pins>;
pinctrl-names = "default";

nor_4u1: spi-flash@0 {
nor_4u1: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
Expand All @@ -305,7 +305,6 @@
};

&usb2_phy0 {
pinctrl-names = "default";
phy-supply = <&vcc5v>;
};

Expand Down
68 changes: 68 additions & 0 deletions arch/arm/dts/meson-gxl-s905x-p212.dts
View file
Expand Up @@ -7,11 +7,19 @@
/dts-v1/;

#include "meson-gxl-s905x-p212.dtsi"
#include <dt-bindings/sound/meson-aiu.h>

/ {
compatible = "amlogic,p212", "amlogic,s905x", "amlogic,meson-gxl";
model = "Amlogic Meson GXL (S905X) P212 Development Board";

dio2133: analog-amplifier {
compatible = "simple-audio-amplifier";
sound-name-prefix = "AU2";
VCC-supply = <&hdmi_5v>;
enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
};

cvbs-connector {
compatible = "composite-video-connector";

Expand All @@ -32,6 +40,66 @@
};
};
};

sound {
compatible = "amlogic,gx-sound-card";
model = "S905X-P212";
audio-aux-devs = <&dio2133>;
audio-widgets = "Line", "Lineout";
audio-routing = "AU2 INL", "ACODEC LOLN",
"AU2 INR", "ACODEC LORN",
"Lineout", "AU2 OUTL",
"Lineout", "AU2 OUTR";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
assigned-clock-parents = <0>, <0>, <0>;
assigned-clock-rates = <294912000>,
<270950400>,
<393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
};

dai-link-1 {
sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
dai-format = "i2s";
mclk-fs = <256>;

codec-0 {
sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
};

codec-1 {
sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
};
};

dai-link-2 {
sound-dai = <&aiu AIU_HDMI CTRL_OUT>;

codec-0 {
sound-dai = <&hdmi_tx>;
};
};

dai-link-3 {
sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;

codec-0 {
sound-dai = <&acodec>;
};
};
};
};

&acodec {
AVDD-supply = <&vddio_ao18>;
status = "okay";
};

&aiu {
status = "okay";
};

&cec_AO {
Expand Down

0 comments on commit bc6be58

Please sign in to comment.