forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/g…
…it/arm/arm-soc
Pull ARM SoC platform updates from Arnd Bergmann:
"Most of the commits are for defconfig changes, to enable newly added
drivers or features that people have started using. For the changed
lines lines, we have mostly cleanups, the affected platforms are OMAP,
Versatile, EP93xx, Samsung, Broadcom, i.MX, and Actions.
The largest single change is the introduction of the TI "sysc" bus
driver, with the intention of cleaning up more legacy code.
Two new SoC platforms get added this time:
- Allwinner R40 is a modernized version of the A20 chip, now with a
Quad-Core ARM Cortex-A7. According to the manufacturer, it is
intended for "Smart Hardware"
- Broadcom Hurricane 2 (Aka Strataconnect BCM5334X) is a family of
chips meant for managed gigabit ethernet switches, based around a
Cortex-A9 CPU.
Finally, we gain SMP support for two platforms: Renesas R-Car E2 and
Amlogic Meson8/8b, which were previously added but only supported
uniprocessor operation"
* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
ARM: multi_v7_defconfig: Select RPMSG_VIRTIO as module
ARM: multi_v7_defconfig: enable CONFIG_GPIO_UNIPHIER
arm64: defconfig: enable CONFIG_GPIO_UNIPHIER
ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
ARM: meson: Add SMP bringup code for Meson8 and Meson8b
ARM: smp_scu: allow the platform code to read the SCU CPU status
ARM: smp_scu: add a helper for powering on a specific CPU
dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
ARM: OMAP3: Delete an unnecessary variable initialisation in omap3xxx_hwmod_init()
ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init()
ARM: defconfig: select the right SX150X driver
arm64: defconfig: Enable QCOM_IOMMU
arm64: Add ThunderX drivers to defconfig
arm64: defconfig: Enable Tegra PCI controller
cpufreq: imx6q: Move speed grading check to cpufreq driver
arm64: defconfig: re-enable Qualcomm DB410c USB
ARM: configs: stm32: Add MDMA support in STM32 defconfig
ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
bus: ti-sysc: mark PM functions as __maybe_unused
...- Loading branch information
Showing
130 changed files
with
2,267 additions
and
3,144 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
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,18 @@ | ||
| Amlogic Meson8 and Meson8b power-management-unit: | ||
| ------------------------------------------------- | ||
|
|
||
| The pmu is used to turn off and on different power domains of the SoCs | ||
| This includes the power to the CPU cores. | ||
|
|
||
| Required node properties: | ||
| - compatible value : depending on the SoC this should be one of: | ||
| "amlogic,meson8-pmu" | ||
| "amlogic,meson8b-pmu" | ||
| - reg : physical base address and the size of the registers window | ||
|
|
||
| Example: | ||
|
|
||
| pmu@c81000e4 { | ||
| compatible = "amlogic,meson8b-pmu", "syscon"; | ||
| reg = <0xc81000e0 0x18>; | ||
| }; |
32 changes: 32 additions & 0 deletions
32
Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt
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,32 @@ | ||
| Amlogic Meson8 and Meson8b SRAM for smp bringup: | ||
| ------------------------------------------------ | ||
|
|
||
| Amlogic's SMP-capable SoCs use part of the sram for the bringup of the cores. | ||
| Once the core gets powered up it executes the code that is residing at a | ||
| specific location. | ||
|
|
||
| Therefore a reserved section sub-node has to be added to the mmio-sram | ||
| declaration. | ||
|
|
||
| Required sub-node properties: | ||
| - compatible : depending on the SoC this should be one of: | ||
| "amlogic,meson8-smp-sram" | ||
| "amlogic,meson8b-smp-sram" | ||
|
|
||
| The rest of the properties should follow the generic mmio-sram discription | ||
| found in ../../misc/sram.txt | ||
|
|
||
| Example: | ||
|
|
||
| sram: sram@d9000000 { | ||
| compatible = "mmio-sram"; | ||
| reg = <0xd9000000 0x20000>; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| ranges = <0 0xd9000000 0x20000>; | ||
|
|
||
| smp-sram@1ff80 { | ||
| compatible = "amlogic,meson8b-smp-sram"; | ||
| reg = <0x1ff80 0x8>; | ||
| }; | ||
| }; |
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
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
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
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,93 @@ | ||
| Texas Instruments sysc interconnect target module wrapper binding | ||
|
|
||
| Texas Instruments SoCs can have a generic interconnect target module | ||
| hardware for devices connected to various interconnects such as L3 | ||
| interconnect (Arteris NoC) and L4 interconnect (Sonics s3220). The sysc | ||
| is mostly used for interaction between module and PRCM. It participates | ||
| in the OCP Disconnect Protocol but other than that is mostly independent | ||
| of the interconnect. | ||
|
|
||
| Each interconnect target module can have one or more devices connected to | ||
| it. There is a set of control registers for managing interconnect target | ||
| module clocks, idle modes and interconnect level resets for the module. | ||
|
|
||
| These control registers are sprinkled into the unused register address | ||
| space of the first child device IP block managed by the interconnect | ||
| target module and typically are named REVISION, SYSCONFIG and SYSSTATUS. | ||
|
|
||
| Required standard properties: | ||
|
|
||
| - compatible shall be one of the following generic types: | ||
|
|
||
| "ti,sysc-omap2" | ||
| "ti,sysc-omap4" | ||
| "ti,sysc-omap4-simple" | ||
|
|
||
| or one of the following derivative types for hardware | ||
| needing special workarounds: | ||
|
|
||
| "ti,sysc-omap3430-sr" | ||
| "ti,sysc-omap3630-sr" | ||
| "ti,sysc-omap4-sr" | ||
| "ti,sysc-omap3-sham" | ||
| "ti,sysc-omap-aes" | ||
| "ti,sysc-mcasp" | ||
| "ti,sysc-usb-host-fs" | ||
|
|
||
| - reg shall have register areas implemented for the interconnect | ||
| target module in question such as revision, sysc and syss | ||
|
|
||
| - reg-names shall contain the register names implemented for the | ||
| interconnect target module in question such as | ||
| "rev, "sysc", and "syss" | ||
|
|
||
| - ranges shall contain the interconnect target module IO range | ||
| available for one or more child device IP blocks managed | ||
| by the interconnect target module, the ranges may include | ||
| multiple ranges such as device L4 range for control and | ||
| parent L3 range for DMA access | ||
|
|
||
| Optional properties: | ||
|
|
||
| - clocks clock specifier for each name in the clock-names as | ||
| specified in the binding documentation for ti-clkctrl, | ||
| typically available for all interconnect targets on TI SoCs | ||
| based on omap4 except if it's read-only register in hwauto | ||
| mode as for example omap4 L4_CFG_CLKCTRL | ||
|
|
||
| - clock-names should contain at least "fck", and optionally also "ick" | ||
| depending on the SoC and the interconnect target module | ||
|
|
||
| - ti,hwmods optional TI interconnect module name to use legacy | ||
| hwmod platform data | ||
|
|
||
|
|
||
| Example: Single instance of MUSB controller on omap4 using interconnect ranges | ||
| using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000): | ||
|
|
||
| target-module@2b000 { /* 0x4a0ab000, ap 84 12.0 */ | ||
| compatible = "ti,sysc-omap2"; | ||
| ti,hwmods = "usb_otg_hs"; | ||
| reg = <0x2b400 0x4>, | ||
| <0x2b404 0x4>, | ||
| <0x2b408 0x4>; | ||
| reg-names = "rev", "sysc", "syss"; | ||
| clocks = <&l3_init_clkctrl OMAP4_USB_OTG_HS_CLKCTRL 0>; | ||
| clock-names = "fck"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| ranges = <0 0x2b000 0x1000>; | ||
|
|
||
| usb_otg_hs: otg@0 { | ||
| compatible = "ti,omap4-musb"; | ||
| reg = <0x0 0x7ff>; | ||
| interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>, | ||
| <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; | ||
| usb-phy = <&usb2_phy>; | ||
| ... | ||
| }; | ||
| }; | ||
|
|
||
| Note that other SoCs, such as am335x can have multipe child devices. On am335x | ||
| there are two MUSB instances, two USB PHY instances, and a single CPPI41 DMA | ||
| instance as children of a single interconnet target module. |
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
47 changes: 47 additions & 0 deletions
47
Documentation/devicetree/bindings/power/ti-smartreflex.txt
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,47 @@ | ||
| Texas Instruments SmartReflex binding | ||
|
|
||
| SmartReflex is used to set and adjust the SoC operating points. | ||
|
|
||
|
|
||
| Required properties: | ||
|
|
||
| compatible: Shall be one of the following: | ||
| "ti,omap3-smartreflex-core" | ||
| "ti,omap3-smartreflex-iva" | ||
| "ti,omap4-smartreflex-core" | ||
| "ti,omap4-smartreflex-mpu" | ||
| "ti,omap4-smartreflex-iva" | ||
|
|
||
| reg: Shall contain the device instance IO range | ||
|
|
||
| interrupts: Shall contain the device instance interrupt | ||
|
|
||
|
|
||
| Optional properties: | ||
|
|
||
| ti,hwmods: Shall contain the TI interconnect module name if needed | ||
| by the SoC | ||
|
|
||
|
|
||
| Example: | ||
|
|
||
| smartreflex_iva: smartreflex@4a0db000 { | ||
| compatible = "ti,omap4-smartreflex-iva"; | ||
| reg = <0x4a0db000 0x80>; | ||
| interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; | ||
| ti,hwmods = "smartreflex_iva"; | ||
| }; | ||
|
|
||
| smartreflex_core: smartreflex@4a0dd000 { | ||
| compatible = "ti,omap4-smartreflex-core"; | ||
| reg = <0x4a0dd000 0x80>; | ||
| interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; | ||
| ti,hwmods = "smartreflex_core"; | ||
| }; | ||
|
|
||
| smartreflex_mpu: smartreflex@4a0d9000 { | ||
| compatible = "ti,omap4-smartreflex-mpu"; | ||
| reg = <0x4a0d9000 0x80>; | ||
| interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; | ||
| ti,hwmods = "smartreflex_mpu"; | ||
| }; |
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
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
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
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
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
Oops, something went wrong.