Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'sti-dt-for-v4.7b-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt

Merge "STi DT updates for v4.7 #1" from Maxime Coquelin:

Highlights:
-----------
- Add CPUFreq support to STiH407 family
- Add Mailbox nodes to STiH407 family
- Add RemoteProc nodes to STiH407 family
- Use 'reserved-memory' for DMA memory on STiH407
- Use the LPC timer as a clocksource

* tag 'sti-dt-for-v4.7b-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: dts: STi: STih407: Switch LPC mode from RTC to Clocksource
ARM: dts: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory
ARM: dts: STiH407: Add nodes for RemoteProc
ARM: dts: STi: stih407-family: Add nodes for Mailbox
ARM: dts: STi: STiH407: Provide CPU with a means to look-up Major number
ARM: dts: STi: STiH407: Link CPU with its voltage supply
ARM: dts: STi: STiH407: Provide CPU with clocking information
ARM: dts: STi: STiH407: Provide generic (safe) DVFS configuration

+125 -1
+125 -1
arch/arm/boot/dts/stih407-family.dtsi
··· 15 15 #address-cells = <1>; 16 16 #size-cells = <1>; 17 17 18 + reserved-memory { 19 + #address-cells = <1>; 20 + #size-cells = <1>; 21 + ranges; 22 + 23 + gp0_reserved: rproc@40000000 { 24 + compatible = "shared-dma-pool"; 25 + reg = <0x40000000 0x01000000>; 26 + no-map; 27 + }; 28 + 29 + gp1_reserved: rproc@41000000 { 30 + compatible = "shared-dma-pool"; 31 + reg = <0x41000000 0x01000000>; 32 + no-map; 33 + }; 34 + 35 + audio_reserved: rproc@42000000 { 36 + compatible = "shared-dma-pool"; 37 + reg = <0x42000000 0x01000000>; 38 + no-map; 39 + }; 40 + 41 + dmu_reserved: rproc@43000000 { 42 + compatible = "shared-dma-pool"; 43 + reg = <0x43000000 0x01000000>; 44 + no-map; 45 + }; 46 + }; 47 + 18 48 cpus { 19 49 #address-cells = <1>; 20 50 #size-cells = <0>; ··· 52 22 device_type = "cpu"; 53 23 compatible = "arm,cortex-a9"; 54 24 reg = <0>; 25 + 55 26 /* u-boot puts hpen in SBC dmem at 0xa4 offset */ 56 27 cpu-release-addr = <0x94100A4>; 28 + 29 + /* kHz uV */ 30 + operating-points = <1500000 0 31 + 1200000 0 32 + 800000 0 33 + 500000 0>; 34 + 35 + clocks = <&clk_m_a9>; 36 + clock-names = "cpu"; 37 + clock-latency = <100000>; 38 + cpu0-supply = <&pwm_regulator>; 39 + st,syscfg = <&syscfg_core 0x8e0>; 57 40 }; 58 41 cpu@1 { 59 42 device_type = "cpu"; 60 43 compatible = "arm,cortex-a9"; 61 44 reg = <1>; 45 + 62 46 /* u-boot puts hpen in SBC dmem at 0xa4 offset */ 63 47 cpu-release-addr = <0x94100A4>; 48 + 49 + /* kHz uV */ 50 + operating-points = <1500000 0 51 + 1200000 0 52 + 800000 0 53 + 500000 0>; 64 54 }; 65 55 }; 66 56 ··· 584 534 reg = <0x8788000 0x1000>; 585 535 interrupts = <GIC_SPI 130 IRQ_TYPE_EDGE_RISING>; 586 536 clocks = <&clk_s_d3_flexgen CLK_LPC_1>; 587 - st,lpc-mode = <ST_LPC_MODE_RTC>; 537 + st,lpc-mode = <ST_LPC_MODE_CLKSRC>; 588 538 }; 589 539 590 540 sata0: sata@9b20000 { ··· 743 693 reg = <0x08a8a000 0x1000>; 744 694 clocks = <&clk_sysin>; 745 695 status = "okay"; 696 + }; 697 + 698 + mailbox0: mailbox@8f00000 { 699 + compatible = "st,stih407-mailbox"; 700 + reg = <0x8f00000 0x1000>; 701 + interrupts = <GIC_SPI 1 IRQ_TYPE_NONE>; 702 + #mbox-cells = <2>; 703 + mbox-name = "a9"; 704 + status = "okay"; 705 + }; 706 + 707 + mailbox1: mailbox@8f01000 { 708 + compatible = "st,stih407-mailbox"; 709 + reg = <0x8f01000 0x1000>; 710 + #mbox-cells = <2>; 711 + mbox-name = "st231_gp_1"; 712 + status = "okay"; 713 + }; 714 + 715 + mailbox2: mailbox@8f02000 { 716 + compatible = "st,stih407-mailbox"; 717 + reg = <0x8f02000 0x1000>; 718 + #mbox-cells = <2>; 719 + mbox-name = "st231_gp_0"; 720 + status = "okay"; 721 + }; 722 + 723 + mailbox3: mailbox@8f03000 { 724 + compatible = "st,stih407-mailbox"; 725 + reg = <0x8f03000 0x1000>; 726 + #mbox-cells = <2>; 727 + mbox-name = "st231_audio_video"; 728 + status = "okay"; 729 + }; 730 + 731 + st231_gp0: remote-processor { 732 + compatible = "st,st231-rproc"; 733 + memory-region = <&gp0_reserved>; 734 + resets = <&softreset STIH407_ST231_GP0_SOFTRESET>; 735 + reset-names = "sw_reset"; 736 + clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>; 737 + clock-frequency = <600000000>; 738 + st,syscfg = <&syscfg_core 0x22c>; 739 + }; 740 + 741 + 742 + st231_gp1: remote-processor { 743 + compatible = "st,st231-rproc"; 744 + memory-region = <&gp1_reserved>; 745 + resets = <&softreset STIH407_ST231_GP1_SOFTRESET>; 746 + reset-names = "sw_reset"; 747 + clocks = <&clk_s_c0_flexgen CLK_ST231_GP_1>; 748 + clock-frequency = <600000000>; 749 + st,syscfg = <&syscfg_core 0x220>; 750 + }; 751 + 752 + st231_audio: remote-processor { 753 + compatible = "st,st231-rproc"; 754 + memory-region = <&audio_reserved>; 755 + resets = <&softreset STIH407_ST231_AUD_SOFTRESET>; 756 + reset-names = "sw_reset"; 757 + clocks = <&clk_s_c0_flexgen CLK_ST231_AUD_0>; 758 + clock-frequency = <600000000>; 759 + st,syscfg = <&syscfg_core 0x228>; 760 + }; 761 + 762 + st231_dmu: remote-processor { 763 + compatible = "st,st231-rproc"; 764 + memory-region = <&dmu_reserved>; 765 + resets = <&softreset STIH407_ST231_DMU_SOFTRESET>; 766 + reset-names = "sw_reset"; 767 + clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>; 768 + clock-frequency = <600000000>; 769 + st,syscfg = <&syscfg_core 0x224>; 746 770 }; 747 771 }; 748 772 };