Skip to content

L
linux
Commit 83d36515 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'amlogic-fixes-2.1' of... 

Merge tag 'amlogic-fixes-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

Amlogic fixes for v5.0-rc, round 2
- several fixups for the GPIO cd-inverted change
- IRQ trigger fixes for MAC IRQ

* tag 'amlogic-fixes-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: Fix mmc cd-gpios polarity
  ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low
  ARM: dts: meson8b: ec100: mark the SD card detection GPIO active-low
  ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO active-low
  arm: dts: meson: Fix IRQ trigger type for macirq
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 46edb8d1 f29200c8
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 36 deletions
arch/arm/boot/dts/meson.dtsi
View file @ 83d36515
...@@ -274,7 +274,7 @@ ethmac: ethernet@c9410000 { ...@@ -274,7 +274,7 @@ ethmac: ethernet@c9410000 {
compatible = "amlogic,meson6-dwmac", "snps,dwmac"; compatible = "amlogic,meson6-dwmac", "snps,dwmac";
reg = <0xc9410000 0x10000 reg = <0xc9410000 0x10000
0xc1108108 0x4>; 0xc1108108 0x4>;
interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq"; interrupt-names = "macirq";
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/meson8b-ec100.dts
View file @ 83d36515
...@@ -205,8 +205,7 @@ sd_card_slot: slot@1 { ...@@ -205,8 +205,7 @@ sd_card_slot: slot@1 {
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vcc_3v3>;
}; };
......
arch/arm/boot/dts/meson8b-odroidc1.dts
View file @ 83d36515
...@@ -221,7 +221,6 @@ mdio { ...@@ -221,7 +221,6 @@ mdio {
/* Realtek RTL8211F (0x001cc916) */ /* Realtek RTL8211F (0x001cc916) */
eth_phy: ethernet-phy@0 { eth_phy: ethernet-phy@0 {
reg = <0>; reg = <0>;
eee-broken-1000t;
interrupt-parent = <&gpio_intc>; interrupt-parent = <&gpio_intc>;
/* GPIOH_3 */ /* GPIOH_3 */
interrupts = <17 IRQ_TYPE_LEVEL_LOW>; interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
...@@ -273,8 +272,7 @@ sd_card_slot: slot@1 { ...@@ -273,8 +272,7 @@ sd_card_slot: slot@1 {
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&tflash_vdd>; vmmc-supply = <&tflash_vdd>;
vqmmc-supply = <&tf_io>; vqmmc-supply = <&tf_io>;
......
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
View file @ 83d36515
...@@ -206,8 +206,7 @@ sd_card_slot: slot@1 { ...@@ -206,8 +206,7 @@ sd_card_slot: slot@1 {
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vcc_3v3>;
}; };
......
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
View file @ 83d36515
...@@ -187,8 +187,7 @@ &sd_emmc_b { ...@@ -187,8 +187,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>; vqmmc-supply = <&vddio_boot>;
......
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
View file @ 83d36515
...@@ -305,8 +305,7 @@ &sd_emmc_b { ...@@ -305,8 +305,7 @@ &sd_emmc_b {
max-frequency = <200000000>; max-frequency = <200000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddio_ao3v3>; vmmc-supply = <&vddio_ao3v3>;
vqmmc-supply = <&vddio_tf>; vqmmc-supply = <&vddio_tf>;
......
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
View file @ 83d36515
...@@ -238,8 +238,7 @@ &sd_emmc_b { ...@@ -238,8 +238,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_card>; vqmmc-supply = <&vddio_card>;
......
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
View file @ 83d36515
...@@ -258,8 +258,7 @@ &sd_emmc_b { ...@@ -258,8 +258,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&tflash_vdd>; vmmc-supply = <&tflash_vdd>;
vqmmc-supply = <&tf_io>; vqmmc-supply = <&tf_io>;
......
arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
View file @ 83d36515
...@@ -196,8 +196,7 @@ &sd_emmc_b { ...@@ -196,8 +196,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_card>; vqmmc-supply = <&vddio_card>;
......
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
View file @ 83d36515
...@@ -154,8 +154,7 @@ &sd_emmc_b { ...@@ -154,8 +154,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vcc_3v3>;
}; };
......
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
View file @ 83d36515
...@@ -211,8 +211,7 @@ &sd_emmc_b { ...@@ -211,8 +211,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vcc_3v3>; vqmmc-supply = <&vcc_3v3>;
......
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
View file @ 83d36515
...@@ -131,8 +131,7 @@ &sd_emmc_b { ...@@ -131,8 +131,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_card>; vqmmc-supply = <&vddio_card>;
......
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
View file @ 83d36515
...@@ -238,8 +238,7 @@ &sd_emmc_b { ...@@ -238,8 +238,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vcc_card>; vqmmc-supply = <&vcc_card>;
......
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
View file @ 83d36515
...@@ -183,8 +183,7 @@ &sd_emmc_b { ...@@ -183,8 +183,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_card>; vqmmc-supply = <&vddio_card>;
......
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
View file @ 83d36515
...@@ -137,8 +137,7 @@ &sd_emmc_b { ...@@ -137,8 +137,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>; vqmmc-supply = <&vddio_boot>;
......
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
View file @ 83d36515
...@@ -356,8 +356,7 @@ &sd_emmc_b { ...@@ -356,8 +356,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>; vqmmc-supply = <&vddio_boot>;
......
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
View file @ 83d36515
...@@ -147,8 +147,7 @@ &sd_emmc_b { ...@@ -147,8 +147,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>; vqmmc-supply = <&vddio_boot>;
......
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
View file @ 83d36515
...@@ -170,8 +170,7 @@ &sd_emmc_b { ...@@ -170,8 +170,7 @@ &sd_emmc_b {
max-frequency = <100000000>; max-frequency = <100000000>;
disable-wp; disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
cd-inverted;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>; vqmmc-supply = <&vddio_boot>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7