Commit 86270c8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull DeviceTree fixes from Rob Herring:

 - Fix build error with *_OF_DECLARE() when used in modules

 - Add missing platform maintainers for dts files in MAINTAINERS

* tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: drop symbols declared by _OF_DECLARE() from modules
  MAINTAINERS: Add missing platform maintainers for dts files
parents 81b676bd 71f50c6d

MAINTAINERS

+18 −1
Original line number Original line Diff line number Diff line
@@ -967,6 +967,8 @@ M: Rob Herring <robh@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained

F:	arch/arm/mach-highbank/

F:	arch/arm/mach-highbank/

F:	arch/arm/boot/dts/highbank.dts

F:	arch/arm/boot/dts/ecx-*.dts*





ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Krzysztof Halasa <khalasa@piap.pl>

M:	Krzysztof Halasa <khalasa@piap.pl>
@@ -1042,6 +1044,7 @@ M: Barry Song <baohua@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/prima2*

F:	arch/arm/mach-prima2/

F:	arch/arm/mach-prima2/

F:	drivers/clk/sirf/

F:	drivers/clk/sirf/

F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-prima2.c
@@ -1143,6 +1146,10 @@ W: http://www.hisilicon.com 
S:	Supported

S:	Supported

T:	git git://github.com/hisilicon/linux-hisi.git

T:	git git://github.com/hisilicon/linux-hisi.git

F:	arch/arm/mach-hisi/

F:	arch/arm/mach-hisi/

F:	arch/arm/boot/dts/hi3*

F:	arch/arm/boot/dts/hip*

F:	arch/arm/boot/dts/hisi*

F:	arch/arm64/boot/dts/hisilicon/





ARM/HP JORNADA 7XX MACHINE SUPPORT

ARM/HP JORNADA 7XX MACHINE SUPPORT

M:	Kristoffer Ericson <kristoffer.ericson@gmail.com>

M:	Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@ -1219,6 +1226,7 @@ M: Santosh Shilimkar <ssantosh@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained

F:	arch/arm/mach-keystone/

F:	arch/arm/mach-keystone/

F:	arch/arm/boot/dts/k2*

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git





ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK

ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@ -1287,6 +1295,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

S:	Maintained

F:	arch/arm/mach-berlin/

F:	arch/arm/mach-berlin/

F:	arch/arm/boot/dts/berlin*

F:	arch/arm/boot/dts/berlin*

F:	arch/arm64/boot/dts/marvell/berlin*









ARM/Marvell Dove/MV78xx0/Orion SOC support

ARM/Marvell Dove/MV78xx0/Orion SOC support
@@ -1425,6 +1434,7 @@ S: Maintained 
F:	arch/arm/boot/dts/qcom-*.dts

F:	arch/arm/boot/dts/qcom-*.dts

F:	arch/arm/boot/dts/qcom-*.dtsi

F:	arch/arm/boot/dts/qcom-*.dtsi

F:	arch/arm/mach-qcom/

F:	arch/arm/mach-qcom/

F:	arch/arm64/boot/dts/qcom/*

F:	drivers/soc/qcom/

F:	drivers/soc/qcom/

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c

F:	drivers/tty/serial/msm_serial.c
@@ -1484,6 +1494,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/s3c*

F:	arch/arm/boot/dts/s3c*

F:	arch/arm/boot/dts/s5p*

F:	arch/arm/boot/dts/samsung*

F:	arch/arm/boot/dts/exynos*

F:	arch/arm/boot/dts/exynos*

F:	arch/arm64/boot/dts/exynos/

F:	arch/arm64/boot/dts/exynos/

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-samsung/
@@ -1563,6 +1575,7 @@ S: Maintained 
F:	arch/arm/mach-socfpga/

F:	arch/arm/mach-socfpga/

F:	arch/arm/boot/dts/socfpga*

F:	arch/arm/boot/dts/socfpga*

F:	arch/arm/configs/socfpga_defconfig

F:	arch/arm/configs/socfpga_defconfig

F:	arch/arm64/boot/dts/altera/

W:	http://www.rocketboards.org

W:	http://www.rocketboards.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
@@ -1716,7 +1729,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/vexpress*

F:	arch/arm/boot/dts/vexpress*

F:	arch/arm64/boot/dts/arm/vexpress*

F:	arch/arm64/boot/dts/arm/

F:	arch/arm/mach-vexpress/

F:	arch/arm/mach-vexpress/

F:	*/*/vexpress*

F:	*/*/vexpress*

F:	*/*/*/vexpress*

F:	*/*/*/vexpress*
@@ -2343,6 +2356,7 @@ F: arch/arm/mach-bcm/ 
F:	arch/arm/boot/dts/bcm113*

F:	arch/arm/boot/dts/bcm113*

F:	arch/arm/boot/dts/bcm216*

F:	arch/arm/boot/dts/bcm216*

F:	arch/arm/boot/dts/bcm281*

F:	arch/arm/boot/dts/bcm281*

F:	arch/arm64/boot/dts/broadcom/

F:	arch/arm/configs/bcm_defconfig

F:	arch/arm/configs/bcm_defconfig

F:	drivers/mmc/host/sdhci-bcm-kona.c

F:	drivers/mmc/host/sdhci-bcm-kona.c

F:	drivers/clocksource/bcm_kona_timer.c

F:	drivers/clocksource/bcm_kona_timer.c
@@ -8818,6 +8832,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://github.com/hzhuang1/linux.git

T:	git git://github.com/hzhuang1/linux.git

T:	git git://github.com/rjarzmik/linux.git

T:	git git://github.com/rjarzmik/linux.git

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/pxa*

F:	arch/arm/mach-pxa/

F:	arch/arm/mach-pxa/

F:	drivers/dma/pxa*

F:	drivers/dma/pxa*

F:	drivers/pcmcia/pxa2xx*

F:	drivers/pcmcia/pxa2xx*
@@ -8847,6 +8862,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://github.com/hzhuang1/linux.git

T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/mmp*

F:	arch/arm/mach-mmp/

F:	arch/arm/mach-mmp/





PXA MMCI DRIVER

PXA MMCI DRIVER
@@ -10291,6 +10307,7 @@ L: spear-devel@list.st.com 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

W:	http://www.st.com/spear

S:	Maintained

S:	Maintained

F:	arch/arm/boot/dts/spear*

F:	arch/arm/mach-spear/

F:	arch/arm/mach-spear/





SPEAR CLOCK FRAMEWORK SUPPORT

SPEAR CLOCK FRAMEWORK SUPPORT

include/linux/of.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -929,7 +929,7 @@ static inline int of_get_available_child_count(const struct device_node *np) 
	return num;

	return num;

}

}





#ifdef CONFIG_OF

#if defined(CONFIG_OF) && !defined(MODULE)

#define _OF_DECLARE(table, name, compat, fn, fn_type)			\

#define _OF_DECLARE(table, name, compat, fn, fn_type)			\

	static const struct of_device_id __of_table_##name		\

	static const struct of_device_id __of_table_##name		\

		__used __section(__##table##_of_table)			\

		__used __section(__##table##_of_table)			\

CRA Git | Maintained and supported by SUSTech CRA and CCSE