Commit e914e3f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull more ARM updates from Russell King:
 "Some further changes for this merge window:
   - fix bug building with gcc 4.6.4 and EABI.
   - fix pgtbl macro with some LPAE configurations
   - fix initrd override - FDT was overriding the command line, and it
     should be the other way around.
   - fix byteswap of instructions in undefined instruction handler
   - add basic support for SolidRun Hummingboard and Cubox-i boards"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: fix building with gcc 4.6.4
  ARM: 7941/2: Fix incorrect FDT initrd parameter override
  ARM: 7947/1: Make pgtbl macro more robust
  ARM: 7946/1: asm: __und_usr_thumb need byteswap instructions in BE case
  ARM: 7930/1: Introduce atomic MMIO modify
  ARM: imx: initial SolidRun Cubox-i support
  ARM: imx: initial SolidRun HummingBoard support
parents 1d494f36 5efa9064

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 
tune-y := $(tune-y)



ifeq ($(CONFIG_AEABI),y)

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp

else

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

endif

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -152,10 +152,13 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx53-mba53.dtb \

	imx53-qsb.dtb \

	imx53-smd.dtb \

	imx6dl-cubox-i.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-sabreauto.dtb \

	imx6dl-sabresd.dtb \

	imx6dl-wandboard.dtb \

	imx6q-arm2.dtb \

	imx6q-cubox-i.dtb \

	imx6q-phytec-pbab01.dtb \

	imx6q-sabreauto.dtb \

	imx6q-sabrelite.dtb \

arch/arm/boot/dts/imx6dl-cubox-i.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Russell King

 */

/dts-v1/;



#include "imx6dl.dtsi"

#include "imx6qdl-cubox-i.dtsi"



/ {

	model = "SolidRun Cubox-i Solo/DualLite";

	compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";

};

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

0 → 100644
+167 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013,2014 Russell King

 */

/dts-v1/;



#include "imx6dl.dtsi"

#include "imx6qdl-microsom.dtsi"

#include "imx6qdl-microsom-ar8035.dtsi"



/ {

	model = "SolidRun HummingBoard DL/Solo";

	compatible = "solidrun,hummingboard", "fsl,imx6dl";



	ir_recv: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio1 2 1>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_hummingboard_gpio1_2>;

	};



	regulators {

		compatible = "simple-bus";



		reg_3p3v: 3p3v {

			compatible = "regulator-fixed";

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};



		reg_usbh1_vbus: usb-h1-vbus {

			compatible = "regulator-fixed";

			enable-active-high;

			gpio = <&gpio1 0 0>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;

			regulator-name = "usb_h1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

		};



		reg_usbotg_vbus: usb-otg-vbus {

			compatible = "regulator-fixed";

			enable-active-high;

			gpio = <&gpio3 22 0>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;

			regulator-name = "usb_otg_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

		};

	};



	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";

		/* IMX6 doesn't implement this yet */

		spdif-controller = <&spdif>;

		spdif-out;

	};

};



&can1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_i2c1>;



	/*

	 * Not fitted on Carrier-1 board... yet

	status = "okay";



	rtc: pcf8523@68 {

		compatible = "nxp,pcf8523";

		reg = <0x68>;

	};

	 */

};



&iomuxc {

	hummingboard {

		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {

			fsl,pins = <

				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000

				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000

			>;

		};



		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {

			fsl,pins = <

				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000

			>;

		};



		pinctrl_hummingboard_i2c1: hummingboard-i2c1 {

			fsl,pins = <

				MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1

				MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1

			>;

		};



		pinctrl_hummingboard_spdif: hummingboard-spdif {

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;

		};



		pinctrl_hummingboard_usbh1_vbus: hummingboard-usbh1-vbus {

			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;

		};



		pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {

			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;

		};



		pinctrl_hummingboard_usdhc2_aux: hummingboard-usdhc2-aux {

			fsl,pins = <

				MX6QDL_PAD_GPIO_4__GPIO1_IO04    0x1f071

			>;

		};



		pinctrl_hummingboard_usdhc2: hummingboard-usdhc2 {

			fsl,pins = <

				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059

				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059

				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059

				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059

				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059

				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059

			>;

		};

	};

};



&spdif {

	status = "okay";

};



&usbh1 {

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};



&usdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <

		&pinctrl_hummingboard_usdhc2_aux

		&pinctrl_hummingboard_usdhc2

	>;

	vmmc-supply = <&reg_3p3v>;

	cd-gpios = <&gpio1 4 0>;

	status = "okay";

};

arch/arm/boot/dts/imx6q-cubox-i.dts

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Russell King

 */

/dts-v1/;



#include "imx6q.dtsi"

#include "imx6qdl-cubox-i.dtsi"



/ {

	model = "SolidRun Cubox-i Dual/Quad";

	compatible = "solidrun,cubox-i/q", "fsl,imx6q";

};



&sata {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE