419 lines
10 KiB
Diff
419 lines
10 KiB
Diff
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,241 @@
|
|
+/*
|
|
+ * USB armory MkI device tree include file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+#include "imx53.dtsi"
|
|
+
|
|
+/ {
|
|
+ model = "Inverse Path USB armory";
|
|
+ compatible = "inversepath,imx53-usbarmory", "fsl,imx53";
|
|
+};
|
|
+
|
|
+/ {
|
|
+ chosen {
|
|
+ stdout-path = &uart1;
|
|
+ };
|
|
+
|
|
+ memory {
|
|
+ reg = <0x70000000 0x20000000>;
|
|
+ };
|
|
+
|
|
+ leds {
|
|
+ compatible = "gpio-leds";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&led_pin_gpio4_27>;
|
|
+
|
|
+ user {
|
|
+ label = "LED";
|
|
+ gpios = <&gpio4 27 0>;
|
|
+ linux,default-trigger = "heartbeat";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ soc {
|
|
+ aips@60000000 {
|
|
+ sahara: crypto@63ff8000 {
|
|
+ compatible = "fsl,imx53-sahara";
|
|
+ reg = <0x63ff8000 0x4000>;
|
|
+ interrupts = <19 20>;
|
|
+ clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>,
|
|
+ <&clks IMX5_CLK_SAHARA_IPG_GATE>;
|
|
+ clock-names = "ipg", "ahb";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&cpu0 {
|
|
+ device_type = "cpu";
|
|
+ compatible = "arm,cortex-a8";
|
|
+ reg = <0x0>;
|
|
+ clocks = <&clks IMX5_CLK_ARM>;
|
|
+ clock-latency = <61036>;
|
|
+ voltage-tolerance = <5>;
|
|
+ operating-points = <
|
|
+ /* kHz */
|
|
+ 166666 850000
|
|
+ 400000 900000
|
|
+ 800000 1050000
|
|
+ >;
|
|
+};
|
|
+
|
|
+&esdhc1 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_esdhc1>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&iomuxc {
|
|
+ pinctrl-names = "default";
|
|
+
|
|
+ imx53-usbarmory {
|
|
+ led_pin_gpio4_27: led_gpio4_27@0 {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ pinctrl_esdhc1: esdhc1grp {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
|
|
+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
|
|
+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
|
|
+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
|
|
+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
|
|
+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ pinctrl_i2c1_pmic: i2c1grp_pmic {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000
|
|
+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ /*
|
|
+ UART mode pin header configration:
|
|
+ pin number: 1 2 3 4 5 6 7
|
|
+ function: GND 5V ? ? TX RX ?
|
|
+ */
|
|
+ pinctrl_uart1: uart1grp {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4
|
|
+ MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ /*
|
|
+ GPIO mode pin header configuration:
|
|
+ 1 2 3 4 5 6 7
|
|
+ GND 5V GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30]
|
|
+ */
|
|
+ pinctrl_gpio5: gpio5grp {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0
|
|
+ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0
|
|
+ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0
|
|
+ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0
|
|
+ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ /*
|
|
+ SPI mode pin header configuration:
|
|
+ 1 2 3 4 5 6 7
|
|
+ GND 5V SCLK MOSI MISO /SS0 /SS1
|
|
+ */
|
|
+ pinctrl_ecspi2: ecspi2grp {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_CSI0_DAT8__ECSPI2_SCLK 0x80000000
|
|
+ MX53_PAD_CSI0_DAT9__ECSPI2_MOSI 0x80000000
|
|
+ MX53_PAD_CSI0_DAT10__ECSPI2_MISO 0x80000000
|
|
+ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000
|
|
+ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ /*
|
|
+ I2C mode pin header configuration:
|
|
+ 1 2 3 4 5 6 7
|
|
+ GND 5V SDA SCL GPIO5[28] GPIO5[29] GPIO5[30]
|
|
+ */
|
|
+ pinctrl_i2c1_pinheader: i2c1grp_pinheader {
|
|
+ fsl,pins = <
|
|
+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000
|
|
+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000
|
|
+ MX53_PAD_CSI0_DAT10__GPIO5_28 0x80000000
|
|
+ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000
|
|
+ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000
|
|
+ >;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&uart1 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_uart1>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&vpu {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&i2c1 {
|
|
+ pinctrl-0 = <&pinctrl_i2c1_pmic>;
|
|
+ status = "okay";
|
|
+ ltc3589: pmic@34 {
|
|
+ compatible = "lltc,ltc3589-2";
|
|
+ reg = <0x34>;
|
|
+ regulators {
|
|
+ sw1_reg: sw1 {
|
|
+ regulator-min-microvolt = <591930>;
|
|
+ regulator-max-microvolt = <1224671>;
|
|
+ lltc,fb-voltage-divider = <100000 158000>;
|
|
+ regulator-ramp-delay = <7000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+
|
|
+ sw2_reg: sw2 {
|
|
+ regulator-min-microvolt = <704123>;
|
|
+ regulator-max-microvolt = <1456803>;
|
|
+ lltc,fb-voltage-divider = <180000 191000>;
|
|
+ regulator-ramp-delay = <7000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+
|
|
+ sw3_reg: sw3 {
|
|
+ regulator-min-microvolt = <1341250>;
|
|
+ regulator-max-microvolt = <2775000>;
|
|
+ lltc,fb-voltage-divider = <270000 100000>;
|
|
+ regulator-ramp-delay = <7000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+
|
|
+ bb_out_reg: bb-out {
|
|
+ regulator-min-microvolt = <3387341>;
|
|
+ regulator-max-microvolt = <3387341>;
|
|
+ lltc,fb-voltage-divider = <511000 158000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+ ldo1_reg: ldo1 {
|
|
+ regulator-min-microvolt = <1306329>;
|
|
+ regulator-max-microvolt = <1306329>;
|
|
+ lltc,fb-voltage-divider = <100000 158000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+
|
|
+ ldo2_reg: ldo2 {
|
|
+ regulator-min-microvolt = <704123>;
|
|
+ regulator-max-microvolt = <1456806>;
|
|
+ lltc,fb-voltage-divider = <180000 191000>;
|
|
+ regulator-ramp-delay = <7000>;
|
|
+ regulator-boot-on;
|
|
+ regulator-always-on;
|
|
+ };
|
|
+
|
|
+ ldo3_reg: ldo3 {
|
|
+ regulator-min-microvolt = <2800000>;
|
|
+ regulator-max-microvolt = <2800000>;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ ldo4_reg: ldo4 {
|
|
+ regulator-min-microvolt = <1200000>;
|
|
+ regulator-max-microvolt = <3200000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,18 @@
|
|
+/*
|
|
+ * USB armory MkI device mode device tree file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "imx53-usbarmory-common.dtsi"
|
|
+
|
|
+&usbotg {
|
|
+ dr_mode = "peripheral";
|
|
+ status = "okay";
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,26 @@
|
|
+/*
|
|
+ * USB armory MkI device mode device tree file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "imx53-usbarmory-common.dtsi"
|
|
+
|
|
+&usbotg {
|
|
+ dr_mode = "peripheral";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&iomuxc {
|
|
+ pinctrl-0 = <&pinctrl_gpio5>;
|
|
+};
|
|
+
|
|
+&uart1 {
|
|
+ status = "disabled";
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,18 @@
|
|
+/*
|
|
+ * USB armory MkI host mode device tree file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "imx53-usbarmory-common.dtsi"
|
|
+
|
|
+&usbotg {
|
|
+ dr_mode = "host";
|
|
+ status = "okay";
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,32 @@
|
|
+/*
|
|
+ * USB armory MkI device mode device tree file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "imx53-usbarmory-common.dtsi"
|
|
+
|
|
+&usbotg {
|
|
+ dr_mode = "peripheral";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&uart1 {
|
|
+ status = "disabled";
|
|
+};
|
|
+
|
|
+&iomuxc {
|
|
+ pinctrl-0 = <&pinctrl_i2c1_pinheader>;
|
|
+};
|
|
+
|
|
+&i2c1 {
|
|
+ ltc3589: pmic@34 {
|
|
+ status = "disabled";
|
|
+ };
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts
|
|
--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts 1969-12-31 18:00:00.000000000 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts 2016-02-04 08:31:38.730794858 -0600
|
|
@@ -0,0 +1,45 @@
|
|
+/*
|
|
+ * USB armory MkI device mode device tree file
|
|
+ * https://inversepath.com/usbarmory
|
|
+ *
|
|
+ * Copyright (C) 2015, Inverse Path
|
|
+ * Andrej Rosano <andrej@inversepath.com>
|
|
+ *
|
|
+ * Licensed under GPLv2
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "imx53-usbarmory-common.dtsi"
|
|
+
|
|
+&usbotg {
|
|
+ dr_mode = "peripheral";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&uart1 {
|
|
+ status = "disabled";
|
|
+};
|
|
+
|
|
+&iomuxc {
|
|
+ pinctrl-0 = <&pinctrl_ecspi2>;
|
|
+};
|
|
+
|
|
+&ecspi2 {
|
|
+ fsl,spi-num-chipselects = <2>;
|
|
+ cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>;
|
|
+ status = "okay";
|
|
+
|
|
+ flash: m25p40@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ compatible = "st,m25p40", "st,m25p";
|
|
+ spi-max-frequency = <20000000>;
|
|
+ reg = <0>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "test-partition";
|
|
+ reg = <0x0 0x80000>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff -Nru linux-4.4-orig/arch/arm/boot/dts/Makefile linux-4.4/arch/arm/boot/dts/Makefile
|
|
--- linux-4.4-orig/arch/arm/boot/dts/Makefile 2016-02-04 13:29:20.880919101 -0600
|
|
+++ linux-4.4/arch/arm/boot/dts/Makefile 2016-02-04 13:27:10.733849955 -0600
|
|
@@ -278,6 +278,10 @@
|
|
imx53-smd.dtb \
|
|
imx53-tx53-x03x.dtb \
|
|
imx53-tx53-x13x.dtb \
|
|
+ imx53-usbarmory.dtb \
|
|
+ imx53-usbarmory-host.dtb \
|
|
+ imx53-usbarmory-i2c.dtb \
|
|
+ imx53-usbarmory-gpio.dtb \
|
|
imx53-voipac-bsb.dtb
|
|
dtb-$(CONFIG_SOC_IMX6Q) += \
|
|
imx6dl-apf6dev.dtb \
|