Commit b274b49e authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v4.15-next-dts32' of...

Merge tag 'v4.15-next-dts32' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/dt

Pull "arm: Updates of armv7 DTS for v4.15-next" from Matthias Brugger:

- add reset cells mt2701 and mt7623 ethsys
- update mmc nodes for mt7623
- mt7623 change mmc card detection pin to active low
- mt7623 set unit address to lower case

* tag 'v4.15-next-dts32' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  dt-bindings: ARM: Mediatek: Fix ethsys documentation
  arm: mt7: dts: Remove leading 0x and 0s from bindings notation
  arm: dts: mt7623: fix card detection issue on bananapi-r2
  arm: dts: mt7623: update mmc related nodes with the appropriate fallback
  arm: dts: mt2701: Add reset-cells
  arm: dts: mt7623: Update ethsys binding
parents cd9787e8 a227cf4d
...@@ -20,4 +20,5 @@ ethsys: clock-controller@1b000000 { ...@@ -20,4 +20,5 @@ ethsys: clock-controller@1b000000 {
compatible = "mediatek,mt2701-ethsys", "syscon"; compatible = "mediatek,mt2701-ethsys", "syscon";
reg = <0 0x1b000000 0 0x1000>; reg = <0 0x1b000000 0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>;
}; };
...@@ -604,6 +604,7 @@ hifsys: syscon@1a000000 { ...@@ -604,6 +604,7 @@ hifsys: syscon@1a000000 {
compatible = "mediatek,mt2701-hifsys", "syscon"; compatible = "mediatek,mt2701-hifsys", "syscon";
reg = <0 0x1a000000 0 0x1000>; reg = <0 0x1a000000 0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>;
}; };
usb0: usb@1a1c0000 { usb0: usb@1a1c0000 {
...@@ -688,6 +689,7 @@ ethsys: syscon@1b000000 { ...@@ -688,6 +689,7 @@ ethsys: syscon@1b000000 {
compatible = "mediatek,mt2701-ethsys", "syscon"; compatible = "mediatek,mt2701-ethsys", "syscon";
reg = <0 0x1b000000 0 0x1000>; reg = <0 0x1b000000 0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>;
}; };
eth: ethernet@1b100000 { eth: ethernet@1b100000 {
......
...@@ -641,7 +641,7 @@ afe: audio-controller@11220000 { ...@@ -641,7 +641,7 @@ afe: audio-controller@11220000 {
mmc0: mmc@11230000 { mmc0: mmc@11230000 {
compatible = "mediatek,mt7623-mmc", compatible = "mediatek,mt7623-mmc",
"mediatek,mt8135-mmc"; "mediatek,mt2701-mmc";
reg = <0 0x11230000 0 0x1000>; reg = <0 0x11230000 0 0x1000>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_LOW>;
clocks = <&pericfg CLK_PERI_MSDC30_0>, clocks = <&pericfg CLK_PERI_MSDC30_0>,
...@@ -652,7 +652,7 @@ mmc0: mmc@11230000 { ...@@ -652,7 +652,7 @@ mmc0: mmc@11230000 {
mmc1: mmc@11240000 { mmc1: mmc@11240000 {
compatible = "mediatek,mt7623-mmc", compatible = "mediatek,mt7623-mmc",
"mediatek,mt8135-mmc"; "mediatek,mt2701-mmc";
reg = <0 0x11240000 0 0x1000>; reg = <0 0x11240000 0 0x1000>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_LOW>;
clocks = <&pericfg CLK_PERI_MSDC30_1>, clocks = <&pericfg CLK_PERI_MSDC30_1>,
...@@ -758,6 +758,7 @@ ethsys: syscon@1b000000 { ...@@ -758,6 +758,7 @@ ethsys: syscon@1b000000 {
"syscon"; "syscon";
reg = <0 0x1b000000 0 0x1000>; reg = <0 0x1b000000 0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>;
}; };
eth: ethernet@1b100000 { eth: ethernet@1b100000 {
......
...@@ -204,7 +204,7 @@ &mmc1 { ...@@ -204,7 +204,7 @@ &mmc1 {
bus-width = <4>; bus-width = <4>;
max-frequency = <50000000>; max-frequency = <50000000>;
cap-sd-highspeed; cap-sd-highspeed;
cd-gpios = <&pio 261 0>; cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
vmmc-supply = <&mt6323_vmch_reg>; vmmc-supply = <&mt6323_vmch_reg>;
vqmmc-supply = <&mt6323_vio18_reg>; vqmmc-supply = <&mt6323_vio18_reg>;
}; };
......
...@@ -51,7 +51,7 @@ partition@40000 { ...@@ -51,7 +51,7 @@ partition@40000 {
reg = <0x40000 0x80000>; reg = <0x40000 0x80000>;
}; };
partition@C0000 { partition@c0000 {
label = "uboot-env"; label = "uboot-env";
reg = <0xC0000 0x40000>; reg = <0xC0000 0x40000>;
}; };
......
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