Skip to content

Commit 08af78d

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A smaller batch for the end of the week (let's see if I can keep the weekly cadence going for once). All medium-grade fixes here, nothing worrisome: - Fixes for some fairly old bugs around SD card write-protect detection and GPIO interrupt assignments on Davinci. - Wifi module suspend fix for Hikey. - Minor DT tweaks to fix inaccuracies for Amlogic platforms, one of which solves booting with third-party u-boot" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: dts: hikey960: Define wl1837 power capabilities arm64: dts: hikey: Define wl1835 power capabilities 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 ARM: dts: da850: Fix interrups property for gpio ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD
2 parents 22d3e0c + 4ca2f0b commit 08af78d

File tree

11 files changed

+39
-24
lines changed

11 files changed

+39
-24
lines changed

‎arch/arm/boot/dts/da850.dtsi

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,7 @@
549549
gpio-controller;
550550
#gpio-cells = <2>;
551551
reg = <0x226000 0x1000>;
552-
interrupts = <42 IRQ_TYPE_EDGE_BOTH
553-
43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
554-
45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
555-
47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
556-
49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
552+
interrupts = <42 43 44 45 46 47 48 49 50>;
557553
ti,ngpio = <144>;
558554
ti,davinci-gpio-unbanked = <0>;
559555
status = "disabled";

‎arch/arm/mach-davinci/board-da850-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = {
774774
GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",
775775
GPIO_ACTIVE_LOW),
776776
GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",
777-
GPIO_ACTIVE_LOW),
777+
GPIO_ACTIVE_HIGH),
778778
},
779779
};
780780

‎arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,22 @@
6666

6767
&ethmac {
6868
status = "okay";
69-
phy-mode = "rgmii";
7069
pinctrl-0 = <&eth_rgmii_y_pins>;
7170
pinctrl-names = "default";
71+
phy-handle = <&eth_phy0>;
72+
phy-mode = "rgmii";
73+
74+
mdio {
75+
compatible = "snps,dwmac-mdio";
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
79+
eth_phy0: ethernet-phy@0 {
80+
/* Realtek RTL8211F (0x001cc916) */
81+
reg = <0>;
82+
eee-broken-1000t;
83+
};
84+
};
7285
};
7386

7487
&uart_A {

‎arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
sd_emmc_b: sd@5000 {
134134
compatible = "amlogic,meson-axg-mmc";
135-
reg = <0x0 0x5000 0x0 0x2000>;
135+
reg = <0x0 0x5000 0x0 0x800>;
136136
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
137137
status = "disabled";
138138
clocks = <&clkc CLKID_SD_EMMC_B>,
@@ -144,7 +144,7 @@
144144

145145
sd_emmc_c: mmc@7000 {
146146
compatible = "amlogic,meson-axg-mmc";
147-
reg = <0x0 0x7000 0x0 0x2000>;
147+
reg = <0x0 0x7000 0x0 0x800>;
148148
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
149149
status = "disabled";
150150
clocks = <&clkc CLKID_SD_EMMC_C>,

‎arch/arm64/boot/dts/amlogic/meson-gx.dtsi

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
no-map;
3636
};
3737

38+
/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
39+
secmon_reserved_alt: secmon@5000000 {
40+
reg = <0x0 0x05000000 0x0 0x300000>;
41+
no-map;
42+
};
43+
3844
linux,cma {
3945
compatible = "shared-dma-pool";
4046
reusable;
@@ -457,21 +463,21 @@
457463

458464
sd_emmc_a: mmc@70000 {
459465
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
460-
reg = <0x0 0x70000 0x0 0x2000>;
466+
reg = <0x0 0x70000 0x0 0x800>;
461467
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
462468
status = "disabled";
463469
};
464470

465471
sd_emmc_b: mmc@72000 {
466472
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
467-
reg = <0x0 0x72000 0x0 0x2000>;
473+
reg = <0x0 0x72000 0x0 0x800>;
468474
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
469475
status = "disabled";
470476
};
471477

472478
sd_emmc_c: mmc@74000 {
473479
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
474-
reg = <0x0 0x74000 0x0 0x2000>;
480+
reg = <0x0 0x74000 0x0 0x800>;
475481
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
476482
status = "disabled";
477483
};

‎arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
&apb {
88
mali: gpu@c0000 {
9-
compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";
9+
compatible = "amlogic,meson-gxl-mali", "arm,mali-450";
1010
reg = <0x0 0xc0000 0x0 0x40000>;
1111
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
1212
<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@
234234

235235
bus-width = <4>;
236236
cap-sd-highspeed;
237-
sd-uhs-sdr12;
238-
sd-uhs-sdr25;
239-
sd-uhs-sdr50;
240237
max-frequency = <100000000>;
241238
disable-wp;
242239

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,10 @@
189189
&usb0 {
190190
status = "okay";
191191
};
192+
193+
&usb2_phy0 {
194+
/*
195+
* HDMI_5V is also used as supply for the USB VBUS.
196+
*/
197+
phy-supply = <&hdmi_5v>;
198+
};

‎arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
/ {
1414
compatible = "amlogic,meson-gxl";
1515

16-
reserved-memory {
17-
/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
18-
secmon_reserved_alt: secmon@5000000 {
19-
reg = <0x0 0x05000000 0x0 0x300000>;
20-
no-map;
21-
};
22-
};
23-
2416
soc {
2517
usb0: usb@c9000000 {
2618
status = "disabled";

‎arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,8 @@
585585
vmmc-supply = <&wlan_en>;
586586
ti,non-removable;
587587
non-removable;
588+
cap-power-off-card;
589+
keep-power-in-suspend;
588590
#address-cells = <0x1>;
589591
#size-cells = <0x0>;
590592
status = "ok";

‎arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@
322322
dwmmc_2: dwmmc2@f723f000 {
323323
bus-width = <0x4>;
324324
non-removable;
325+
cap-power-off-card;
326+
keep-power-in-suspend;
325327
vmmc-supply = <&reg_vdd_3v3>;
326328
mmc-pwrseq = <&wl1835_pwrseq>;
327329

0 commit comments

Comments
 (0)