tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 08af78d7 22d3e0c3

+39 -24
+1 -5
arch/arm/boot/dts/da850.dtsi
··· 549 549 gpio-controller; 550 550 #gpio-cells = <2>; 551 551 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>; 557 553 ti,ngpio = <144>; 558 554 ti,davinci-gpio-unbanked = <0>; 559 555 status = "disabled";
+1 -1
arch/arm/mach-davinci/board-da850-evm.c
··· 774 774 GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd", 775 775 GPIO_ACTIVE_LOW), 776 776 GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp", 777 - GPIO_ACTIVE_LOW), 777 + GPIO_ACTIVE_HIGH), 778 778 }, 779 779 }; 780 780
+14 -1
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
··· 66 66 67 67 &ethmac { 68 68 status = "okay"; 69 - phy-mode = "rgmii"; 70 69 pinctrl-0 = <&eth_rgmii_y_pins>; 71 70 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 + }; 72 85 }; 73 86 74 87 &uart_A {
+2 -2
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
··· 132 132 133 133 sd_emmc_b: sd@5000 { 134 134 compatible = "amlogic,meson-axg-mmc"; 135 - reg = <0x0 0x5000 0x0 0x2000>; 135 + reg = <0x0 0x5000 0x0 0x800>; 136 136 interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; 137 137 status = "disabled"; 138 138 clocks = <&clkc CLKID_SD_EMMC_B>, ··· 144 144 145 145 sd_emmc_c: mmc@7000 { 146 146 compatible = "amlogic,meson-axg-mmc"; 147 - reg = <0x0 0x7000 0x0 0x2000>; 147 + reg = <0x0 0x7000 0x0 0x800>; 148 148 interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>; 149 149 status = "disabled"; 150 150 clocks = <&clkc CLKID_SD_EMMC_C>,
+9 -3
arch/arm64/boot/dts/amlogic/meson-gx.dtsi
··· 35 35 no-map; 36 36 }; 37 37 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 + 38 44 linux,cma { 39 45 compatible = "shared-dma-pool"; 40 46 reusable; ··· 463 457 464 458 sd_emmc_a: mmc@70000 { 465 459 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; 466 - reg = <0x0 0x70000 0x0 0x2000>; 460 + reg = <0x0 0x70000 0x0 0x800>; 467 461 interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; 468 462 status = "disabled"; 469 463 }; 470 464 471 465 sd_emmc_b: mmc@72000 { 472 466 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; 473 - reg = <0x0 0x72000 0x0 0x2000>; 467 + reg = <0x0 0x72000 0x0 0x800>; 474 468 interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; 475 469 status = "disabled"; 476 470 }; 477 471 478 472 sd_emmc_c: mmc@74000 { 479 473 compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; 480 - reg = <0x0 0x74000 0x0 0x2000>; 474 + reg = <0x0 0x74000 0x0 0x800>; 481 475 interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>; 482 476 status = "disabled"; 483 477 };
+1 -1
arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
··· 6 6 7 7 &apb { 8 8 mali: gpu@c0000 { 9 - compatible = "amlogic,meson-gxbb-mali", "arm,mali-450"; 9 + compatible = "amlogic,meson-gxl-mali", "arm,mali-450"; 10 10 reg = <0x0 0xc0000 0x0 0x40000>; 11 11 interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, 12 12 <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
-3
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
··· 234 234 235 235 bus-width = <4>; 236 236 cap-sd-highspeed; 237 - sd-uhs-sdr12; 238 - sd-uhs-sdr25; 239 - sd-uhs-sdr50; 240 237 max-frequency = <100000000>; 241 238 disable-wp; 242 239
+7
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
··· 189 189 &usb0 { 190 190 status = "okay"; 191 191 }; 192 + 193 + &usb2_phy0 { 194 + /* 195 + * HDMI_5V is also used as supply for the USB VBUS. 196 + */ 197 + phy-supply = <&hdmi_5v>; 198 + };
-8
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
··· 13 13 / { 14 14 compatible = "amlogic,meson-gxl"; 15 15 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 - 24 16 soc { 25 17 usb0: usb@c9000000 { 26 18 status = "disabled";
+2
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
··· 585 585 vmmc-supply = <&wlan_en>; 586 586 ti,non-removable; 587 587 non-removable; 588 + cap-power-off-card; 589 + keep-power-in-suspend; 588 590 #address-cells = <0x1>; 589 591 #size-cells = <0x0>; 590 592 status = "ok";
+2
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
··· 322 322 dwmmc_2: dwmmc2@f723f000 { 323 323 bus-width = <0x4>; 324 324 non-removable; 325 + cap-power-off-card; 326 + keep-power-in-suspend; 325 327 vmmc-supply = <&reg_vdd_3v3>; 326 328 mmc-pwrseq = <&wl1835_pwrseq>; 327 329