Commit 09be3f5e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

i.MX6 device tree changes for 3.15, take 2 from Shawn Guo:
 - Add USB, GPMI and SATA support for imx6q-phytec board
 - Update imx6sl-evk board support regarding PFUZE100, audio and
   LED etc.
 - Minor updates on a few imx6qdl boards

* tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: dts: imx6q-phytec: Added SATA Support
  ARM: dts: imx6q-phytec: Added GPMI-NAND Support
  ARM: dts: imx6q-phytec: Added USB_HOST Support
  ARM: dts: imx6q-phytec: Added USB_OTG Support
  ARM: dts: imx6sl-evk: Keep VGEN1 regulator always enabled
  ARM: dts: imx6qdl-sabreauto: Support debug LED
  ARM: dts: imx6q: add 852MHz setpoint for CPU freq
  ARM: dts: imx6qdl-wandboard: use GPIO_6 for FEC interrupt
  ARM: dts: imx6sl-evk: Add debug LED support
  ARM: dts: imx6qdl-sabreauto: Add PFUZE100 support
  ARM: dts: imx6sl-evk: Add audio support
  ARM: dts: imx6sl-evk: Add PFUZE100 support
  ARM: dts: imx6qdl-sabresd: correct gpio key's active state

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6e77adb2 55b0ef4e

arch/arm/boot/dts/imx6q-phytec-pbab01.dts

+16 −0
Original line number Diff line number Diff line
@@ -21,10 +21,26 @@ 
	status = "okay";

};



&gpmi {

	status = "okay";

};



&sata {

	status = "okay";

};



&uart4 {

	status = "okay";

};



&usbh1 {

	status = "okay";

};



&usbotg {

	status = "okay";

};



&usdhc2 {

	status = "okay";

};

arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi

+82 −0
Original line number Diff line number Diff line
@@ -18,6 +18,30 @@ 
	memory {

		reg = <0x10000000 0x80000000>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb_otg_vbus: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "usb_otg_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 15 0>;

		};



		reg_usb_h1_vbus: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "usb_h1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 0 0>;

		};

	};

};



&ecspi3 {
@@ -166,6 +190,28 @@ 
			>;

		};



		pinctrl_gpmi_nand: gpminandgrp {

			fsl,pins = <

				MX6QDL_PAD_NANDF_CLE__NAND_CLE		0xb0b1

				MX6QDL_PAD_NANDF_ALE__NAND_ALE		0xb0b1

				MX6QDL_PAD_NANDF_WP_B__NAND_WP_B	0xb0b1

				MX6QDL_PAD_NANDF_RB0__NAND_READY_B	0xb000

				MX6QDL_PAD_NANDF_CS0__NAND_CE0_B	0xb0b1

				MX6QDL_PAD_NANDF_CS1__NAND_CE1_B	0xb0b1

				MX6QDL_PAD_SD4_CMD__NAND_RE_B		0xb0b1

				MX6QDL_PAD_SD4_CLK__NAND_WE_B		0xb0b1

				MX6QDL_PAD_NANDF_D0__NAND_DATA00	0xb0b1

				MX6QDL_PAD_NANDF_D1__NAND_DATA01	0xb0b1

				MX6QDL_PAD_NANDF_D2__NAND_DATA02	0xb0b1

				MX6QDL_PAD_NANDF_D3__NAND_DATA03	0xb0b1

				MX6QDL_PAD_NANDF_D4__NAND_DATA04	0xb0b1

				MX6QDL_PAD_NANDF_D5__NAND_DATA05	0xb0b1

				MX6QDL_PAD_NANDF_D6__NAND_DATA06	0xb0b1

				MX6QDL_PAD_NANDF_D7__NAND_DATA07	0xb0b1

				MX6QDL_PAD_SD4_DAT0__NAND_DQS		0x00b1

			>;

		};



		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX6QDL_PAD_EIM_D21__I2C1_SCL		0x4001b8b1
@@ -180,6 +226,20 @@ 
			>;

		};



		pinctrl_usbh1: usbh1grp {

			fsl,pins = <

				MX6QDL_PAD_GPIO_0__USB_H1_PWR		0x80000000

			>;

		};



		pinctrl_usbotg: usbotggrp {

			fsl,pins = <

				MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059

				MX6QDL_PAD_KEY_COL4__USB_OTG_OC		0x1b0b0

				MX6QDL_PAD_KEY_ROW4__GPIO4_IO15		0x80000000

			>;

		};



		pinctrl_usdhc2: usdhc2grp {

			fsl,pins = <

				MX6QDL_PAD_SD2_CMD__SD2_CMD		0x17059
@@ -219,12 +279,34 @@ 
	status = "disabled";

};



&gpmi {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_gpmi_nand>;

	nand-on-flash-bbt;

	status = "disabled";

};



&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart4>;

	status = "disabled";

};



&usbh1 {

	vbus-supply = <&reg_usb_h1_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbh1>;

	status = "disabled";

};



&usbotg {

	vbus-supply = <&reg_usb_otg_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg>;

	disable-over-current;

	status = "disabled";

};



&usdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2>;

arch/arm/boot/dts/imx6q.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
				/* kHz    uV */

				1200000 1275000

				996000  1250000

				852000  1250000

				792000  1150000

				396000  975000

			>;
@@ -37,6 +38,7 @@ 
				/* ARM kHz  SOC-PU uV */

				1200000 1275000

				996000	1250000

				852000	1250000

				792000	1175000

				396000	1175000

			>;

arch/arm/boot/dts/imx6qdl-sabreauto.dtsi

+132 −0
Original line number Diff line number Diff line
@@ -10,11 +10,24 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include <dt-bindings/gpio/gpio.h>



/ {

	memory {

		reg = <0x10000000 0x80000000>;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_leds>;



		user {

			label = "debug";

			gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>;

		};

	};



	sound-spdif {

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

			   "fsl,imx-sabreauto-spdif";
@@ -63,6 +76,112 @@ 
	status = "okay";

};



&i2c2 {

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	pmic: pfuze100@08 {

		compatible = "fsl,pfuze100";

		reg = <0x08>;



		regulators {

			sw1a_reg: sw1ab {

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-boot-on;

				regulator-always-on;

				regulator-ramp-delay = <6250>;

			};



			sw1c_reg: sw1c {

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-boot-on;

				regulator-always-on;

				regulator-ramp-delay = <6250>;

			};



			sw2_reg: sw2 {

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

				regulator-always-on;

			};



			sw3a_reg: sw3a {

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1975000>;

				regulator-boot-on;

				regulator-always-on;

			};



			sw3b_reg: sw3b {

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1975000>;

				regulator-boot-on;

				regulator-always-on;

			};



			sw4_reg: sw4 {

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <3300000>;

			};



			swbst_reg: swbst {

				regulator-min-microvolt = <5000000>;

				regulator-max-microvolt = <5150000>;

			};



			snvs_reg: vsnvs {

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <3000000>;

				regulator-boot-on;

				regulator-always-on;

			};



			vref_reg: vrefddr {

				regulator-boot-on;

				regulator-always-on;

			};



			vgen1_reg: vgen1 {

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1550000>;

			};



			vgen2_reg: vgen2 {

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1550000>;

			};



			vgen3_reg: vgen3 {

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

			};



			vgen4_reg: vgen4 {

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};



			vgen5_reg: vgen5 {

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};



			vgen6_reg: vgen6 {

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};

		};

	};

};



&iomuxc {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hog>;
@@ -111,6 +230,12 @@ 
			>;

		};



		pinctrl_gpio_leds: gpioledsgrp {

			fsl,pins = <

				MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15	0x80000000

			>;

		};



		pinctrl_gpmi_nand: gpminandgrp {

			fsl,pins = <

				MX6QDL_PAD_NANDF_CLE__NAND_CLE		0xb0b1
@@ -133,6 +258,13 @@ 
			>;

		};



		pinctrl_i2c2: i2c2grp {

			fsl,pins = <

				MX6QDL_PAD_EIM_EB2__I2C2_SCL	0x4001b8b1

				MX6QDL_PAD_KEY_ROW3__I2C2_SDA	0x4001b8b1

			>;

		};



		pinctrl_pwm3: pwm1grp {

			fsl,pins = <

				MX6QDL_PAD_SD4_DAT1__PWM3_OUT		0x1b0b1

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



/ {
@@ -58,21 +59,21 @@ 


		power {

			label = "Power Button";

			gpios = <&gpio3 29 0>;

			gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

			linux,code = <KEY_POWER>;

		};



		volume-up {

			label = "Volume Up";

			gpios = <&gpio1 4 0>;

			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

			linux,code = <KEY_VOLUMEUP>;

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio1 5 0>;

			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

			linux,code = <KEY_VOLUMEDOWN>;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE