Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 83f0643caa2e8dabd42024bebfa4565eff347be7

Authored by Dan Murphy
2 parents b4841c348b 7d9207c121
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Merge branch 'pm-ti-linux-3.12.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm… 

…-linux-feature-tree into ti-linux-3.12.y

TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.12.y

* 'pm-ti-linux-3.12.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: dts: am43xx: Remove MPU DS0 voltage scaling

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 2 changed files Side-by-side Diff

arch/arm/boot/dts/am437x-gp-evm.dts
Diff comments   View file @ 83f0643
... ... @@ -474,8 +474,6 @@
474 474 sleep-sequence = /bits/ 8 <
475 475 0x02 0x24 0x10 0x6b /* Password unlock 1 */
476 476 0x02 0x24 0x16 0x8A /* Set DCDC1 (Core) to 0.95V */
477   - 0x02 0x24 0x10 0x6A /* Password unlock 2 */
478   - 0x02 0x24 0x17 0x8A /* Set DCDC2 (MPU) to 0.95V */
479 477 0x02 0x24 0x10 0x67 /* Password unlock 3 */
480 478 0x02 0x24 0x1A 0x86 /* Apply DCDC changes */
481 479 >;
... ... @@ -484,8 +482,6 @@
484 482 wake-sequence = /bits/ 8 <
485 483 0x02 0x24 0x10 0x6B /* Password unlock 2 */
486 484 0x02 0x24 0x16 0x99 /* Set DCDC1 (Core) to 1.1V */
487   - 0x02 0x24 0x10 0x6A /* Password unlock 1 */
488   - 0x02 0x24 0x17 0x99 /* Set DCDC2 (MPU)to 1.1V */
489 485 0x02 0x24 0x10 0x67 /* Password unlock 3 */
490 486 0x02 0x24 0x1A 0x86 /* Apply DCDC changes */
491 487 >;
arch/arm/boot/dts/am43x-epos-evm.dts
Diff comments   View file @ 83f0643
... ... @@ -677,8 +677,6 @@
677 677 sleep-sequence = /bits/ 8 <
678 678 0x02 0x24 0x10 0x6b /* Password unlock 1 */
679 679 0x02 0x24 0x16 0x8A /* Set DCDC1 (Core) to 0.95V */
680   - 0x02 0x24 0x10 0x6A /* Password unlock 2 */
681   - 0x02 0x24 0x17 0x8A /* Set DCDC2 (MPU) to 0.95V */
682 680 0x02 0x24 0x10 0x67 /* Password unlock 3 */
683 681 0x02 0x24 0x1A 0x86 /* Apply DCDC changes */
684 682 >;
... ... @@ -687,8 +685,6 @@
687 685 wake-sequence = /bits/ 8 <
688 686 0x02 0x24 0x10 0x6B /* Password unlock 2 */
689 687 0x02 0x24 0x16 0x99 /* Set DCDC1 (Core) to 1.1V */
690   - 0x02 0x24 0x10 0x6A /* Password unlock 1 */
691   - 0x02 0x24 0x17 0x99 /* Set DCDC2 (MPU)to 1.1V */
692 688 0x02 0x24 0x10 0x67 /* Password unlock 3 */
693 689 0x02 0x24 0x1A 0x86 /* Apply DCDC changes */
694 690 >;