From 0b4b86fdc31ff7ad913f7734e8a09c7ecea8d6af Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 7 Apr 2014 10:34:24 -0500
Subject: [PATCH] cleanup more
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 17 -----
...0001-ARM-dts-mx6qdl-Add-HDMI-support.patch | 72 -------------------
...s-imx6qdl-wandboard-Add-HDMI-support.patch | 45 ------------
3 files changed, 134 deletions(-)
delete mode 100644 patches/imx_video_staging/0001-ARM-dts-mx6qdl-Add-HDMI-support.patch
delete mode 100644 patches/imx_video_staging/0002-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch
diff --git a/patch.sh b/patch.sh
index 689eac42a..f77fb52b7 100644
--- a/patch.sh
+++ b/patch.sh
@@ -85,22 +85,6 @@ clock () {
${git} "${DIR}/patches/clock/0007-beagle-xm-use-ti-abb-for-1Ghz-operation.patch"
}
-usb () {
- echo "dir: usb"
- ${git} "${DIR}/patches/usb/0001-mfd-omap-usb-host-Use-resource-managed-clk_get.patch"
- ${git} "${DIR}/patches/usb/0002-mfd-omap-usb-host-Get-clocks-based-on-hardware-revis.patch"
- ${git} "${DIR}/patches/usb/0003-mfd-omap-usb-host-Use-clock-names-as-per-function-fo.patch"
- ${git} "${DIR}/patches/usb/0004-mfd-omap-usb-host-Update-DT-clock-binding-informatio.patch"
- ${git} "${DIR}/patches/usb/0005-mfd-omap-usb-tll-Update-DT-clock-binding-information.patch"
- ${git} "${DIR}/patches/usb/0006-ARM-dts-omap4-Update-omap-usb-host-node.patch"
- ${git} "${DIR}/patches/usb/0007-ARM-dts-omap5-Update-omap-usb-host-node.patch"
- ${git} "${DIR}/patches/usb/0008-ARM-dts-omap4-panda-Provide-USB-PHY-clock.patch"
- ${git} "${DIR}/patches/usb/0009-ARM-dts-omap5-uevm-Provide-USB-PHY-clock.patch"
- ${git} "${DIR}/patches/usb/0010-ARM-OMAP2-Remove-legacy_init_ehci_clk.patch"
- ${git} "${DIR}/patches/usb/0011-ARM-dts-OMAP2-Get-rid-of-incompatible-ids-for-USB-ho.patch"
- ${git} "${DIR}/patches/usb/0012-usb-omap-dts-Update-DT-binding-example-usage.patch"
-}
-
dts () {
echo "dir: dts"
${git} "${DIR}/patches/dts/0001-ARM-dts-imx6qdl-wandboard-add-gpio-lines-to-wandboar.patch"
@@ -197,7 +181,6 @@ drivers
clock
dts
-#imx_video_staging
omap_sprz319_erratum
omap3_beagle_xm_rework
diff --git a/patches/imx_video_staging/0001-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/imx_video_staging/0001-ARM-dts-mx6qdl-Add-HDMI-support.patch
deleted file mode 100644
index d82ae4c0b..000000000
--- a/patches/imx_video_staging/0001-ARM-dts-mx6qdl-Add-HDMI-support.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1e00920bd0e7ce8d23a1a1881c9bad2107fef9ab Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <fabio.estevam@freescale.com>
-Date: Thu, 31 Oct 2013 10:57:34 -0200
-Subject: [PATCH 1/2] ARM: dts: mx6qdl: Add HDMI support
-
-Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
----
- arch/arm/boot/dts/imx6dl.dtsi | 14 ++++++++++++++
- arch/arm/boot/dts/imx6q.dtsi | 14 ++++++++++++++
- 2 files changed, 28 insertions(+)
-
-diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
-index b2f2699..79d60fd 100644
---- a/arch/arm/boot/dts/imx6dl.dtsi
-+++ b/arch/arm/boot/dts/imx6dl.dtsi
-@@ -41,6 +41,16 @@
- };
-
- aips1: aips-bus@02000000 {
-+ hdmi: hdmi@0120000 {
-+ compatible = "fsl,imx6dl-hdmi";
-+ reg = <0x00120000 0x9000>;
-+ interrupts = <0 115 0x04>;
-+ gpr = <&gpr>;
-+ clocks = <&clks 123>, <&clks 124>;
-+ clock-names = "iahb", "isfr";
-+ status = "disabled";
-+ };
-+
- iomuxc: iomuxc@020e0000 {
- compatible = "fsl,imx6dl-iomuxc";
- };
-@@ -90,3 +100,7 @@
- crtcs = <&ipu1 0>, <&ipu1 1>;
- };
- };
-+
-+&hdmi {
-+ crtcs = <&ipu1 0>, <&ipu1 1>;
-+};
-diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
-index 101c434..9908c2d 100644
---- a/arch/arm/boot/dts/imx6q.dtsi
-+++ b/arch/arm/boot/dts/imx6q.dtsi
-@@ -71,6 +71,16 @@
-
- aips-bus@02000000 { /* AIPS1 */
- spba-bus@02000000 {
-+ hdmi: hdmi@0120000 {
-+ compatible = "fsl,imx6q-hdmi";
-+ reg = <0x00120000 0x9000>;
-+ interrupts = <0 115 0x04>;
-+ gpr = <&gpr>;
-+ clocks = <&clks 123>, <&clks 124>;
-+ clock-names = "iahb", "isfr";
-+ status = "disabled";
-+ };
-+
- ecspi5: ecspi@02018000 {
- #address-cells = <1>;
- #size-cells = <0>;
-@@ -162,3 +172,7 @@
- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
- };
- };
-+
-+&hdmi {
-+ crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-+};
---
-1.8.5.3
-
diff --git a/patches/imx_video_staging/0002-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch b/patches/imx_video_staging/0002-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch
deleted file mode 100644
index 782acc374..000000000
--- a/patches/imx_video_staging/0002-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 19c48737c36ddc1242d94c965bc27989bc76aa4f Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <fabio.estevam@freescale.com>
-Date: Thu, 31 Oct 2013 10:58:55 -0200
-Subject: [PATCH 2/2] ARM: dts: imx6qdl-wandboard: Add HDMI support
-
-Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
----
- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
-index abf0107..5e071c0 100644
---- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
-@@ -81,7 +81,12 @@
- &i2c1 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c1>;
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+};
-+
-+&hdmi {
-+ ddc = <&i2c1>;
- status = "okay";
- };
-
-@@ -152,6 +157,13 @@
- >;
- };
-
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
- pinctrl_i2c2: i2c2grp {
- fsl,pins = <
- MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
---
-1.8.5.3
-
--
GitLab