Skip to content

Commit e4c0da2

Browse files
torvaldstorvalds
committed
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "Here's a set of patches for (hopefully) -rc1. Some of them are fixes, but a good number of them also do things such as enable new drivers in the defconfigs for platforms that have such devices, increases coverage of the multiplatform defconfig and some DTS changes that plumbs up some of the devices that now have bindings and driver support. The commit dates are recent; we've mostly collected these fixes in the last few days but I also had to rebuild the branch yesterday to sort out some internal conflicts which reset the timestamps. The changes should have been tested by each platform maintainer already (and few of them have cross-platform impact) so I'm personally not too concerned by it at this time" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA ARM: multi_v7_defconfig: add mvebu drivers clocksource: kona: Add basic use of external clock drivers: bus: fix CCI driver kcalloc call parameters swap ARM: dts: bcm28155-ap: Fix Card Detection GPIO ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers ARM: dts: zynq: Add SDHCI nodes ARM: hisi: don't select SMP ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS ARM: multi_v7: copy most options from tegra_defconfig ARM: iop32x: fix power off handling for the EM7210 board ARM: integrator: restore static map on the CP ARM: msm_defconfig: Enable MSM clock drivers ARM: dts: msm: Add clock controller nodes and hook into uart ARM: OMAP4+: move errata initialization to omap4_pm_init_early ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP) ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference ...
2 parents 5cb480f + f39aa27 commit e4c0da2

31 files changed

+396
-57
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -868,14 +868,7 @@ F: arch/arm/mach-prima2/
868868
F: drivers/clk/clk-prima2.c
869869
F: drivers/clocksource/timer-prima2.c
870870
F: drivers/clocksource/timer-marco.c
871-
F: drivers/dma/sirf-dma.c
872-
F: drivers/i2c/busses/i2c-sirf.c
873-
F: drivers/input/misc/sirfsoc-onkey.c
874-
F: drivers/irqchip/irq-sirfsoc.c
875-
F: drivers/mmc/host/sdhci-sirf.c
876-
F: drivers/pinctrl/sirf/
877-
F: drivers/rtc/rtc-sirfsoc.c
878-
F: drivers/spi/spi-sirf.c
871+
N: [^a-z]sirf
879872

880873
ARM/EBSA110 MACHINE SUPPORT
881874
M: Russell King <linux@arm.linux.org.uk>

‎arch/arm/boot/dts/bcm28155-ap.dts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
/dts-v1/;
1515

16+
#include <dt-bindings/gpio/gpio.h>
17+
1618
#include "bcm11351.dtsi"
1719

1820
/ {
@@ -60,7 +62,7 @@
6062

6163
sdio4: sdio@3f1b0000 {
6264
max-frequency = <48000000>;
63-
cd-gpios = <&gpio 14 0>;
65+
cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
6466
status = "okay";
6567
};
6668

‎arch/arm/boot/dts/qcom-msm8660-surf.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/include/ "skeleton.dtsi"
44

5+
#include <dt-bindings/clock/qcom,gcc-msm8660.h>
6+
57
/ {
68
model = "Qualcomm MSM8660 SURF";
79
compatible = "qcom,msm8660-surf", "qcom,msm8660";
@@ -37,11 +39,20 @@
3739
#interrupt-cells = <2>;
3840
};
3941

42+
gcc: clock-controller@900000 {
43+
compatible = "qcom,gcc-msm8660";
44+
#clock-cells = <1>;
45+
#reset-cells = <1>;
46+
reg = <0x900000 0x4000>;
47+
};
48+
4049
serial@19c40000 {
4150
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
4251
reg = <0x19c40000 0x1000>,
4352
<0x19c00000 0x1000>;
4453
interrupts = <0 195 0x0>;
54+
clocks = <&gcc GSBI12_UART_CLK>, <&gcc GSBI12_H_CLK>;
55+
clock-names = "core", "iface";
4556
};
4657

4758
qcom,ssbi@500000 {

‎arch/arm/boot/dts/qcom-msm8960-cdp.dts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/include/ "skeleton.dtsi"
44

5+
#include <dt-bindings/clock/qcom,gcc-msm8960.h>
6+
57
/ {
68
model = "Qualcomm MSM8960 CDP";
79
compatible = "qcom,msm8960-cdp", "qcom,msm8960";
@@ -37,11 +39,27 @@
3739
reg = <0x800000 0x4000>;
3840
};
3941

42+
gcc: clock-controller@900000 {
43+
compatible = "qcom,gcc-msm8960";
44+
#clock-cells = <1>;
45+
#reset-cells = <1>;
46+
reg = <0x900000 0x4000>;
47+
};
48+
49+
clock-controller@4000000 {
50+
compatible = "qcom,mmcc-msm8960";
51+
reg = <0x4000000 0x1000>;
52+
#clock-cells = <1>;
53+
#reset-cells = <1>;
54+
};
55+
4056
serial@16440000 {
4157
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
4258
reg = <0x16440000 0x1000>,
4359
<0x16400000 0x1000>;
4460
interrupts = <0 154 0x0>;
61+
clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
62+
clock-names = "core", "iface";
4563
};
4664

4765
qcom,ssbi@500000 {

‎arch/arm/boot/dts/qcom-msm8974.dtsi

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "skeleton.dtsi"
44

5+
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
6+
57
/ {
68
model = "Qualcomm MSM8974";
79
compatible = "qcom,msm8974";
@@ -93,5 +95,27 @@
9395
compatible = "qcom,pshold";
9496
reg = <0xfc4ab000 0x4>;
9597
};
98+
99+
gcc: clock-controller@fc400000 {
100+
compatible = "qcom,gcc-msm8974";
101+
#clock-cells = <1>;
102+
#reset-cells = <1>;
103+
reg = <0xfc400000 0x4000>;
104+
};
105+
106+
mmcc: clock-controller@fd8c0000 {
107+
compatible = "qcom,mmcc-msm8974";
108+
#clock-cells = <1>;
109+
#reset-cells = <1>;
110+
reg = <0xfd8c0000 0x6000>;
111+
};
112+
113+
serial@f991e000 {
114+
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
115+
reg = <0xf991e000 0x1000>;
116+
interrupts = <0 108 0x0>;
117+
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
118+
clock-names = "core", "iface";
119+
};
96120
};
97121
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
reg = <0 0xe6508000 0 0x40>;
198198
interrupt-parent = <&gic>;
199199
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
200-
clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
200+
clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
201201
status = "disabled";
202202
};
203203

@@ -208,7 +208,7 @@
208208
reg = <0 0xe6518000 0 0x40>;
209209
interrupt-parent = <&gic>;
210210
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
211-
clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
211+
clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
212212
status = "disabled";
213213
};
214214

@@ -219,7 +219,7 @@
219219
reg = <0 0xe6530000 0 0x40>;
220220
interrupt-parent = <&gic>;
221221
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
222-
clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
222+
clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
223223
status = "disabled";
224224
};
225225

@@ -230,7 +230,7 @@
230230
reg = <0 0xe6540000 0 0x40>;
231231
interrupt-parent = <&gic>;
232232
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
233-
clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
233+
clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
234234
status = "disabled";
235235
};
236236

‎arch/arm/boot/dts/zynq-7000.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,26 @@
102102
clock-names = "pclk", "hclk", "tx_clk";
103103
};
104104

105+
sdhci0: ps7-sdhci@e0100000 {
106+
compatible = "arasan,sdhci-8.9a";
107+
status = "disabled";
108+
clock-names = "clk_xin", "clk_ahb";
109+
clocks = <&clkc 21>, <&clkc 32>;
110+
interrupt-parent = <&intc>;
111+
interrupts = <0 24 4>;
112+
reg = <0xe0100000 0x1000>;
113+
} ;
114+
115+
sdhci1: ps7-sdhci@e0101000 {
116+
compatible = "arasan,sdhci-8.9a";
117+
status = "disabled";
118+
clock-names = "clk_xin", "clk_ahb";
119+
clocks = <&clkc 22>, <&clkc 33>;
120+
interrupt-parent = <&intc>;
121+
interrupts = <0 47 4>;
122+
reg = <0xe0101000 0x1000>;
123+
} ;
124+
105125
slcr: slcr@f8000000 {
106126
compatible = "xlnx,zynq-slcr";
107127
reg = <0xF8000000 0x1000>;

‎arch/arm/boot/dts/zynq-zc702.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
phy-mode = "rgmii";
3535
};
3636

37+
&sdhci0 {
38+
status = "okay";
39+
};
40+
3741
&uart1 {
3842
status = "okay";
3943
};

‎arch/arm/boot/dts/zynq-zc706.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
phy-mode = "rgmii";
3636
};
3737

38+
&sdhci0 {
39+
status = "okay";
40+
};
41+
3842
&uart1 {
3943
status = "okay";
4044
};

‎arch/arm/boot/dts/zynq-zed.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
phy-mode = "rgmii";
3636
};
3737

38+
&sdhci0 {
39+
status = "okay";
40+
};
41+
3842
&uart1 {
3943
status = "okay";
4044
};

‎arch/arm/configs/keystone_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ CONFIG_USB_DWC3_DEBUG=y
142142
CONFIG_USB_DWC3_VERBOSE=y
143143
CONFIG_KEYSTONE_USB_PHY=y
144144
CONFIG_DMADEVICES=y
145+
CONFIG_TI_EDMA=y
145146
CONFIG_COMMON_CLK_DEBUG=y
146147
CONFIG_MEMORY=y
147148
CONFIG_EXT4_FS=y

‎arch/arm/configs/msm_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ CONFIG_USB_GADGET_VBUS_DRAW=500
114114
CONFIG_NEW_LEDS=y
115115
CONFIG_RTC_CLASS=y
116116
CONFIG_STAGING=y
117+
CONFIG_COMMON_CLK_QCOM=y
118+
CONFIG_MSM_GCC_8660=y
119+
CONFIG_MSM_MMCC_8960=y
120+
CONFIG_MSM_MMCC_8974=y
117121
CONFIG_MSM_IOMMU=y
118122
CONFIG_EXT2_FS=y
119123
CONFIG_EXT2_FS_XATTR=y

0 commit comments

Comments
 (0)