From: Rafael J. Wysocki Date: Fri, 14 Oct 2016 12:09:57 +0000 (+0200) Subject: Merge branches 'device-properties' and 'acpi-misc' X-Git-Tag: v4.9-rc1~18^2~1 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=3f62d5269bc59ce3797397cc54edab17fbe60682;hp=-c;p=cascardo%2Flinux.git Merge branches 'device-properties' and 'acpi-misc' * device-properties: ACPI / property: Allow holes in reference properties * acpi-misc: MAINTAINERS: Add ARM64-specific ACPI maintainers entry --- 3f62d5269bc59ce3797397cc54edab17fbe60682 diff --combined MAINTAINERS index c8926c1acd22,71aa5daeae8f,2a70dd97d8fa..46c526eb1bab --- a/MAINTAINERS +++ b/MAINTAINERS @@@@ -316,6 -316,6 -316,14 +316,14 @@@@ W: https://01.org/linux-acp S: Supported F: drivers/acpi/fan.c ++ ACPI FOR ARM64 (ACPI/arm64) ++ M: Lorenzo Pieralisi ++ M: Hanjun Guo ++ M: Sudeep Holla ++ L: linux-acpi@vger.kernel.org ++ S: Maintained ++ F: drivers/acpi/arm64 ++ ACPI THERMAL DRIVER M: Zhang Rui L: linux-acpi@vger.kernel.org @@@@ -798,7 -798,6 -806,7 +806,7 @@@@ M: Laura Abbott L: devel@driverdev.osuosl.org S: Supported + F: Documentation/devicetree/bindings/staging/ion/ F: drivers/staging/android/ion F: drivers/staging/android/uapi/ion.h F: drivers/staging/android/uapi/ion_test.h @@@@ -913,17 -912,15 -921,15 +921,17 @@@@ F: arch/arm/include/asm/floppy. ARM PMU PROFILING AND DEBUGGING M: Will Deacon --R: Mark Rutland ++M: Mark Rutland S: Maintained ++L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) F: arch/arm*/kernel/perf_* F: arch/arm/oprofile/common.c F: arch/arm*/kernel/hw_breakpoint.c F: arch/arm*/include/asm/hw_breakpoint.h F: arch/arm*/include/asm/perf_event.h --F: drivers/perf/arm_pmu.c ++F: drivers/perf/* F: include/linux/perf/arm_pmu.h ++F: Documentation/devicetree/bindings/arm/pmu.txt ARM PORT M: Russell King @@@@ -1626,8 -1623,7 -1632,8 +1634,8 @@@@ N: rockchi ARM/SAMSUNG EXYNOS ARM ARCHITECTURES M: Kukjin Kim - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski + R: Javier Martinez Canillas L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) S: Maintained @@@@ -1647,6 -1643,7 -1653,6 +1655,6 @@@@ F: drivers/*/*s3c64xx F: drivers/*/*s5pv210* F: drivers/memory/samsung/* F: drivers/soc/samsung/* - F: drivers/spi/spi-s3c* F: Documentation/arm/Samsung/ F: Documentation/devicetree/bindings/arm/samsung/ F: Documentation/devicetree/bindings/sram/samsung-sram.txt @@@@ -1834,7 -1831,6 -1840,7 +1842,7 @@@@ T: git git://git.kernel.org/pub/scm/lin ARM/UNIPHIER ARCHITECTURE M: Masahiro Yamada L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git S: Maintained F: arch/arm/boot/dts/uniphier* F: arch/arm/include/asm/hardware/cache-uniphier.h @@@@ -2488,7 -2484,7 -2494,7 +2496,7 @@@@ F: include/net/bluetooth BONDING DRIVER M: Jay Vosburgh M: Veaceslav Falico - M: Andy Gospodarek + M: Andy Gospodarek L: netdev@vger.kernel.org W: http://sourceforge.net/projects/bonding/ S: Supported @@@@ -2503,7 -2499,7 -2509,7 +2511,7 @@@@ S: Supporte F: kernel/bpf/ BROADCOM B44 10/100 ETHERNET DRIVER - M: Gary Zambrano + M: Michael Chan L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/b44.* @@@@ -3251,7 -3247,7 -3257,7 +3259,7 @@@@ F: kernel/cpuset. CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) M: Johannes Weiner M: Michal Hocko - M: Vladimir Davydov + M: Vladimir Davydov L: cgroups@vger.kernel.org L: linux-mm@kvack.org S: Maintained @@@@ -3272,7 -3268,7 -3278,7 +3280,7 @@@@ S: Maintaine F: drivers/net/wan/cosa* CPMAC ETHERNET DRIVER - M: Florian Fainelli + M: Florian Fainelli L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/ti/cpmac.c @@@@ -3284,7 -3280,6 -3290,6 +3292,7 @@@@ L: linux-pm@vger.kernel.or S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git T: git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates) ++F: Documentation/cpu-freq/ F: drivers/cpufreq/ F: include/linux/cpufreq.h @@@@ -6106,7 -6101,7 -6111,7 +6114,7 @@@@ S: Supporte F: drivers/cpufreq/intel_pstate.c INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) - M: Maik Broemme + M: Maik Broemme L: linux-fbdev@vger.kernel.org S: Maintained F: Documentation/fb/intelfb.txt @@@@ -7469,8 -7464,7 -7474,8 +7477,8 @@@@ F: Documentation/devicetree/bindings/so F: sound/soc/codecs/max9860.* MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski + M: Bartlomiej Zolnierkiewicz L: linux-pm@vger.kernel.org S: Supported F: drivers/power/max14577_charger.c @@@@ -7486,8 -7480,7 -7491,8 +7494,8 @@@@ F: include/dt-bindings/*/*max77802. MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS M: Chanwoo Choi - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski + M: Bartlomiej Zolnierkiewicz L: linux-kernel@vger.kernel.org S: Supported F: drivers/*/max14577*.c @@@@ -8164,15 -8157,6 -8169,15 +8172,15 @@@@ S: Maintaine W: https://fedorahosted.org/dropwatch/ F: net/core/drop_monitor.c + NETWORKING [DSA] + M: Andrew Lunn + M: Vivien Didelot + M: Florian Fainelli + S: Maintained + F: net/dsa/ + F: include/net/dsa.h + F: drivers/net/dsa/ + NETWORKING [GENERAL] M: "David S. Miller" L: netdev@vger.kernel.org @@@@ -8748,7 -8732,7 -8753,7 +8756,7 @@@@ F: drivers/oprofile F: include/linux/oprofile.h ORACLE CLUSTER FILESYSTEM 2 (OCFS2) - M: Mark Fasheh + M: Mark Fasheh M: Joel Becker L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) W: http://ocfs2.wiki.kernel.org @@@@ -9262,7 -9246,7 -9267,7 +9270,7 @@@@ F: drivers/pinctrl/sh-pfc PIN CONTROLLER - SAMSUNG M: Tomasz Figa - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski M: Sylwester Nawrocki L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) @@@@ -10195,7 -10179,7 -10200,7 +10203,7 @@@@ S: Maintaine F: drivers/platform/x86/samsung-laptop.c SAMSUNG AUDIO (ASoC) DRIVERS - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski M: Sangbeom Kim M: Sylwester Nawrocki L: alsa-devel@alsa-project.org (moderated for non-subscribers) @@@@ -10210,8 -10194,7 -10215,8 +10218,8 @@@@ F: drivers/video/fbdev/s3c-fb. SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS M: Sangbeom Kim - M: Krzysztof Kozlowski + M: Krzysztof Kozlowski + M: Bartlomiej Zolnierkiewicz L: linux-kernel@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Supported @@@@ -10270,17 -10253,6 -10275,17 +10278,17 @@@@ S: Supporte L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) F: drivers/clk/samsung/ + SAMSUNG SPI DRIVERS + M: Kukjin Kim + M: Krzysztof Kozlowski + M: Andi Shyti + L: linux-spi@vger.kernel.org + L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) + S: Maintained + F: Documentation/devicetree/bindings/spi/spi-samsung.txt + F: drivers/spi/spi-s3c* + F: include/linux/platform_data/spi-s3c64xx.h + SAMSUNG SXGBE DRIVERS M: Byungho An M: Girish K S @@@@ -11260,8 -11232,12 -11265,8 +11268,8 @@@@ S: Odd Fixe F: drivers/staging/vt665?/ STAGING - WILC1000 WIFI DRIVER - M: Johnny Kim - M: Austin Shin - M: Chris Park - M: Tony Cho - M: Glen Lee - M: Leo Kim + M: Aditya Shankar + M: Ganesh Krishna L: linux-wireless@vger.kernel.org S: Supported F: drivers/staging/wilc1000/ @@@@ -11629,7 -11605,7 -11634,7 +11637,7 @@@@ F: Documentation/devicetree/bindings/th THERMAL/CPU_COOLING M: Amit Daniel Kachhap M: Viresh Kumar - M: Javi Merino + M: Javi Merino L: linux-pm@vger.kernel.org S: Supported F: Documentation/thermal/cpu-cooling-api.txt @@@@ -12581,7 -12557,7 -12586,7 +12589,7 @@@@ F: include/linux/if_*vlan. F: net/8021q/ VLYNQ BUS - M: Florian Fainelli + M: Florian Fainelli L: openwrt-devel@lists.openwrt.org (subscribers-only) S: Maintained F: drivers/vlynq/vlynq.c diff --combined include/linux/acpi.h index 65932c08afd2,632ec16a855e,c5eaf2f80a4c..2d42fb7d56b7 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@@@ -85,8 -85,6 -85,6 +85,8 @@@@ static inline const char *acpi_dev_name return dev_name(&adev->dev); } ++struct device *acpi_get_first_physical_node(struct acpi_device *adev); ++ enum acpi_irq_model_id { ACPI_IRQ_MODEL_PIC = 0, ACPI_IRQ_MODEL_IOAPIC, @@@@ -636,11 -634,6 -634,6 +636,11 @@@@ static inline const char *acpi_dev_name return NULL; } ++static inline struct device *acpi_get_first_physical_node(struct acpi_device *adev) ++{ ++ return NULL; ++} ++ static inline void acpi_early_init(void) { } static inline void acpi_subsystem_init(void) { } @@@@ -934,9 -927,17 -927,9 +934,17 @@@@ struct acpi_reference_args #ifdef CONFIG_ACPI int acpi_dev_get_property(struct acpi_device *adev, const char *name, acpi_object_type type, const union acpi_object **obj); - -int acpi_node_get_property_reference(struct fwnode_handle *fwnode, - - const char *name, size_t index, - - struct acpi_reference_args *args); + +int __acpi_node_get_property_reference(struct fwnode_handle *fwnode, + + const char *name, size_t index, size_t num_args, + + struct acpi_reference_args *args); + + + +static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, + + const char *name, size_t index, + + struct acpi_reference_args *args) + +{ + + return __acpi_node_get_property_reference(fwnode, name, index, + + MAX_ACPI_REFERENCE_ARGS, args); + +} int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname, void **valptr); @@@@ -1012,6 -1013,14 -1005,6 +1020,14 @@@@ static inline int acpi_dev_get_property return -ENXIO; } + +static inline int + +__acpi_node_get_property_reference(struct fwnode_handle *fwnode, + + const char *name, size_t index, size_t num_args, + + struct acpi_reference_args *args) + +{ + + return -ENXIO; + +} + + static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, const char *name, size_t index, struct acpi_reference_args *args) @@@@ -1063,7 -1072,7 -1056,7 +1079,7 @@@@ static inline struct fwnode_handle *acp return NULL; } - #define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \ + #define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \ static const void * __acpi_table_##name[] \ __attribute__((unused)) \ = { (void *) table_id, \ @@@@ -1081,10 -1090,4 -1074,4 +1097,10 @@@@ void acpi_table_upgrade(void) static inline void acpi_table_upgrade(void) { } #endif ++#if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG) ++extern bool acpi_has_watchdog(void); ++#else ++static inline bool acpi_has_watchdog(void) { return false; } ++#endif ++ #endif /*_LINUX_ACPI_H*/