diff --git a/patch.sh b/patch.sh index afa5d4ca9f0c5eaf43415b534603702452786ad1..d72be0495d7fbe622e85abfe96255a668ec34964 100644 --- a/patch.sh +++ b/patch.sh @@ -116,6 +116,19 @@ omap () { # ${git} "${DIR}/patches/omap_panda/0005-HACK-panda-enable-OMAP4_ERRATA_I688.patch" ${git} "${DIR}/patches/omap_panda/0006-ARM-hw_breakpoint-Enable-debug-powerdown-only-if-sys.patch" + #Fix wlan0 on original Panda (strangly the ES was fine...) + #v3.10.x + #git revert --no-edit d1924519fe1dada0cfd9a228bf2ff1ea15840c84 -s + ${git} "${DIR}/patches/omap_panda/0007-Revert-regulator-twl-Remove-TWL6030_FIXED_RESOURCE.patch" + #v3.7.x + #git revert --no-edit 029dd3cefa46ecdd879f9b4e2df3bdf4371cc22c -s + ${git} "${DIR}/patches/omap_panda/0008-Revert-regulator-twl-Remove-another-unused-variable-.patch" + #v3.6.x + #git revert --no-edit e76ab829cc2d8b6350a3f01fffb208df4d7d8c1b -s + #git revert --no-edit 0e8e5c34cf1a8beaaf0a6a05c053592693bf8cb4 -s + ${git} "${DIR}/patches/omap_panda/0009-Revert-regulator-twl-Remove-references-to-the-twl403.patch" + ${git} "${DIR}/patches/omap_panda/0010-Revert-regulator-twl-Remove-references-to-32kHz-cloc.patch" + #Status: not for upstream: http://www.spinics.net/lists/arm-kernel/msg214633.html #Fixes: #WARNING: "v7_dma_flush_range" *pvrsrvkm.ko] undefined! diff --git a/patches/omap_panda/0007-Revert-regulator-twl-Remove-TWL6030_FIXED_RESOURCE.patch b/patches/omap_panda/0007-Revert-regulator-twl-Remove-TWL6030_FIXED_RESOURCE.patch new file mode 100644 index 0000000000000000000000000000000000000000..0799d839e226ce59c9d95822b62c9619d1cf1971 --- /dev/null +++ b/patches/omap_panda/0007-Revert-regulator-twl-Remove-TWL6030_FIXED_RESOURCE.patch @@ -0,0 +1,39 @@ +From 42d8b74383b670412107c943efd2fec46aa04158 Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Sat, 1 Jun 2013 16:32:46 -0500 +Subject: [PATCH 07/10] Revert "regulator: twl: Remove TWL6030_FIXED_RESOURCE" + +This reverts commit d1924519fe1dada0cfd9a228bf2ff1ea15840c84. + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +--- + drivers/regulator/twl-regulator.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c +index fb6e67d..7ce7edf 100644 +--- a/drivers/regulator/twl-regulator.c ++++ b/drivers/regulator/twl-regulator.c +@@ -933,6 +933,19 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \ + }, \ + } + ++#define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) \ ++static struct twlreg_info TWLRES_INFO_##label = { \ ++ .base = offset, \ ++ .desc = { \ ++ .name = #label, \ ++ .id = TWL6030_REG_##label, \ ++ .ops = &twl6030_fixed_resource, \ ++ .type = REGULATOR_VOLTAGE, \ ++ .owner = THIS_MODULE, \ ++ .enable_time = turnon_delay, \ ++ }, \ ++ } ++ + #define TWL6025_ADJUSTABLE_SMPS(label, offset) \ + static const struct twlreg_info TWLSMPS_INFO_##label = { \ + .base = offset, \ +-- +1.7.10.4 + diff --git a/patches/omap_panda/0008-Revert-regulator-twl-Remove-another-unused-variable-.patch b/patches/omap_panda/0008-Revert-regulator-twl-Remove-another-unused-variable-.patch new file mode 100644 index 0000000000000000000000000000000000000000..4abbd05e9581abfd87dab2bf8bf5d866ef78d4f5 --- /dev/null +++ b/patches/omap_panda/0008-Revert-regulator-twl-Remove-another-unused-variable-.patch @@ -0,0 +1,34 @@ +From 48e4598f1b8e9dd486d551b76c5f5021d0dc946d Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Sat, 1 Jun 2013 16:32:48 -0500 +Subject: [PATCH 08/10] Revert "regulator: twl: Remove another unused variable + warning" + +This reverts commit 029dd3cefa46ecdd879f9b4e2df3bdf4371cc22c. + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +--- + drivers/regulator/twl-regulator.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c +index 7ce7edf..124a2f2 100644 +--- a/drivers/regulator/twl-regulator.c ++++ b/drivers/regulator/twl-regulator.c +@@ -633,6 +633,13 @@ static struct regulator_ops twl6030fixed_ops = { + .get_status = twl6030reg_get_status, + }; + ++static struct regulator_ops twl6030_fixed_resource = { ++ .enable = twl6030reg_enable, ++ .disable = twl6030reg_disable, ++ .is_enabled = twl6030reg_is_enabled, ++ .get_status = twl6030reg_get_status, ++}; ++ + /* + * SMPS status and control + */ +-- +1.7.10.4 + diff --git a/patches/omap_panda/0009-Revert-regulator-twl-Remove-references-to-the-twl403.patch b/patches/omap_panda/0009-Revert-regulator-twl-Remove-references-to-the-twl403.patch new file mode 100644 index 0000000000000000000000000000000000000000..27bc6ea190a46f35548d68d095942d6d967be229 --- /dev/null +++ b/patches/omap_panda/0009-Revert-regulator-twl-Remove-references-to-the-twl403.patch @@ -0,0 +1,28 @@ +From 76cc643690032d9789bbd17c9a3542cae4b0603e Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Sat, 1 Jun 2013 16:32:51 -0500 +Subject: [PATCH 09/10] Revert "regulator: twl: Remove references to the + twl4030 regulator" + +This reverts commit e76ab829cc2d8b6350a3f01fffb208df4d7d8c1b. + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +--- + drivers/regulator/twl-regulator.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c +index 124a2f2..5a18317 100644 +--- a/drivers/regulator/twl-regulator.c ++++ b/drivers/regulator/twl-regulator.c +@@ -1021,6 +1021,7 @@ TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0); + TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); + TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0); + TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0); ++TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0); + TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); + TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10); + TWL6025_ADJUSTABLE_SMPS(VIO, 0x16); +-- +1.7.10.4 + diff --git a/patches/omap_panda/0010-Revert-regulator-twl-Remove-references-to-32kHz-cloc.patch b/patches/omap_panda/0010-Revert-regulator-twl-Remove-references-to-32kHz-cloc.patch new file mode 100644 index 0000000000000000000000000000000000000000..ad18b29405f26ec5379d8e22e4c57e6dfc9e6298 --- /dev/null +++ b/patches/omap_panda/0010-Revert-regulator-twl-Remove-references-to-32kHz-cloc.patch @@ -0,0 +1,49 @@ +From ffdb3fad79cf70dcc943764f075215d6525435be Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Sat, 1 Jun 2013 16:32:54 -0500 +Subject: [PATCH 10/10] Revert "regulator: twl: Remove references to 32kHz + clock from DT bindings" + +This reverts commit 0e8e5c34cf1a8beaaf0a6a05c053592693bf8cb4. + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +--- + Documentation/devicetree/bindings/regulator/twl-regulator.txt | 1 + + drivers/regulator/twl-regulator.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt +index 658749b..0c3395d 100644 +--- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt ++++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt +@@ -15,6 +15,7 @@ For twl6030 regulators/LDOs + - "ti,twl6030-vusb" for VUSB LDO + - "ti,twl6030-v1v8" for V1V8 LDO + - "ti,twl6030-v2v1" for V2V1 LDO ++ - "ti,twl6030-clk32kg" for CLK32KG RESOURCE + - "ti,twl6030-vdd1" for VDD1 SMPS + - "ti,twl6030-vdd2" for VDD2 SMPS + - "ti,twl6030-vdd3" for VDD3 SMPS +diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c +index 5a18317..40f27bb 100644 +--- a/drivers/regulator/twl-regulator.c ++++ b/drivers/regulator/twl-regulator.c +@@ -1054,6 +1054,7 @@ static u8 twl_get_smps_mult(void) + #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label) + #define TWL6025_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6025, label) + #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label) ++#define TWLRES_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLRES, label) + #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label) + + static const struct of_device_id twl_of_match[] = { +@@ -1101,6 +1102,7 @@ static const struct of_device_id twl_of_match[] = { + TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB), + TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8), + TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1), ++ TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG), + TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3), + TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4), + TWLSMPS_OF_MATCH("ti,twl6025-vio", VIO), +-- +1.7.10.4 + diff --git a/version.sh b/version.sh index 17e593bf089b3eaca83ce4d34bfa9438a85f873c..2ec1ec235d31713174d24061d6eaeb017a9d1a82 100644 --- a/version.sh +++ b/version.sh @@ -23,7 +23,7 @@ linaro_toolchain="cortex_gcc_4_8" #Kernel/Build KERNEL_REL=3.10 KERNEL_TAG=${KERNEL_REL}-rc3 -BUILD=armv7-d1.1 +BUILD=armv7-d1.2 #v3.X-rcX + upto SHA KERNEL_SHA="0f7dafd44e2de131f67fca87378e30ca86bc00d5"