Skip to content

Commit 4d3639a

Browse files
torvaldstorvalds
committed
Merge tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A batch of fixes that have come in during the merge window. Some of them are defconfig updates for things that have now landed, some errata additions and a few general scattered fixes. There's also a qcom DT update that adds support for SATA on AP148, and basic support for Sony Xperia Z1 and CM-QS600 platforms that seemed isolated enough that we could merge it even if it's late" * tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: corrected bcm2835 search ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa ARM: dts: Explicitly set dr_mode on exynos Peach boards ARM: dts: qcom: add CM-QS600 board ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone ARM: dts: qcom: Add SATA support on IPQ8064/AP148 MAINTAINERS: Update Santosh Shilimkar's email id ARM: sunxi_defconfig: enable CONFIG_REGULATOR ARM: dts: Disable smc91x on n900 until bootloader dependency is removed ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3 ARM: exynos_defconfig: enable USB gadget support ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n ARM: SAMSUNG: Restore Samsung PM Debug functionality ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12 ARM: exynos_defconfig: Enable SBS battery support ARM: exynos_defconfig: Enable Control Groups support ARM: exynos_defconfig: Enable Atmel maXTouch support ARM: exynos_defconfig: Enable MAX77802
2 parents ab074ad + 5776451 commit 4d3639a

20 files changed

+176
-20
lines changed

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation
140140
smsc Standard Microsystems Corporation
141141
snps Synopsys, Inc.
142142
solidrun SolidRun
143+
sony Sony Corporation
143144
spansion Spansion Inc.
144145
st STMicroelectronics
145146
ste ST-Ericsson

‎MAINTAINERS

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,33 +1088,33 @@ L: [email protected] (moderated for non-subscribers)
10881088
S: Maintained
10891089

10901090
ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
1091-
M: Santosh Shilimkar <[email protected]>
1091+
M: Santosh Shilimkar <[email protected]>
10921092
L: [email protected] (moderated for non-subscribers)
10931093
S: Maintained
10941094
F: arch/arm/mach-keystone/
10951095
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
10961096

10971097
ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
1098-
M: Santosh Shilimkar <[email protected]>
1098+
M: Santosh Shilimkar <[email protected]>
10991099
L: [email protected]
11001100
S: Maintained
11011101
F: drivers/clk/keystone/
11021102

11031103
ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
1104-
M: Santosh Shilimkar <[email protected]>
1104+
M: Santosh Shilimkar <[email protected]>
11051105
L: [email protected] (moderated for non-subscribers)
11061106
L: [email protected]
11071107
S: Maintained
11081108
F: drivers/clocksource/timer-keystone.c
11091109

11101110
ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
1111-
M: Santosh Shilimkar <[email protected]>
1111+
M: Santosh Shilimkar <[email protected]>
11121112
L: [email protected]
11131113
S: Maintained
11141114
F: drivers/power/reset/keystone-reset.c
11151115

11161116
ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
1117-
M: Santosh Shilimkar <[email protected]>
1117+
M: Santosh Shilimkar <[email protected]>
11181118
L: [email protected]
11191119
S: Maintained
11201120
F: drivers/memory/*emif*
@@ -2062,17 +2062,14 @@ F: arch/arm/configs/bcm_defconfig
20622062
F: drivers/mmc/host/sdhci-bcm-kona.c
20632063
F: drivers/clocksource/bcm_kona_timer.c
20642064

2065-
BROADCOM BCM2835 ARM ARCHICTURE
2065+
BROADCOM BCM2835 ARM ARCHITECTURE
20662066
M: Stephen Warren <[email protected]>
20672067
L: [email protected] (moderated for non-subscribers)
20682068
T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
20692069
S: Maintained
2070-
F: arch/arm/mach-bcm/board_bcm2835.c
2071-
F: arch/arm/boot/dts/bcm2835*
2072-
F: arch/arm/configs/bcm2835_defconfig
2073-
F: drivers/*/*bcm2835*
2070+
N: bcm2835
20742071

2075-
BROADCOM BCM5301X ARM ARCHICTURE
2072+
BROADCOM BCM5301X ARM ARCHITECTURE
20762073
M: Hauke Mehrtens <[email protected]>
20772074
L: [email protected]
20782075
S: Maintained
@@ -6687,7 +6684,7 @@ F: arch/arm/*omap*/usb*
66876684

66886685
OMAP GPIO DRIVER
66896686
M: Javier Martinez Canillas <[email protected]>
6690-
M: Santosh Shilimkar <[email protected]>
6687+
M: Santosh Shilimkar <[email protected]>
66916688
M: Kevin Hilman <[email protected]>
66926689
L: [email protected]
66936690
S: Maintained
@@ -9274,7 +9271,7 @@ F: drivers/mmc/host/tifm_sd.c
92749271
F: include/linux/tifm.h
92759272

92769273
TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
9277-
M: Santosh Shilimkar <[email protected]>
9274+
M: Santosh Shilimkar <[email protected]>
92789275
L: [email protected]
92799276
L: [email protected] (moderated for non-subscribers)
92809277
S: Maintained

‎arch/arm/boot/dts/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,15 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
354354
orion5x-rd88f5182-nas.dtb
355355
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
356356
dtb-$(CONFIG_ARCH_QCOM) += \
357+
qcom-apq8064-cm-qs600.dtb \
357358
qcom-apq8064-ifc6410.dtb \
358359
qcom-apq8074-dragonboard.dtb \
359360
qcom-apq8084-ifc6540.dtb \
360361
qcom-apq8084-mtp.dtb \
361362
qcom-ipq8064-ap148.dtb \
362363
qcom-msm8660-surf.dtb \
363-
qcom-msm8960-cdp.dtb
364+
qcom-msm8960-cdp.dtb \
365+
qcom-msm8974-sony-xperia-honami.dtb
364366
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
365367
rk3066a-bqcurie2.dtb \
366368
rk3188-radxarock.dtb \

‎arch/arm/boot/dts/exynos4x12-pinctrl.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@
675675
sd4_bus8: sd4-bus-width8 {
676676
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
677677
samsung,pin-function = <4>;
678-
samsung,pin-pud = <4>;
678+
samsung,pin-pud = <3>;
679679
samsung,pin-drv = <3>;
680680
};
681681

‎arch/arm/boot/dts/exynos5420-arndale-octa.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,3 +368,7 @@
368368
};
369369
};
370370
};
371+
372+
&usbdrd_dwc3_1 {
373+
dr_mode = "host";
374+
};

‎arch/arm/boot/dts/exynos5420-peach-pit.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,14 @@
838838
status = "okay";
839839
};
840840

841+
&usbdrd_dwc3_0 {
842+
dr_mode = "host";
843+
};
844+
845+
&usbdrd_dwc3_1 {
846+
dr_mode = "host";
847+
};
848+
841849
&usbdrd_phy0 {
842850
vbus-supply = <&usb300_vbus_reg>;
843851
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@
815815
#size-cells = <1>;
816816
ranges;
817817

818-
dwc3 {
818+
usbdrd_dwc3_0: dwc3 {
819819
compatible = "snps,dwc3";
820820
reg = <0x12000000 0x10000>;
821821
interrupts = <0 72 0>;
@@ -841,7 +841,7 @@
841841
#size-cells = <1>;
842842
ranges;
843843

844-
dwc3 {
844+
usbdrd_dwc3_1: dwc3 {
845845
compatible = "snps,dwc3";
846846
reg = <0x12400000 0x10000>;
847847
interrupts = <0 73 0>;

‎arch/arm/boot/dts/exynos5800-peach-pi.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,14 @@
826826
status = "okay";
827827
};
828828

829+
&usbdrd_dwc3_0 {
830+
dr_mode = "host";
831+
};
832+
833+
&usbdrd_dwc3_1 {
834+
dr_mode = "host";
835+
};
836+
829837
&usbdrd_phy0 {
830838
vbus-supply = <&usb300_vbus_reg>;
831839
};

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,9 @@
659659

660660
ethernet@gpmc {
661661
compatible = "smsc,lan91c94";
662+
663+
status = "disabled";
664+
662665
interrupt-parent = <&gpio2>;
663666
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
664667
reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */

‎arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#include "qcom-apq8064-v2.0.dtsi"
2+
3+
/ {
4+
model = "CompuLab CM-QS600";
5+
compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";
6+
7+
soc {
8+
pinctrl@800000 {
9+
i2c1_pins: i2c1 {
10+
mux {
11+
pins = "gpio20", "gpio21";
12+
function = "gsbi1";
13+
};
14+
};
15+
};
16+
17+
gsbi@12440000 {
18+
status = "okay";
19+
qcom,mode = <GSBI_PROT_I2C>;
20+
21+
i2c@12460000 {
22+
status = "okay";
23+
clock-frequency = <200000>;
24+
pinctrl-0 = <&i2c1_pins>;
25+
pinctrl-names = "default";
26+
27+
eeprom: eeprom@50 {
28+
compatible = "24c02";
29+
reg = <0x50>;
30+
pagesize = <32>;
31+
};
32+
};
33+
};
34+
35+
gsbi@16600000 {
36+
status = "ok";
37+
qcom,mode = <GSBI_PROT_I2C_UART>;
38+
serial@16640000 {
39+
status = "ok";
40+
};
41+
};
42+
43+
amba {
44+
/* eMMC */
45+
sdcc1: sdcc@12400000 {
46+
status = "okay";
47+
};
48+
49+
/* External micro SD card */
50+
sdcc3: sdcc@12180000 {
51+
status = "okay";
52+
};
53+
/* WLAN */
54+
sdcc4: sdcc@121c0000 {
55+
status = "okay";
56+
};
57+
};
58+
};
59+
};

0 commit comments

Comments
 (0)