Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95959e6a authored by Russell King's avatar Russell King
Browse files

Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and... 

Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next
parents f210c53a 95c52fe0 e26a9e00 dfdf5f63 aa4c5b96 1ef2bf82

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ config BL_SWITCHER_DUMMY_IF 


choice

	prompt "Memory split"

	depends on MMU

	default VMSPLIT_3G

	help

	  Select the desired split between kernel and user memory.
@@ -1595,6 +1596,7 @@ endchoice 


config PAGE_OFFSET

	hex

	default PHYS_OFFSET if !MMU

	default 0x40000000 if VMSPLIT_1G

	default 0x80000000 if VMSPLIT_2G

	default 0xC0000000

arch/arm/boot/compressed/.gitignore

+1 −0
Original line number Diff line number Diff line 
ashldi3.S

bswapsdi2.S

font.c

lib1funcs.S

hyp-stub.S

arch/arm/boot/dts/imx6dl-hummingboard.dts

+3 −7
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ 
		};

	};



	codec: spdif-transmitter {

		compatible = "linux,spdif-dit";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_hummingboard_spdif>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";
@@ -111,7 +105,7 @@ 
		};



		pinctrl_hummingboard_spdif: hummingboard-spdif {

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_hummingboard_usbh1_vbus: hummingboard-usbh1-vbus {
@@ -142,6 +136,8 @@ 
};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_spdif>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ 
		};

	};



	codec: spdif-transmitter {

		compatible = "linux,spdif-dit";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_cubox_i_spdif>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";
@@ -89,7 +83,7 @@ 
		};



		pinctrl_cubox_i_spdif: cubox-i-spdif {

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {
@@ -121,6 +115,8 @@ 
};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_spdif>;

	status = "okay";

};

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_TI_PRIV_EDMA)	+= edma.o