commit 4d3639ac3c11afc8fdcb28f95916ef4b21c3fa36 · tjh.dev/kernel

+1

Documentation/devicetree/bindings/vendor-prefixes.txt

··· 140 140 smsc Standard Microsystems Corporation 141 141 snps Synopsys, Inc. 142 142 solidrun SolidRun 143 + sony Sony Corporation 143 144 spansion Spansion Inc. 144 145 st STMicroelectronics 145 146 ste ST-Ericsson

+10 -13

MAINTAINERS

··· 1088 1088 S: Maintained 1089 1089 1090 1090 ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE 1091 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1091 + M: Santosh Shilimkar <ssantosh@kernel.org> 1092 1092 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1093 1093 S: Maintained 1094 1094 F: arch/arm/mach-keystone/ 1095 1095 T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git 1096 1096 1097 1097 ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK 1098 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1098 + M: Santosh Shilimkar <ssantosh@kernel.org> 1099 1099 L: linux-kernel@vger.kernel.org 1100 1100 S: Maintained 1101 1101 F: drivers/clk/keystone/ 1102 1102 1103 1103 ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE 1104 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1104 + M: Santosh Shilimkar <ssantosh@kernel.org> 1105 1105 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1106 1106 L: linux-kernel@vger.kernel.org 1107 1107 S: Maintained 1108 1108 F: drivers/clocksource/timer-keystone.c 1109 1109 1110 1110 ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER 1111 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1111 + M: Santosh Shilimkar <ssantosh@kernel.org> 1112 1112 L: linux-kernel@vger.kernel.org 1113 1113 S: Maintained 1114 1114 F: drivers/power/reset/keystone-reset.c 1115 1115 1116 1116 ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS 1117 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 1117 + M: Santosh Shilimkar <ssantosh@kernel.org> 1118 1118 L: linux-kernel@vger.kernel.org 1119 1119 S: Maintained 1120 1120 F: drivers/memory/*emif* ··· 2062 2062 F: drivers/mmc/host/sdhci-bcm-kona.c 2063 2063 F: drivers/clocksource/bcm_kona_timer.c 2064 2064 2065 - BROADCOM BCM2835 ARM ARCHICTURE 2065 + BROADCOM BCM2835 ARM ARCHITECTURE 2066 2066 M: Stephen Warren <swarren@wwwdotorg.org> 2067 2067 L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) 2068 2068 T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git 2069 2069 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 2074 2071 2075 - BROADCOM BCM5301X ARM ARCHICTURE 2072 + BROADCOM BCM5301X ARM ARCHITECTURE 2076 2073 M: Hauke Mehrtens <hauke@hauke-m.de> 2077 2074 L: linux-arm-kernel@lists.infradead.org 2078 2075 S: Maintained ··· 6684 6687 6685 6688 OMAP GPIO DRIVER 6686 6689 M: Javier Martinez Canillas <javier@dowhile0.org> 6687 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 6690 + M: Santosh Shilimkar <ssantosh@kernel.org> 6688 6691 M: Kevin Hilman <khilman@deeprootsystems.com> 6689 6692 L: linux-omap@vger.kernel.org 6690 6693 S: Maintained ··· 9271 9274 F: include/linux/tifm.h 9272 9275 9273 9276 TI KEYSTONE MULTICORE NAVIGATOR DRIVERS 9274 - M: Santosh Shilimkar <santosh.shilimkar@ti.com> 9277 + M: Santosh Shilimkar <ssantosh@kernel.org> 9275 9278 L: linux-kernel@vger.kernel.org 9276 9279 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 9277 9280 S: Maintained

+3 -1

arch/arm/boot/dts/Makefile

··· 354 354 orion5x-rd88f5182-nas.dtb 355 355 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 356 356 dtb-$(CONFIG_ARCH_QCOM) += \ 357 + qcom-apq8064-cm-qs600.dtb \ 357 358 qcom-apq8064-ifc6410.dtb \ 358 359 qcom-apq8074-dragonboard.dtb \ 359 360 qcom-apq8084-ifc6540.dtb \ 360 361 qcom-apq8084-mtp.dtb \ 361 362 qcom-ipq8064-ap148.dtb \ 362 363 qcom-msm8660-surf.dtb \ 363 - qcom-msm8960-cdp.dtb 364 + qcom-msm8960-cdp.dtb \ 365 + qcom-msm8974-sony-xperia-honami.dtb 364 366 dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 365 367 rk3066a-bqcurie2.dtb \ 366 368 rk3188-radxarock.dtb \

+1 -1

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

··· 675 675 sd4_bus8: sd4-bus-width8 { 676 676 samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; 677 677 samsung,pin-function = <4>; 678 - samsung,pin-pud = <4>; 678 + samsung,pin-pud = <3>; 679 679 samsung,pin-drv = <3>; 680 680 }; 681 681

+4

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

··· 368 368 }; 369 369 }; 370 370 }; 371 + 372 + &usbdrd_dwc3_1 { 373 + dr_mode = "host"; 374 + };

+8

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

··· 838 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 849 &usbdrd_phy0 { 842 850 vbus-supply = <&usb300_vbus_reg>; 843 851 };

+2 -2

arch/arm/boot/dts/exynos5420.dtsi

··· 815 815 #size-cells = <1>; 816 816 ranges; 817 817 818 - dwc3 { 818 + usbdrd_dwc3_0: dwc3 { 819 819 compatible = "snps,dwc3"; 820 820 reg = <0x12000000 0x10000>; 821 821 interrupts = <0 72 0>; ··· 841 841 #size-cells = <1>; 842 842 ranges; 843 843 844 - dwc3 { 844 + usbdrd_dwc3_1: dwc3 { 845 845 compatible = "snps,dwc3"; 846 846 reg = <0x12400000 0x10000>; 847 847 interrupts = <0 73 0>;

+8

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

··· 826 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 837 &usbdrd_phy0 { 830 838 vbus-supply = <&usb300_vbus_reg>; 831 839 };

+3

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

··· 659 659 660 660 ethernet@gpmc { 661 661 compatible = "smsc,lan91c94"; 662 + 663 + status = "disabled"; 664 + 662 665 interrupt-parent = <&gpio2>; 663 666 interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ 664 667 reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */

+59

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

··· 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 + };

+8

arch/arm/boot/dts/qcom-ipq8064-ap148.dts

··· 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 };

+33

arch/arm/boot/dts/qcom-ipq8064.dtsi

··· 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 270 qcom,ssbi@500000 { 238 271 compatible = "qcom,ssbi"; 239 272 reg = <0x00500000 0x1000>;

+17

arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

··· 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 + };

+10

arch/arm/configs/exynos_defconfig

··· 1 1 CONFIG_SYSVIPC=y 2 2 CONFIG_NO_HZ=y 3 3 CONFIG_HIGH_RES_TIMERS=y 4 + CONFIG_CGROUPS=y 4 5 CONFIG_BLK_DEV_INITRD=y 5 6 CONFIG_KALLSYMS_ALL=y 6 7 CONFIG_MODULES=y ··· 55 54 CONFIG_USB_USBNET=y 56 55 CONFIG_USB_NET_SMSC75XX=y 57 56 CONFIG_USB_NET_SMSC95XX=y 57 + CONFIG_USB_GADGET=y 58 58 CONFIG_INPUT_EVDEV=y 59 59 CONFIG_KEYBOARD_GPIO=y 60 60 CONFIG_KEYBOARD_CROS_EC=y 61 61 # CONFIG_MOUSE_PS2 is not set 62 62 CONFIG_MOUSE_CYAPA=y 63 63 CONFIG_INPUT_TOUCHSCREEN=y 64 + CONFIG_TOUCHSCREEN_ATMEL_MXT=y 64 65 CONFIG_SERIAL_8250=y 65 66 CONFIG_SERIAL_SAMSUNG=y 66 67 CONFIG_SERIAL_SAMSUNG_CONSOLE=y ··· 71 68 CONFIG_TCG_TPM=y 72 69 CONFIG_TCG_TIS_I2C_INFINEON=y 73 70 CONFIG_I2C=y 71 + CONFIG_I2C_CHARDEV=y 74 72 CONFIG_I2C_MUX=y 75 73 CONFIG_I2C_ARB_GPIO_CHALLENGE=y 76 74 CONFIG_I2C_EXYNOS5=y 75 + CONFIG_I2C_GPIO=y 77 76 CONFIG_I2C_CROS_EC_TUNNEL=y 78 77 CONFIG_SPI=y 79 78 CONFIG_SPI_S3C64XX=y 80 79 CONFIG_I2C_S3C2410=y 81 80 CONFIG_DEBUG_GPIO=y 82 81 CONFIG_POWER_SUPPLY=y 82 + CONFIG_BATTERY_SBS=y 83 83 CONFIG_CHARGER_TPS65090=y 84 84 # CONFIG_HWMON is not set 85 85 CONFIG_THERMAL=y ··· 94 88 CONFIG_MFD_CROS_EC_I2C=y 95 89 CONFIG_MFD_CROS_EC_SPI=y 96 90 CONFIG_MFD_MAX77686=y 91 + CONFIG_MFD_MAX77693=y 97 92 CONFIG_MFD_MAX8997=y 98 93 CONFIG_MFD_SEC_CORE=y 99 94 CONFIG_MFD_TPS65090=y ··· 103 96 CONFIG_REGULATOR_GPIO=y 104 97 CONFIG_REGULATOR_MAX8997=y 105 98 CONFIG_REGULATOR_MAX77686=y 99 + CONFIG_REGULATOR_MAX77802=y 100 + CONFIG_REGULATOR_MAX77693=y 106 101 CONFIG_REGULATOR_S2MPA01=y 107 102 CONFIG_REGULATOR_S2MPS11=y 108 103 CONFIG_REGULATOR_S5M8767=y ··· 124 115 CONFIG_SND_SOC_SAMSUNG=y 125 116 CONFIG_SND_SOC_SNOW=y 126 117 CONFIG_USB=y 118 + CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 127 119 CONFIG_USB_XHCI_HCD=y 128 120 CONFIG_USB_EHCI_HCD=y 129 121 CONFIG_USB_EHCI_EXYNOS=y

+1

arch/arm/configs/omap2plus_defconfig

··· 51 51 CONFIG_SOC_DRA7XX=y 52 52 CONFIG_ARM_THUMBEE=y 53 53 CONFIG_ARM_ERRATA_411920=y 54 + CONFIG_ARM_ERRATA_430973=y 54 55 CONFIG_SMP=y 55 56 CONFIG_NR_CPUS=2 56 57 CONFIG_CMA=y

+1

arch/arm/configs/sunxi_defconfig

··· 75 75 CONFIG_WATCHDOG=y 76 76 CONFIG_SUNXI_WATCHDOG=y 77 77 CONFIG_MFD_AXP20X=y 78 + CONFIG_REGULATOR=y 78 79 CONFIG_REGULATOR_GPIO=y 79 80 CONFIG_USB=y 80 81 CONFIG_USB_EHCI_HCD=y

+2

arch/arm/mach-exynos/exynos.c

··· 161 161 162 162 static struct platform_device exynos_cpuidle = { 163 163 .name = "exynos_cpuidle", 164 + #ifdef CONFIG_ARM_EXYNOS_CPUIDLE 164 165 .dev.platform_data = exynos_enter_aftr, 166 + #endif 165 167 .id = -1, 166 168 }; 167 169

+1 -1

arch/arm/mm/proc-macros.S

··· 279 279 280 280 .if \suspend 281 281 .word cpu_\name\()_suspend_size 282 - #ifdef CONFIG_PM_SLEEP 282 + #ifdef CONFIG_ARM_CPU_SUSPEND 283 283 .word cpu_\name\()_do_suspend 284 284 .word cpu_\name\()_do_resume 285 285 #else

+3 -2

arch/arm/plat-samsung/Kconfig

··· 268 268 comment "Power management" 269 269 270 270 config SAMSUNG_PM_DEBUG 271 - bool "S3C2410 PM Suspend debug" 272 - depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART 271 + bool "Samsung PM Suspend debug" 272 + depends on PM && DEBUG_KERNEL 273 + depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART 273 274 help 274 275 Say Y here if you want verbose debugging from the PM Suspend and 275 276 Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

+1

arch/arm/plat-samsung/pm-debug.c

··· 14 14 */ 15 15 16 16 #include <linux/serial_core.h> 17 + #include <linux/serial_s3c.h> 17 18 #include <linux/io.h> 18 19 19 20 #include <asm/mach/map.h>