Commit 1dbb36bc authored by Olof Johansson's avatar Olof Johansson

Merge tag 'berlin-fixes-for-3.19-1' of...

Merge tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into fixes

Merge "ARM: berlin: Fixes for v3.19 (round 1)" from Sebastian Hesselbarth:

Marvell Berlin fixes for v3.19 round 1:
- SDHCI DT fixes for BG2Q and BG2Q reference board
- BG2Q SM GPIO DT node relocation

* tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: correct BG2Q's SM GPIO location.
  ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
  ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 259e4384 5138d5c5
...@@ -65,6 +65,8 @@ &sdhci1 { ...@@ -65,6 +65,8 @@ &sdhci1 {
}; };
&sdhci2 { &sdhci2 {
broken-cd;
bus-width = <8>;
non-removable; non-removable;
status = "okay"; status = "okay";
}; };
......
...@@ -83,7 +83,8 @@ sdhci2: sdhci@ab1000 { ...@@ -83,7 +83,8 @@ sdhci2: sdhci@ab1000 {
compatible = "mrvl,pxav3-mmc"; compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>; reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_SDIO1XIN>; clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>;
clock-names = "io", "core";
status = "disabled"; status = "disabled";
}; };
...@@ -348,36 +349,6 @@ aic: interrupt-controller@3800 { ...@@ -348,36 +349,6 @@ aic: interrupt-controller@3800 {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
}; };
gpio4: gpio@5000 {
compatible = "snps,dw-apb-gpio";
reg = <0x5000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porte: gpio-port@4 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
};
};
gpio5: gpio@c000 {
compatible = "snps,dw-apb-gpio";
reg = <0xc000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portf: gpio-port@5 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
};
};
}; };
chip: chip-control@ea0000 { chip: chip-control@ea0000 {
...@@ -466,6 +437,21 @@ apb@fc0000 { ...@@ -466,6 +437,21 @@ apb@fc0000 {
ranges = <0 0xfc0000 0x10000>; ranges = <0 0xfc0000 0x10000>;
interrupt-parent = <&sic>; interrupt-parent = <&sic>;
sm_gpio1: gpio@5000 {
compatible = "snps,dw-apb-gpio";
reg = <0x5000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portf: gpio-port@5 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
};
};
i2c2: i2c@7000 { i2c2: i2c@7000 {
compatible = "snps,designware-i2c"; compatible = "snps,designware-i2c";
#address-cells = <1>; #address-cells = <1>;
...@@ -516,6 +502,21 @@ uart1: uart@a000 { ...@@ -516,6 +502,21 @@ uart1: uart@a000 {
status = "disabled"; status = "disabled";
}; };
sm_gpio0: gpio@c000 {
compatible = "snps,dw-apb-gpio";
reg = <0xc000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porte: gpio-port@4 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
};
};
sysctrl: pin-controller@d000 { sysctrl: pin-controller@d000 {
compatible = "marvell,berlin2q-system-ctrl"; compatible = "marvell,berlin2q-system-ctrl";
reg = <0xd000 0x100>; reg = <0xd000 0x100>;
......
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