Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
3.8: add support for more DVI capes, fix thumb2 build
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
- Loading branch information
Showing
5 changed files
with
171 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
patches/build/0001-ARM-force-march-armv7a-for-thumb2-builds-http-lists..patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From 51a2452ac8f537e2c3f8e5ef329d4379e8111b41 Mon Sep 17 00:00:00 2001 | ||
| From: Koen Kooi <koen@dominion.thruhere.net> | ||
| Date: Wed, 3 Apr 2013 09:36:21 +0200 | ||
| Subject: [PATCH] ARM: force -march=armv7a for thumb2 builds - | ||
| http://lists.linaro.org/pipermail/linaro-dev/2011-August/006752.html | ||
|
|
||
| Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| --- | ||
| arch/arm/boot/compressed/Makefile | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile | ||
| index 5cad8a6..12edc8c 100644 | ||
| --- a/arch/arm/boot/compressed/Makefile | ||
| +++ b/arch/arm/boot/compressed/Makefile | ||
| @@ -121,7 +121,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | ||
| endif | ||
|
|
||
| ccflags-y := -fpic -fno-builtin -I$(obj) | ||
| -asflags-y := -Wa,-march=all -DZIMAGE | ||
| +asflags-y := -Wa,-march=armv7a -DZIMAGE | ||
|
|
||
| # Supply kernel BSS size to the decompressor via a linker symbol. | ||
| KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \ | ||
| -- | ||
| 1.8.1.4 | ||
|
|
38 changes: 0 additions & 38 deletions
38
patches/build/0001-scripts-Makefile.headersinst-install-headers-from-sc.patch
This file was deleted.
Oops, something went wrong.
46 changes: 46 additions & 0 deletions
46
patches/not-capebus/0154-beaglebone-add-support-for-DVI-00A3.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From 4c8846627e861aa3410bbce1cad5a1fef07a5336 Mon Sep 17 00:00:00 2001 | ||
| From: Koen Kooi <koen@dominion.thruhere.net> | ||
| Date: Wed, 3 Apr 2013 15:39:38 +0200 | ||
| Subject: [PATCH 154/155] beaglebone: add support for DVI 00A3 | ||
|
|
||
| Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| --- | ||
| arch/arm/boot/dts/am335x-bone-common.dtsi | 8 ++++++++ | ||
| firmware/capes/cape-bone-dvi-00A2.dts | 2 +- | ||
| 2 files changed, 9 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| index 6974fcd..524bf03 100644 | ||
| --- a/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| @@ -221,6 +221,14 @@ | ||
| version = "00A1", "01"; | ||
| dtbo = "cape-bone-dvi-00A1.dtbo"; | ||
| }; | ||
| + version@00A2 { | ||
| + version = "00A2", "A2"; | ||
| + dtbo = "cape-bone-dvi-00A2.dtbo"; | ||
| + }; | ||
| + version@00A3 { | ||
| + version = "00A3"; | ||
| + dtbo = "cape-bone-dvi-00A2.dtbo"; | ||
| + }; | ||
| }; | ||
|
|
||
| /* beaglebone black emmc on board */ | ||
| diff --git a/firmware/capes/cape-bone-dvi-00A2.dts b/firmware/capes/cape-bone-dvi-00A2.dts | ||
| index fb2dcf0..34ced98 100644 | ||
| --- a/firmware/capes/cape-bone-dvi-00A2.dts | ||
| +++ b/firmware/capes/cape-bone-dvi-00A2.dts | ||
| @@ -13,7 +13,7 @@ | ||
|
|
||
| /* identification */ | ||
| part-number = "BB-BONE-DVID-01"; | ||
| - version = "00A2", "A2"; | ||
| + version = "00A3", "00A2", "A2"; | ||
|
|
||
| fragment@0 { | ||
| target = <&am33xx_pinmux>; | ||
| -- | ||
| 1.8.1.4 | ||
|
|
95 changes: 95 additions & 0 deletions
95
patches/not-capebus/0155-beaglebone-remove-audio-section-from-DVID-rev-2-and-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| From 4fc38bda7147a8ec71fc40340a27414f339e02cc Mon Sep 17 00:00:00 2001 | ||
| From: Koen Kooi <koen@dominion.thruhere.net> | ||
| Date: Wed, 3 Apr 2013 15:59:07 +0200 | ||
| Subject: [PATCH 155/155] beaglebone: remove audio section from DVID rev 2 and | ||
| 3 capes | ||
|
|
||
| Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| --- | ||
| firmware/capes/cape-bone-dvi-00A2.dts | 65 ----------------------------------- | ||
| 1 file changed, 65 deletions(-) | ||
|
|
||
| diff --git a/firmware/capes/cape-bone-dvi-00A2.dts b/firmware/capes/cape-bone-dvi-00A2.dts | ||
| index 34ced98..a3cd39d 100644 | ||
| --- a/firmware/capes/cape-bone-dvi-00A2.dts | ||
| +++ b/firmware/capes/cape-bone-dvi-00A2.dts | ||
| @@ -52,16 +52,6 @@ | ||
| 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ | ||
| >; | ||
| }; | ||
| - | ||
| - bone_dvi_cape_audio_pins: pinmux_bone_dvi_cape_audio_pins { | ||
| - pinctrl-single,pins = < | ||
| - 0x190 0x20 /* mcasp0_aclkx.mcasp0_aclkx, INPUT | MODE0 */ | ||
| - 0x194 0x20 /* mcasp0_fsx.mcasp0_fsx, INPUT | MODE0 */ | ||
| - 0x19c 0x22 /* mcasp0_ahclkr.mcasp0_axr2, INPUT | MODE2 */ | ||
| - 0x1ac 0x22 /* mcasp0_ahclkx.mcasp0_axr3, INPUT | MODE2 */ | ||
| - | ||
| - >; | ||
| - }; | ||
| }; | ||
| }; | ||
|
|
||
| @@ -112,59 +102,4 @@ | ||
|
|
||
| }; | ||
| }; | ||
| - | ||
| - fragment@2 { | ||
| - target = <&i2c2>; | ||
| - __overlay__ { | ||
| - #address-cells = <1>; | ||
| - #size-cells = <0>; | ||
| - | ||
| - tlv320aic3x: tlv320aic3x@1b { | ||
| - compatible = "ti,tlv320aic3x"; | ||
| - reg = <0x1b>; | ||
| - status = "okay"; | ||
| - }; | ||
| - }; | ||
| - }; | ||
| - | ||
| - fragment@3 { | ||
| - target = <&mcasp0>; | ||
| - __overlay__ { | ||
| - pinctrl-names = "default"; | ||
| - pinctrl-0 = <&bone_dvi_cape_audio_pins>; | ||
| - | ||
| - status = "okay"; | ||
| - | ||
| - op-mode = <0>; /* MCASP_IIS_MODE */ | ||
| - tdm-slots = <2>; | ||
| - num-serializer = <16>; | ||
| - serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ | ||
| - 0 0 2 1 | ||
| - 0 0 0 0 | ||
| - 0 0 0 0 | ||
| - 0 0 0 0 | ||
| - >; | ||
| - tx-num-evt = <1>; | ||
| - rx-num-evt = <1>; | ||
| - }; | ||
| - }; | ||
| - | ||
| - fragment@4 { | ||
| - target = <&ocp>; | ||
| - __overlay__ { | ||
| - sound { | ||
| - compatible = "ti,da830-evm-audio"; | ||
| - ti,model = "DA830 EVM"; | ||
| - ti,audio-codec = <&tlv320aic3x>; | ||
| - ti,mcasp-controller = <&mcasp0>; | ||
| - ti,codec-clock-rate = <12000000>; | ||
| - ti,audio-routing = | ||
| - "Headphone Jack", "HPLOUT", | ||
| - "Headphone Jack", "HPROUT", | ||
| - "LINE1L", "Line In", | ||
| - "LINE1R", "Line In"; | ||
| - }; | ||
| - }; | ||
| - | ||
| - }; | ||
| }; | ||
| -- | ||
| 1.8.1.4 | ||
|
|