Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (1ffab3d4) · Commits · 戴 / test

Pull ARM SoC fixes from Olof Johansson: "This is a batch of fixes for arm-soc platforms, most of it is for OMAP but there are others too (i.MX, Tegra, ep93xx). Fixes warnings, some broken platforms and drivers, etc. A bit all over the map really." There was some concern about commit ("RM: sunxi: Change device tree naming scheme for sunxi"), but Tony says: "Looks like that's trivial to fix as needed, no need to rebuild the branch to fix that AFAIK. The fix can be done once Olof is available online again. Linus, I suggest that you go ahead and pull this if there are no other issues with this branch." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits) ARM: sunxi: Change device tree naming scheme for sunxi ARM: ux500: fix missing include ARM: u300: delete custom pin hog code ARM: davinci: fix build break due to missing include ARM: exynos: Fix warning due to missing 'inline' in stub ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks ARM: dts: mx27: Fix the AIPI bus for FEC ARM: OMAP2+: common: remove use of vram ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider ARM: OMAP4: Fix EMU clock domain always on ARM: OMAP4460: Workaround ABE DPLL failing to turn-on ARM: OMAP4: Enhance support for DPLLs with 4X multiplier ARM: OMAP4: Add function table for non-M4X dplls ARM: OMAP4: Update timer clock aliases ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h ARM: dts: Add build target for omap4-panda-a4 ARM: dts: OMAP2420: Correct H4 board memory size ...

arch/arm/boot/dts/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
		omap3-evm.dtb \
		omap3-tobi.dtb \
		omap4-panda.dtb \
		omap4-panda-a4.dtb \
		omap4-panda-es.dtb \
		omap4-var-som.dtb \
		omap4-sdp.dtb \
		@@ -131,8 +132,8 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
		spear320-evb.dtb \
		spear320-hmi.dtb
		dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
		dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \
		sun5i-olinuxino.dtb
		dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
		sun5i-a13-olinuxino.dtb
		dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
		tegra20-medcom-wide.dtb \
		tegra20-paz00.dtb \

arch/arm/boot/dts/imx27-3ds.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -21,17 +21,17 @@
		};

		soc {
		aipi@10000000 { /* aipi */

		aipi@10000000 { /* aipi1 */
		uart1: serial@1000a000 {
		fsl,uart-has-rtscts;
		status = "okay";
		};
		};

		fec@1002b000 {
		aipi@10020000 { /* aipi2 */
		ethernet@1002b000 {
		status = "okay";
		};
		};
		};

		};

arch/arm/boot/dts/imx27-phytec-phycore.dts

+7 −6

Original line number	Diff line number	Diff line
		@@ -21,8 +21,7 @@
		};

		soc {
		aipi@10000000 { /* aipi */

		aipi@10000000 { /* aipi1 */
		serial@1000a000 {
		fsl,uart-has-rtscts;
		status = "okay";
		@@ -38,10 +37,6 @@
		status = "okay";
		};

		ethernet@1002b000 {
		status = "okay";
		};

		i2c@1001d000 {
		clock-frequency = <400000>;
		status = "okay";
		@@ -60,6 +55,12 @@
		};
		};
		};

		aipi@10020000 { /* aipi2 */
		ethernet@1002b000 {
		status = "okay";
		};
		};
		};

		nor_flash@c0000000 {

arch/arm/boot/dts/imx27.dtsi

+10 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		compatible = "fsl,aipi-bus", "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x10000000 0x10000000>;
		reg = <0x10000000 0x20000>;
		ranges;

		wdog: wdog@10002000 {
		@@ -211,6 +211,15 @@
		status = "disabled";
		};

		};

		aipi@10020000 { /* AIPI2 */
		compatible = "fsl,aipi-bus", "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x10020000 0x20000>;
		ranges;

		fec: ethernet@1002b000 {
		compatible = "fsl,imx27-fec";
		reg = <0x1002b000 0x4000>;

arch/arm/boot/dts/omap2420-h4.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,6 @@

		memory {
		device_type = "memory";
		reg = <0x80000000 0x84000000>; /* 64 MB */
		reg = <0x80000000 0x4000000>; /* 64 MB */
		};
		};

Admin message