aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
-rw-r--r--MAINTAINERS23
-rw-r--r--arch/arm/boot/dts/Makefile4
-rw-r--r--arch/arm/boot/dts/exynos4x12-pinctrl.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5420-arndale-octa.dts4
-rw-r--r--arch/arm/boot/dts/exynos5420-peach-pit.dts8
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos5800-peach-pi.dts8
-rw-r--r--arch/arm/boot/dts/omap3-n900.dts3
-rw-r--r--arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts59
-rw-r--r--arch/arm/boot/dts/qcom-ipq8064-ap148.dts8
-rw-r--r--arch/arm/boot/dts/qcom-ipq8064.dtsi33
-rw-r--r--arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts17
-rw-r--r--arch/arm/configs/exynos_defconfig10
-rw-r--r--arch/arm/configs/omap2plus_defconfig1
-rw-r--r--arch/arm/configs/sunxi_defconfig1
-rw-r--r--arch/arm/mach-exynos/exynos.c2
-rw-r--r--arch/arm/mm/proc-macros.S2
-rw-r--r--arch/arm/plat-samsung/Kconfig5
-rw-r--r--arch/arm/plat-samsung/pm-debug.c1
20 files changed, 176 insertions, 20 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index c7bb11be15a3..723999d73744 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation
140smsc Standard Microsystems Corporation 140smsc Standard Microsystems Corporation
141snps Synopsys, Inc. 141snps Synopsys, Inc.
142solidrun SolidRun 142solidrun SolidRun
143sony Sony Corporation
143spansion Spansion Inc. 144spansion Spansion Inc.
144st STMicroelectronics 145st STMicroelectronics
145ste ST-Ericsson 146ste ST-Ericsson
diff --git a/MAINTAINERS b/MAINTAINERS
index 43898b1a8a2d..a20df9bf8ab0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1088,33 +1088,33 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1088S: Maintained 1088S: Maintained
1089 1089
1090ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE 1090ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
1091M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1091M: Santosh Shilimkar <ssantosh@kernel.org>
1092L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1092L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1093S: Maintained 1093S: Maintained
1094F: arch/arm/mach-keystone/ 1094F: arch/arm/mach-keystone/
1095T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git 1095T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
1096 1096
1097ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK 1097ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
1098M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1098M: Santosh Shilimkar <ssantosh@kernel.org>
1099L: linux-kernel@vger.kernel.org 1099L: linux-kernel@vger.kernel.org
1100S: Maintained 1100S: Maintained
1101F: drivers/clk/keystone/ 1101F: drivers/clk/keystone/
1102 1102
1103ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE 1103ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
1104M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1104M: Santosh Shilimkar <ssantosh@kernel.org>
1105L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1105L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1106L: linux-kernel@vger.kernel.org 1106L: linux-kernel@vger.kernel.org
1107S: Maintained 1107S: Maintained
1108F: drivers/clocksource/timer-keystone.c 1108F: drivers/clocksource/timer-keystone.c
1109 1109
1110ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER 1110ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
1111M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1111M: Santosh Shilimkar <ssantosh@kernel.org>
1112L: linux-kernel@vger.kernel.org 1112L: linux-kernel@vger.kernel.org
1113S: Maintained 1113S: Maintained
1114F: drivers/power/reset/keystone-reset.c 1114F: drivers/power/reset/keystone-reset.c
1115 1115
1116ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS 1116ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
1117M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1117M: Santosh Shilimkar <ssantosh@kernel.org>
1118L: linux-kernel@vger.kernel.org 1118L: linux-kernel@vger.kernel.org
1119S: Maintained 1119S: Maintained
1120F: drivers/memory/*emif* 1120F: drivers/memory/*emif*
@@ -2062,17 +2062,14 @@ F: arch/arm/configs/bcm_defconfig
2062F: drivers/mmc/host/sdhci-bcm-kona.c 2062F: drivers/mmc/host/sdhci-bcm-kona.c
2063F: drivers/clocksource/bcm_kona_timer.c 2063F: drivers/clocksource/bcm_kona_timer.c
2064 2064
2065BROADCOM BCM2835 ARM ARCHICTURE 2065BROADCOM BCM2835 ARM ARCHITECTURE
2066M: Stephen Warren <swarren@wwwdotorg.org> 2066M: Stephen Warren <swarren@wwwdotorg.org>
2067L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) 2067L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
2068T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git 2068T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
2069S: Maintained 2069S: Maintained
2070F: arch/arm/mach-bcm/board_bcm2835.c 2070N: bcm2835
2071F: arch/arm/boot/dts/bcm2835*
2072F: arch/arm/configs/bcm2835_defconfig
2073F: drivers/*/*bcm2835*
2074 2071
2075BROADCOM BCM5301X ARM ARCHICTURE 2072BROADCOM BCM5301X ARM ARCHITECTURE
2076M: Hauke Mehrtens <hauke@hauke-m.de> 2073M: Hauke Mehrtens <hauke@hauke-m.de>
2077L: linux-arm-kernel@lists.infradead.org 2074L: linux-arm-kernel@lists.infradead.org
2078S: Maintained 2075S: Maintained
@@ -6687,7 +6684,7 @@ F: arch/arm/*omap*/usb*
6687 6684
6688OMAP GPIO DRIVER 6685OMAP GPIO DRIVER
6689M: Javier Martinez Canillas <javier@dowhile0.org> 6686M: Javier Martinez Canillas <javier@dowhile0.org>
6690M: Santosh Shilimkar <santosh.shilimkar@ti.com> 6687M: Santosh Shilimkar <ssantosh@kernel.org>
6691M: Kevin Hilman <khilman@deeprootsystems.com> 6688M: Kevin Hilman <khilman@deeprootsystems.com>
6692L: linux-omap@vger.kernel.org 6689L: linux-omap@vger.kernel.org
6693S: Maintained 6690S: Maintained
@@ -9274,7 +9271,7 @@ F: drivers/mmc/host/tifm_sd.c
9274F: include/linux/tifm.h 9271F: include/linux/tifm.h
9275 9272
9276TI KEYSTONE MULTICORE NAVIGATOR DRIVERS 9273TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
9277M: Santosh Shilimkar <santosh.shilimkar@ti.com> 9274M: Santosh Shilimkar <ssantosh@kernel.org>
9278L: linux-kernel@vger.kernel.org 9275L: linux-kernel@vger.kernel.org
9279L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 9276L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
9280S: Maintained 9277S: Maintained
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7c80af906897..38c89cafa1ab 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -354,13 +354,15 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
354 orion5x-rd88f5182-nas.dtb 354 orion5x-rd88f5182-nas.dtb
355dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 355dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
356dtb-$(CONFIG_ARCH_QCOM) += \ 356dtb-$(CONFIG_ARCH_QCOM) += \
357 qcom-apq8064-cm-qs600.dtb \
357 qcom-apq8064-ifc6410.dtb \ 358 qcom-apq8064-ifc6410.dtb \
358 qcom-apq8074-dragonboard.dtb \ 359 qcom-apq8074-dragonboard.dtb \
359 qcom-apq8084-ifc6540.dtb \ 360 qcom-apq8084-ifc6540.dtb \
360 qcom-apq8084-mtp.dtb \ 361 qcom-apq8084-mtp.dtb \
361 qcom-ipq8064-ap148.dtb \ 362 qcom-ipq8064-ap148.dtb \
362 qcom-msm8660-surf.dtb \ 363 qcom-msm8660-surf.dtb \
363 qcom-msm8960-cdp.dtb 364 qcom-msm8960-cdp.dtb \
365 qcom-msm8974-sony-xperia-honami.dtb
364dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 366dtb-$(CONFIG_ARCH_ROCKCHIP) += \
365 rk3066a-bqcurie2.dtb \ 367 rk3066a-bqcurie2.dtb \
366 rk3188-radxarock.dtb \ 368 rk3188-radxarock.dtb \
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 99b26df8dbc7..0865a2e33f97 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -675,7 +675,7 @@
675 sd4_bus8: sd4-bus-width8 { 675 sd4_bus8: sd4-bus-width8 {
676 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; 676 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
677 samsung,pin-function = <4>; 677 samsung,pin-function = <4>;
678 samsung,pin-pud = <4>; 678 samsung,pin-pud = <3>;
679 samsung,pin-drv = <3>; 679 samsung,pin-drv = <3>;
680 }; 680 };
681 681
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 4f2df61c1cfc..aa7a7d727a7e 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -368,3 +368,7 @@
368 }; 368 };
369 }; 369 };
370}; 370};
371
372&usbdrd_dwc3_1 {
373 dr_mode = "host";
374};
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 9a233828539c..82cdb74484cc 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -838,6 +838,14 @@
838 status = "okay"; 838 status = "okay";
839}; 839};
840 840
841&usbdrd_dwc3_0 {
842 dr_mode = "host";
843};
844
845&usbdrd_dwc3_1 {
846 dr_mode = "host";
847};
848
841&usbdrd_phy0 { 849&usbdrd_phy0 {
842 vbus-supply = <&usb300_vbus_reg>; 850 vbus-supply = <&usb300_vbus_reg>;
843}; 851};
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index bfe056d9148c..8617a031cbc0 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -815,7 +815,7 @@
815 #size-cells = <1>; 815 #size-cells = <1>;
816 ranges; 816 ranges;
817 817
818 dwc3 { 818 usbdrd_dwc3_0: dwc3 {
819 compatible = "snps,dwc3"; 819 compatible = "snps,dwc3";
820 reg = <0x12000000 0x10000>; 820 reg = <0x12000000 0x10000>;
821 interrupts = <0 72 0>; 821 interrupts = <0 72 0>;
@@ -841,7 +841,7 @@
841 #size-cells = <1>; 841 #size-cells = <1>;
842 ranges; 842 ranges;
843 843
844 dwc3 { 844 usbdrd_dwc3_1: dwc3 {
845 compatible = "snps,dwc3"; 845 compatible = "snps,dwc3";
846 reg = <0x12400000 0x10000>; 846 reg = <0x12400000 0x10000>;
847 interrupts = <0 73 0>; 847 interrupts = <0 73 0>;
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 1d31c8132558..7bb1c8dd42dd 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -826,6 +826,14 @@
826 status = "okay"; 826 status = "okay";
827}; 827};
828 828
829&usbdrd_dwc3_0 {
830 dr_mode = "host";
831};
832
833&usbdrd_dwc3_1 {
834 dr_mode = "host";
835};
836
829&usbdrd_phy0 { 837&usbdrd_phy0 {
830 vbus-supply = <&usb300_vbus_reg>; 838 vbus-supply = <&usb300_vbus_reg>;
831}; 839};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 9b0494a8ab45..739fcf29c643 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -659,6 +659,9 @@
659 659
660 ethernet@gpmc { 660 ethernet@gpmc {
661 compatible = "smsc,lan91c94"; 661 compatible = "smsc,lan91c94";
662
663 status = "disabled";
664
662 interrupt-parent = <&gpio2>; 665 interrupt-parent = <&gpio2>;
663 interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ 666 interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
664 reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ 667 reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */
diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
new file mode 100644
index 000000000000..5d75666f7f6c
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -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};
diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 95e64955fb8e..55b2910efd87 100644
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -81,5 +81,13 @@
81 }; 81 };
82 }; 82 };
83 }; 83 };
84
85 sata-phy@1b400000 {
86 status = "ok";
87 };
88
89 sata@29000000 {
90 status = "ok";
91 };
84 }; 92 };
85}; 93};
diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 244f857f0e6f..63b2146f563b 100644
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -234,6 +234,39 @@
234 }; 234 };
235 }; 235 };
236 236
237 sata_phy: sata-phy@1b400000 {
238 compatible = "qcom,ipq806x-sata-phy";
239 reg = <0x1b400000 0x200>;
240
241 clocks = <&gcc SATA_PHY_CFG_CLK>;
242 clock-names = "cfg";
243
244 #phy-cells = <0>;
245 status = "disabled";
246 };
247
248 sata@29000000 {
249 compatible = "qcom,ipq806x-ahci", "generic-ahci";
250 reg = <0x29000000 0x180>;
251
252 interrupts = <0 209 0x0>;
253
254 clocks = <&gcc SFAB_SATA_S_H_CLK>,
255 <&gcc SATA_H_CLK>,
256 <&gcc SATA_A_CLK>,
257 <&gcc SATA_RXOOB_CLK>,
258 <&gcc SATA_PMALIVE_CLK>;
259 clock-names = "slave_face", "iface", "core",
260 "rxoob", "pmalive";
261
262 assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;
263 assigned-clock-rates = <100000000>, <100000000>;
264
265 phys = <&sata_phy>;
266 phy-names = "sata-phy";
267 status = "disabled";
268 };
269
237 qcom,ssbi@500000 { 270 qcom,ssbi@500000 {
238 compatible = "qcom,ssbi"; 271 compatible = "qcom,ssbi";
239 reg = <0x00500000 0x1000>; 272 reg = <0x00500000 0x1000>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
new file mode 100644
index 000000000000..cccc21b7c8fd
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
@@ -0,0 +1,17 @@
1#include "qcom-msm8974.dtsi"
2
3/ {
4 model = "Sony Xperia Z1";
5 compatible = "sony,xperia-honami", "qcom,msm8974";
6
7 memory@0 {
8 reg = <0 0x40000000>, <0x40000000 0x40000000>;
9 device_type = "memory";
10 };
11};
12
13&soc {
14 serial@f991e000 {
15 status = "ok";
16 };
17};
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index fc7d1683bf67..72058b8a6f4d 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -1,6 +1,7 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y 2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y 3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_CGROUPS=y
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5CONFIG_KALLSYMS_ALL=y 6CONFIG_KALLSYMS_ALL=y
6CONFIG_MODULES=y 7CONFIG_MODULES=y
@@ -54,12 +55,14 @@ CONFIG_SMSC911X=y
54CONFIG_USB_USBNET=y 55CONFIG_USB_USBNET=y
55CONFIG_USB_NET_SMSC75XX=y 56CONFIG_USB_NET_SMSC75XX=y
56CONFIG_USB_NET_SMSC95XX=y 57CONFIG_USB_NET_SMSC95XX=y
58CONFIG_USB_GADGET=y
57CONFIG_INPUT_EVDEV=y 59CONFIG_INPUT_EVDEV=y
58CONFIG_KEYBOARD_GPIO=y 60CONFIG_KEYBOARD_GPIO=y
59CONFIG_KEYBOARD_CROS_EC=y 61CONFIG_KEYBOARD_CROS_EC=y
60# CONFIG_MOUSE_PS2 is not set 62# CONFIG_MOUSE_PS2 is not set
61CONFIG_MOUSE_CYAPA=y 63CONFIG_MOUSE_CYAPA=y
62CONFIG_INPUT_TOUCHSCREEN=y 64CONFIG_INPUT_TOUCHSCREEN=y
65CONFIG_TOUCHSCREEN_ATMEL_MXT=y
63CONFIG_SERIAL_8250=y 66CONFIG_SERIAL_8250=y
64CONFIG_SERIAL_SAMSUNG=y 67CONFIG_SERIAL_SAMSUNG=y
65CONFIG_SERIAL_SAMSUNG_CONSOLE=y 68CONFIG_SERIAL_SAMSUNG_CONSOLE=y
@@ -68,15 +71,18 @@ CONFIG_HW_RANDOM=y
68CONFIG_TCG_TPM=y 71CONFIG_TCG_TPM=y
69CONFIG_TCG_TIS_I2C_INFINEON=y 72CONFIG_TCG_TIS_I2C_INFINEON=y
70CONFIG_I2C=y 73CONFIG_I2C=y
74CONFIG_I2C_CHARDEV=y
71CONFIG_I2C_MUX=y 75CONFIG_I2C_MUX=y
72CONFIG_I2C_ARB_GPIO_CHALLENGE=y 76CONFIG_I2C_ARB_GPIO_CHALLENGE=y
73CONFIG_I2C_EXYNOS5=y 77CONFIG_I2C_EXYNOS5=y
78CONFIG_I2C_GPIO=y
74CONFIG_I2C_CROS_EC_TUNNEL=y 79CONFIG_I2C_CROS_EC_TUNNEL=y
75CONFIG_SPI=y 80CONFIG_SPI=y
76CONFIG_SPI_S3C64XX=y 81CONFIG_SPI_S3C64XX=y
77CONFIG_I2C_S3C2410=y 82CONFIG_I2C_S3C2410=y
78CONFIG_DEBUG_GPIO=y 83CONFIG_DEBUG_GPIO=y
79CONFIG_POWER_SUPPLY=y 84CONFIG_POWER_SUPPLY=y
85CONFIG_BATTERY_SBS=y
80CONFIG_CHARGER_TPS65090=y 86CONFIG_CHARGER_TPS65090=y
81# CONFIG_HWMON is not set 87# CONFIG_HWMON is not set
82CONFIG_THERMAL=y 88CONFIG_THERMAL=y
@@ -88,6 +94,7 @@ CONFIG_MFD_CROS_EC=y
88CONFIG_MFD_CROS_EC_I2C=y 94CONFIG_MFD_CROS_EC_I2C=y
89CONFIG_MFD_CROS_EC_SPI=y 95CONFIG_MFD_CROS_EC_SPI=y
90CONFIG_MFD_MAX77686=y 96CONFIG_MFD_MAX77686=y
97CONFIG_MFD_MAX77693=y
91CONFIG_MFD_MAX8997=y 98CONFIG_MFD_MAX8997=y
92CONFIG_MFD_SEC_CORE=y 99CONFIG_MFD_SEC_CORE=y
93CONFIG_MFD_TPS65090=y 100CONFIG_MFD_TPS65090=y
@@ -96,6 +103,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
96CONFIG_REGULATOR_GPIO=y 103CONFIG_REGULATOR_GPIO=y
97CONFIG_REGULATOR_MAX8997=y 104CONFIG_REGULATOR_MAX8997=y
98CONFIG_REGULATOR_MAX77686=y 105CONFIG_REGULATOR_MAX77686=y
106CONFIG_REGULATOR_MAX77802=y
107CONFIG_REGULATOR_MAX77693=y
99CONFIG_REGULATOR_S2MPA01=y 108CONFIG_REGULATOR_S2MPA01=y
100CONFIG_REGULATOR_S2MPS11=y 109CONFIG_REGULATOR_S2MPS11=y
101CONFIG_REGULATOR_S5M8767=y 110CONFIG_REGULATOR_S5M8767=y
@@ -115,6 +124,7 @@ CONFIG_SND_SOC=y
115CONFIG_SND_SOC_SAMSUNG=y 124CONFIG_SND_SOC_SAMSUNG=y
116CONFIG_SND_SOC_SNOW=y 125CONFIG_SND_SOC_SNOW=y
117CONFIG_USB=y 126CONFIG_USB=y
127CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
118CONFIG_USB_XHCI_HCD=y 128CONFIG_USB_XHCI_HCD=y
119CONFIG_USB_EHCI_HCD=y 129CONFIG_USB_EHCI_HCD=y
120CONFIG_USB_EHCI_EXYNOS=y 130CONFIG_USB_EHCI_EXYNOS=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 69c7bed3c634..16e719c268dd 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -51,6 +51,7 @@ CONFIG_SOC_AM43XX=y
51CONFIG_SOC_DRA7XX=y 51CONFIG_SOC_DRA7XX=y
52CONFIG_ARM_THUMBEE=y 52CONFIG_ARM_THUMBEE=y
53CONFIG_ARM_ERRATA_411920=y 53CONFIG_ARM_ERRATA_411920=y
54CONFIG_ARM_ERRATA_430973=y
54CONFIG_SMP=y 55CONFIG_SMP=y
55CONFIG_NR_CPUS=2 56CONFIG_NR_CPUS=2
56CONFIG_CMA=y 57CONFIG_CMA=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index c1a4ca4f6e6d..847045313101 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -75,6 +75,7 @@ CONFIG_POWER_RESET_SUN6I=y
75CONFIG_WATCHDOG=y 75CONFIG_WATCHDOG=y
76CONFIG_SUNXI_WATCHDOG=y 76CONFIG_SUNXI_WATCHDOG=y
77CONFIG_MFD_AXP20X=y 77CONFIG_MFD_AXP20X=y
78CONFIG_REGULATOR=y
78CONFIG_REGULATOR_GPIO=y 79CONFIG_REGULATOR_GPIO=y
79CONFIG_USB=y 80CONFIG_USB=y
80CONFIG_USB_EHCI_HCD=y 81CONFIG_USB_EHCI_HCD=y
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index b89e5f35db84..6b283eb3202e 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -161,7 +161,9 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd)
161 161
162static struct platform_device exynos_cpuidle = { 162static struct platform_device exynos_cpuidle = {
163 .name = "exynos_cpuidle", 163 .name = "exynos_cpuidle",
164#ifdef CONFIG_ARM_EXYNOS_CPUIDLE
164 .dev.platform_data = exynos_enter_aftr, 165 .dev.platform_data = exynos_enter_aftr,
166#endif
165 .id = -1, 167 .id = -1,
166}; 168};
167 169
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index ee1d80593958..ba1196c968d8 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -279,7 +279,7 @@ ENTRY(\name\()_processor_functions)
279 279
280 .if \suspend 280 .if \suspend
281 .word cpu_\name\()_suspend_size 281 .word cpu_\name\()_suspend_size
282#ifdef CONFIG_PM_SLEEP 282#ifdef CONFIG_ARM_CPU_SUSPEND
283 .word cpu_\name\()_do_suspend 283 .word cpu_\name\()_do_suspend
284 .word cpu_\name\()_do_resume 284 .word cpu_\name\()_do_resume
285#else 285#else
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index c87aefbf3a13..9bd2776e7d05 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -268,8 +268,9 @@ config S5P_DEV_MFC
268comment "Power management" 268comment "Power management"
269 269
270config SAMSUNG_PM_DEBUG 270config SAMSUNG_PM_DEBUG
271 bool "S3C2410 PM Suspend debug" 271 bool "Samsung PM Suspend debug"
272 depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART 272 depends on PM && DEBUG_KERNEL
273 depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART
273 help 274 help
274 Say Y here if you want verbose debugging from the PM Suspend and 275 Say Y here if you want verbose debugging from the PM Suspend and
275 Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> 276 Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c
index 8f19f66388dd..39609601f407 100644
--- a/arch/arm/plat-samsung/pm-debug.c
+++ b/arch/arm/plat-samsung/pm-debug.c
@@ -14,6 +14,7 @@
14 */ 14 */
15 15
16#include <linux/serial_core.h> 16#include <linux/serial_core.h>
17#include <linux/serial_s3c.h>
17#include <linux/io.h> 18#include <linux/io.h>
18 19
19#include <asm/mach/map.h> 20#include <asm/mach/map.h>
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-26 20:46:28 -0500