From 3bf6f67befc2ec2213e38b625755325e5d61ff1f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 8 Dec 2015 02:23:40 +0000 Subject: [PATCH] core/linux-armv7-rc to 4.4.rc4-1 --- .../0008-USB-armory-support.patch | 104 +++++++++++++++--- core/linux-armv7-rc/PKGBUILD | 10 +- core/linux-armv7-rc/config | 6 +- 3 files changed, 97 insertions(+), 23 deletions(-) diff --git a/core/linux-armv7-rc/0008-USB-armory-support.patch b/core/linux-armv7-rc/0008-USB-armory-support.patch index 7796d116a..52862eeeb 100644 --- a/core/linux-armv7-rc/0008-USB-armory-support.patch +++ b/core/linux-armv7-rc/0008-USB-armory-support.patch @@ -1,43 +1,46 @@ -From 5cdbc78c3f2b1cbcdde1309a2a7a0a00a079e2be Mon Sep 17 00:00:00 2001 +From 0ae1ec1ae555397c91db254b18c9d95d8fe7854f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 7 Feb 2015 12:32:27 +0100 Subject: [PATCH 8/8] USB armory support --- - arch/arm/boot/dts/Makefile | 4 + - arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 210 ++++++++++++++++++++++++++ - arch/arm/boot/dts/imx53-usbarmory-gpio.dts | 26 ++++ - arch/arm/boot/dts/imx53-usbarmory-host.dts | 18 +++ - arch/arm/boot/dts/imx53-usbarmory-spi.dts | 45 ++++++ - arch/arm/boot/dts/imx53-usbarmory.dts | 18 +++ - 6 files changed, 321 insertions(+) + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 241 ++++++++++++++++++++++++++ + arch/arm/boot/dts/imx53-usbarmory-gpio.dts | 26 +++ + arch/arm/boot/dts/imx53-usbarmory-host.dts | 18 ++ + arch/arm/boot/dts/imx53-usbarmory-i2c.dts | 32 ++++ + arch/arm/boot/dts/imx53-usbarmory-spi.dts | 45 +++++ + arch/arm/boot/dts/imx53-usbarmory.dts | 18 ++ + 7 files changed, 385 insertions(+) create mode 100644 arch/arm/boot/dts/imx53-usbarmory-common.dtsi create mode 100644 arch/arm/boot/dts/imx53-usbarmory-gpio.dts create mode 100644 arch/arm/boot/dts/imx53-usbarmory-host.dts + create mode 100644 arch/arm/boot/dts/imx53-usbarmory-i2c.dts create mode 100644 arch/arm/boot/dts/imx53-usbarmory-spi.dts create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 4a41a60..a1e11d7 100644 +index 4a41a60..a2df2c2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -268,6 +268,10 @@ dtb-$(CONFIG_SOC_IMX53) += \ +@@ -268,6 +268,11 @@ dtb-$(CONFIG_SOC_IMX53) += \ imx53-smd.dtb \ imx53-tx53-x03x.dtb \ imx53-tx53-x13x.dtb \ + imx53-usbarmory.dtb \ + imx53-usbarmory-gpio.dtb \ + imx53-usbarmory-host.dtb \ ++ imx53-usbarmory-i2c.dtb \ + imx53-usbarmory-spi.dtb \ imx53-voipac-bsb.dtb dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-apf6dev.dtb \ diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi new file mode 100644 -index 0000000..26b9ce8 +index 0000000..b73c399 --- /dev/null +++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi -@@ -0,0 +1,210 @@ +@@ -0,0 +1,241 @@ +/* + * USB armory MkI device tree include file + * http://inversepath.com/usbarmory @@ -132,13 +135,18 @@ index 0000000..26b9ce8 + >; + }; + -+ pinctrl_i2c1: i2c1grp { ++ pinctrl_i2c1_pmic: i2c1grp_pmic { + fsl,pins = < -+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000 -+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000 ++ 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 @@ -146,6 +154,11 @@ index 0000000..26b9ce8 + >; + }; + ++ /* ++ 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 @@ -156,6 +169,11 @@ index 0000000..26b9ce8 + >; + }; + ++ /* ++ 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 @@ -165,6 +183,21 @@ index 0000000..26b9ce8 + 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 ++ >; ++ }; + }; +}; + @@ -179,10 +212,11 @@ index 0000000..26b9ce8 +}; + +&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>; @@ -304,6 +338,44 @@ index 0000000..ea2ea45 + dr_mode = "host"; + status = "okay"; +}; +diff --git a/arch/arm/boot/dts/imx53-usbarmory-i2c.dts b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts +new file mode 100644 +index 0000000..c66bbb5 +--- /dev/null ++++ b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts +@@ -0,0 +1,32 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * http://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * 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 --git a/arch/arm/boot/dts/imx53-usbarmory-spi.dts b/arch/arm/boot/dts/imx53-usbarmory-spi.dts new file mode 100644 index 0000000..414d641 diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index aad50ee3b..e470296aa 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=4 _rcver=4.4 -_rcrel=3 +_rcrel=4 _rcnrel=armv7-x1 pkgbase=linux-armv7-rc @@ -36,8 +36,8 @@ source=(#"http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'kernel.its' 'kernel.keyblock' 'kernel_data_key.vbprivk') -md5sums=('e1d3a425a135654c6d2cbc4547e287ee' - '44dbbbf250a0a1150bd3ea5eadc28031' +md5sums=('893caa049cd5c680bf6770603d6cb416' + 'e5cb194f856c365ff299998218f83d0c' '8ea5f9e5dc4cccabb26a8fd0048da4a9' 'acc9cb3f7c34def13e311bbc7893c0d1' '68b4a3e938d9ab24d8d82a2a7ddbff2a' @@ -45,8 +45,8 @@ md5sums=('e1d3a425a135654c6d2cbc4547e287ee' '7507fdc224b1000a81f87316befd0f6c' 'd77167c977871128b862b9aaffde23bc' 'acb3f83e664bd23fdddf69044b2b0eb4' - 'c498ac5d87a82d41742eff42d2160775' - '2518d76d7ce7d5d5a08df27dee3b1288' + '825186972ceb93fe91a9b027731dd95b' + 'c3c96af8f066e9675b882db01254544f' '1813b39074d01af6548951764a0f6444' '4b0392e55063eb9f89d91affd1189fc5' '61c5ff73c136ed07a7aadbf58db3d96a' diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index 8a58c4b9f..f996dea8d 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.4.0-rc2-1 Kernel Configuration +# Linux/arm 4.4.0-rc4-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -2085,6 +2085,7 @@ CONFIG_ISCSI_BOOT_SYSFS=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_MPT2SAS is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_SNIC is not set @@ -2336,6 +2337,7 @@ CONFIG_ARC_EMAC_CORE=m CONFIG_ARC_EMAC=m CONFIG_EMAC_ROCKCHIP=m # CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROCADE is not set @@ -3077,7 +3079,7 @@ CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y +# CONFIG_SERIAL_8250_DMA is not set CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6