Amlogic fixes for v4.18-rc
- minor 64-bit DT fixes -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAls0IokACgkQWTcYmtP7 xmVojRAAlrPjt5tAPCuvawitKLRH0ux90lncDtaAHGVhEPJhrEsvzHafB12JWLbE g5eMPAzMEOm03EI9z+Mfx/rh+IZadLPbVQsip5K6PwMa5/FeFuK5iv43VKyn2SKQ T3SGp5FZ4EHVFOzuOS9aK18q7aXgJZ9+K8zAbbY4Hv1QanADFQuk0EcCpBk3w/gD 81MaP5POFHCdvo206XG+ZaXmPfraxZeIa/wKkOR5WfE/Hlgv+hJ2t1SrXGn7YIGX JJR5Lt3TWCT++zGVMZhh6Kl+axQY9sHNRXGP9uheUd3feCnHl2XM2aFeQvodacyG Vqw/5q7JIXZV7j2xay0BvdnRxnmHyAIHyugwOImFkOgvBtfTuvBT1iTJk7BpkYTI of2PNuNFBSfLMywtyl43FRV3sLsnRFh3xxRKD7HfoE5ltry1D0pXUXuYWSjXlAaI wLNrafcCdikwdkSvY0PBgJLXBJzoc1+dyzhbkc3L0n86PONx5375u/2PlZlQM3PG DHTZjApirLnvcMW1Su7W7n95XwK7Ymxuk46MgePjwFdACXb0kdNRcmwKMYeqyi0M tghP9Umfgrl8JBfdQ+fgYc1y+if2dIgGyYhH3qH9RAwu5VRBjYbY9FTJnk3J1A8M jWL0hPV+njr7UYTZ4CHNL9JVbzOSr1aNu//gXsqUA2QSlsJG2KQ= =sKvq -----END PGP SIGNATURE----- Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes Amlogic fixes for v4.18-rc - minor 64-bit DT fixes * tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: dts: meson-gxl: fix Mali GPU compatible string ARM64: dts: meson-axg: fix ethernet stability issue ARM64: dts: meson-gx: fix ATF reserved memory region ARM64: dts: meson-gxl-s905x-p212: Add phy-supply for usb0 ARM64: dts: meson: fix register ranges for SD/eMMC ARM64: dts: meson: disable sd-uhs modes on the libretech-cc Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
d2d369a961
|
@ -66,9 +66,22 @@
|
||||||
|
|
||||||
ðmac {
|
ðmac {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
phy-mode = "rgmii";
|
|
||||||
pinctrl-0 = <ð_rgmii_y_pins>;
|
pinctrl-0 = <ð_rgmii_y_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
phy-handle = <ð_phy0>;
|
||||||
|
phy-mode = "rgmii";
|
||||||
|
|
||||||
|
mdio {
|
||||||
|
compatible = "snps,dwmac-mdio";
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <0>;
|
||||||
|
|
||||||
|
eth_phy0: ethernet-phy@0 {
|
||||||
|
/* Realtek RTL8211F (0x001cc916) */
|
||||||
|
reg = <0>;
|
||||||
|
eee-broken-1000t;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart_A {
|
&uart_A {
|
||||||
|
|
|
@ -132,7 +132,7 @@
|
||||||
|
|
||||||
sd_emmc_b: sd@5000 {
|
sd_emmc_b: sd@5000 {
|
||||||
compatible = "amlogic,meson-axg-mmc";
|
compatible = "amlogic,meson-axg-mmc";
|
||||||
reg = <0x0 0x5000 0x0 0x2000>;
|
reg = <0x0 0x5000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
clocks = <&clkc CLKID_SD_EMMC_B>,
|
clocks = <&clkc CLKID_SD_EMMC_B>,
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
sd_emmc_c: mmc@7000 {
|
sd_emmc_c: mmc@7000 {
|
||||||
compatible = "amlogic,meson-axg-mmc";
|
compatible = "amlogic,meson-axg-mmc";
|
||||||
reg = <0x0 0x7000 0x0 0x2000>;
|
reg = <0x0 0x7000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
clocks = <&clkc CLKID_SD_EMMC_C>,
|
clocks = <&clkc CLKID_SD_EMMC_C>,
|
||||||
|
|
|
@ -35,6 +35,12 @@
|
||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
|
||||||
|
secmon_reserved_alt: secmon@5000000 {
|
||||||
|
reg = <0x0 0x05000000 0x0 0x300000>;
|
||||||
|
no-map;
|
||||||
|
};
|
||||||
|
|
||||||
linux,cma {
|
linux,cma {
|
||||||
compatible = "shared-dma-pool";
|
compatible = "shared-dma-pool";
|
||||||
reusable;
|
reusable;
|
||||||
|
@ -457,21 +463,21 @@
|
||||||
|
|
||||||
sd_emmc_a: mmc@70000 {
|
sd_emmc_a: mmc@70000 {
|
||||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||||
reg = <0x0 0x70000 0x0 0x2000>;
|
reg = <0x0 0x70000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
sd_emmc_b: mmc@72000 {
|
sd_emmc_b: mmc@72000 {
|
||||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||||
reg = <0x0 0x72000 0x0 0x2000>;
|
reg = <0x0 0x72000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
sd_emmc_c: mmc@74000 {
|
sd_emmc_c: mmc@74000 {
|
||||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||||
reg = <0x0 0x74000 0x0 0x2000>;
|
reg = <0x0 0x74000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
&apb {
|
&apb {
|
||||||
mali: gpu@c0000 {
|
mali: gpu@c0000 {
|
||||||
compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";
|
compatible = "amlogic,meson-gxl-mali", "arm,mali-450";
|
||||||
reg = <0x0 0xc0000 0x0 0x40000>;
|
reg = <0x0 0xc0000 0x0 0x40000>;
|
||||||
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|
|
@ -234,9 +234,6 @@
|
||||||
|
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
cap-sd-highspeed;
|
cap-sd-highspeed;
|
||||||
sd-uhs-sdr12;
|
|
||||||
sd-uhs-sdr25;
|
|
||||||
sd-uhs-sdr50;
|
|
||||||
max-frequency = <100000000>;
|
max-frequency = <100000000>;
|
||||||
disable-wp;
|
disable-wp;
|
||||||
|
|
||||||
|
|
|
@ -189,3 +189,10 @@
|
||||||
&usb0 {
|
&usb0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&usb2_phy0 {
|
||||||
|
/*
|
||||||
|
* HDMI_5V is also used as supply for the USB VBUS.
|
||||||
|
*/
|
||||||
|
phy-supply = <&hdmi_5v>;
|
||||||
|
};
|
||||||
|
|
|
@ -13,14 +13,6 @@
|
||||||
/ {
|
/ {
|
||||||
compatible = "amlogic,meson-gxl";
|
compatible = "amlogic,meson-gxl";
|
||||||
|
|
||||||
reserved-memory {
|
|
||||||
/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
|
|
||||||
secmon_reserved_alt: secmon@5000000 {
|
|
||||||
reg = <0x0 0x05000000 0x0 0x300000>;
|
|
||||||
no-map;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
soc {
|
soc {
|
||||||
usb0: usb@c9000000 {
|
usb0: usb@c9000000 {
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
|
Loading…
Reference in a new issue