Commit 755a9ba7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next

Pull ARM SoC devicetree updates from Olof Johansson:
 "As with previous release, this continues to be among the largest
  branches we merge, with lots of new contents.

  New things for this release are among other things:

   - DTSI contents for the new SoCs supported in 3.16 (see SoC pull request)
   - Qualcomm APQ8064 and APQ8084 SoCs and eval boards
   - Nvidia Jetson TK1 development board (Tegra T124-based)

  Two new SoCs that didn't need enough new platform code to stand out
  enough for me to notice when writing the SoC tag, but that adds new DT
  contents are:

   - TI DRA72
   - Marvell Berlin 2Q"

* tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (500 commits)
  ARM: dts: add secure firmware support for exynos5420-arndale-octa
  ARM: dts: add pmu sysreg node to exynos3250
  ARM: dts: correct the usb phy node in exynos5800-peach-pi
  ARM: dts: correct the usb phy node in exynos5420-peach-pit
  ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
  ARM: dts: add dts files for exynos3250 SoC
  ARM: dts: add mfc node for exynos5800
  ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
  ARM: dts: enable fimd for exynos5800-peach-pi
  ARM: dts: enable display controller for exynos5800-peach-pi
  ARM: dts: enable hdmi for exynos5800-peach-pi
  ARM: dts: add dts file for exynos5800-peach-pi board
  ARM: dts: add dts file for exynos5800 SoC
  ARM: dts: add dts file for exynos5260-xyref5260 board
  ARM: dts: add dts files for exynos5260 SoC
  ARM: dts: update watchdog node name in exynos5440
  ARM: dts: use key code macros on Origen and Arndale boards
  ARM: dts: enable RTC and WDT nodes on Origen boards
  ARM: dts: qcom: Add APQ8084-MTP board support
  ARM: dts: qcom: Add APQ8084 SoC support
  ...
parents 7477838f 0f16aa3c
...@@ -12,6 +12,7 @@ SoC and board used. Currently known SoC compatibles are: ...@@ -12,6 +12,7 @@ SoC and board used. Currently known SoC compatibles are:
"marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100), "marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100),
"marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005) "marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005)
"marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????) "marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????)
"marvell,berlin2q" for Marvell Armada 1500-pro (BG2Q, 88DE3114)
"marvell,berlin3" for Marvell Armada ? (BG3, 88DE????) "marvell,berlin3" for Marvell Armada ? (BG3, 88DE????)
* Example: * Example:
...@@ -22,3 +23,104 @@ SoC and board used. Currently known SoC compatibles are: ...@@ -22,3 +23,104 @@ SoC and board used. Currently known SoC compatibles are:
... ...
} }
* Marvell Berlin2 chip control binding
Marvell Berlin SoCs have a chip control register set providing several
individual registers dealing with pinmux, padmux, clock, reset, and secondary
CPU boot address. Unfortunately, the individual registers are spread among the
chip control registers, so there should be a single DT node only providing the
different functions which are described below.
Required properties:
- compatible: shall be one of
"marvell,berlin2-chip-ctrl" for BG2
"marvell,berlin2cd-chip-ctrl" for BG2CD
"marvell,berlin2q-chip-ctrl" for BG2Q
- reg: address and length of following register sets for
BG2/BG2CD: chip control register set
BG2Q: chip control register set and cpu pll registers
* Marvell Berlin2 system control binding
Marvell Berlin SoCs have a system control register set providing several
individual registers dealing with pinmux, padmux, and reset.
Required properties:
- compatible: should be one of
"marvell,berlin2-system-ctrl" for BG2
"marvell,berlin2cd-system-ctrl" for BG2CD
"marvell,berlin2q-system-ctrl" for BG2Q
- reg: address and length of the system control register set
* Clock provider binding
As clock related registers are spread among the chip control registers, the
chip control node also provides the clocks. Marvell Berlin2 (BG2, BG2CD, BG2Q)
SoCs share the same IP for PLLs and clocks, with some minor differences in
features and register layout.
Required properties:
- #clock-cells: shall be set to 1
- clocks: clock specifiers referencing the core clock input clocks
- clock-names: array of strings describing the input clock specifiers above.
Allowed clock-names for the reference clocks are
"refclk" for the SoCs osciallator input on all SoCs,
and SoC-specific input clocks for
BG2/BG2CD: "video_ext0" for the external video clock input
Clocks provided by core clocks shall be referenced by a clock specifier
indexing one of the provided clocks. Refer to dt-bindings/clock/berlin<soc>.h
for the corresponding index mapping.
* Pin controller binding
Pin control registers are part of both register sets, chip control and system
control. The pins controlled are organized in groups, so no actual pin
information is needed.
A pin-controller node should contain subnodes representing the pin group
configurations, one per function. Each subnode has the group name and the muxing
function used.
Be aware the Marvell Berlin datasheets use the keyword 'mode' for what is called
a 'function' in the pin-controller subsystem.
Required subnode-properties:
- groups: a list of strings describing the group names.
- function: a string describing the function used to mux the groups.
Example:
chip: chip-control@ea0000 {
compatible = "marvell,berlin2-chip-ctrl";
#clock-cells = <1>;
reg = <0xea0000 0x400>;
clocks = <&refclk>, <&externaldev 0>;
clock-names = "refclk", "video_ext0";
spi1_pmux: spi1-pmux {
groups = "G0";
function = "spi1";
};
};
sysctrl: system-controller@d000 {
compatible = "marvell,berlin2-system-ctrl";
reg = <0xd000 0x100>;
uart0_pmux: uart0-pmux {
groups = "GSM4";
function = "uart0";
};
uart1_pmux: uart1-pmux {
groups = "GSM5";
function = "uart1";
};
uart2_pmux: uart2-pmux {
groups = "GSM3";
function = "uart2";
};
};
...@@ -80,7 +80,10 @@ SoCs: ...@@ -80,7 +80,10 @@ SoCs:
compatible = "ti,omap5432", "ti,omap5" compatible = "ti,omap5432", "ti,omap5"
- DRA742 - DRA742
compatible = "ti,dra7xx", "ti,dra7" compatible = "ti,dra742", "ti,dra74", "ti,dra7"
- DRA722
compatible = "ti,dra722", "ti,dra72", "ti,dra7"
- AM4372 - AM4372
compatible = "ti,am4372", "ti,am43" compatible = "ti,am4372", "ti,am43"
...@@ -102,6 +105,12 @@ Boards: ...@@ -102,6 +105,12 @@ Boards:
- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board - OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board
compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4"; compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
- OMAP4 VAR-STK-OM44 : Commercial dev kit with VAR-OM44CustomBoard and VAR-SOM-OM44 w/WLAN
compatible = "variscite,var-stk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
- OMAP4 VAR-DVK-OM44 : Commercial dev kit with VAR-OM44CustomBoard, VAR-SOM-OM44 w/WLAN and LCD touchscreen
compatible = "variscite,var-dvk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x - OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x
compatible = "ti,omap3-evm", "ti,omap3" compatible = "ti,omap3-evm", "ti,omap3"
...@@ -120,5 +129,8 @@ Boards: ...@@ -120,5 +129,8 @@ Boards:
- AM437x GP EVM - AM437x GP EVM
compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43" compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
- DRA7 EVM: Software Developement Board for DRA7XX - DRA742 EVM: Software Developement Board for DRA742
compatible = "ti,dra7-evm", "ti,dra7" compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"
- DRA722 EVM: Software Development Board for DRA722
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"
Rockchip platforms device tree bindings
---------------------------------------
- bq Curie 2 tablet:
Required root node properties:
- compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
- Radxa Rock board:
Required root node properties:
- compatible = "radxa,rock", "rockchip,rk3188";
...@@ -2,6 +2,10 @@ SAMSUNG Exynos SoC series PMU Registers ...@@ -2,6 +2,10 @@ SAMSUNG Exynos SoC series PMU Registers
Properties: Properties:
- compatible : should contain two values. First value must be one from following list: - compatible : should contain two values. First value must be one from following list:
- "samsung,exynos3250-pmu" - for Exynos3250 SoC,
- "samsung,exynos4210-pmu" - for Exynos4210 SoC,
- "samsung,exynos4212-pmu" - for Exynos4212 SoC,
- "samsung,exynos4412-pmu" - for Exynos4412 SoC,
- "samsung,exynos5250-pmu" - for Exynos5250 SoC, - "samsung,exynos5250-pmu" - for Exynos5250 SoC,
- "samsung,exynos5420-pmu" - for Exynos5420 SoC. - "samsung,exynos5420-pmu" - for Exynos5420 SoC.
second value must be always "syscon". second value must be always "syscon".
......
SAMSUNG S5P/Exynos SoC series System Registers (SYSREG) SAMSUNG S5P/Exynos SoC series System Registers (SYSREG)
Properties: Properties:
- compatible : should contain "samsung,<chip name>-sysreg", "syscon"; - compatible : should contain two values. First value must be one from following list:
For Exynos4 SoC series it should be "samsung,exynos4-sysreg", "syscon"; - "samsung,exynos4-sysreg" - for Exynos4 based SoCs,
- "samsung,exynos5-sysreg" - for Exynos5 based SoCs.
second value must be always "syscon".
- reg : offset and length of the register set. - reg : offset and length of the register set.
Example: Example:
...@@ -10,3 +12,8 @@ Example: ...@@ -10,3 +12,8 @@ Example:
compatible = "samsung,exynos4-sysreg", "syscon"; compatible = "samsung,exynos4-sysreg", "syscon";
reg = <0x10010000 0x400>; reg = <0x10010000 0x400>;
}; };
syscon@10050000 {
compatible = "samsung,exynos5-sysreg", "syscon";
reg = <0x10050000 0x5000>;
};
...@@ -21,8 +21,8 @@ Optional properties: ...@@ -21,8 +21,8 @@ Optional properties:
- fixed-divider : If clocks have a fixed divider value, use this property. - fixed-divider : If clocks have a fixed divider value, use this property.
- clk-gate : For "socfpga-gate-clk", clk-gate contains the gating register - clk-gate : For "socfpga-gate-clk", clk-gate contains the gating register
and the bit index. and the bit index.
- div-reg : For "socfpga-gate-clk", div-reg contains the divider register, bit shift, - div-reg : For "socfpga-gate-clk" and "socfpga-periph-clock", div-reg contains
and width. the divider register, bit shift, and width.
- clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls - clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls
the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second
value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct
......
...@@ -3,9 +3,11 @@ Altera SOCFPGA Reset Manager ...@@ -3,9 +3,11 @@ Altera SOCFPGA Reset Manager
Required properties: Required properties:
- compatible : "altr,rst-mgr" - compatible : "altr,rst-mgr"
- reg : Should contain 1 register ranges(address and length) - reg : Should contain 1 register ranges(address and length)
- #reset-cells: 1
Example: Example:
rstmgr@ffd05000 { rstmgr@ffd05000 {
#reset-cells = <1>;
compatible = "altr,rst-mgr"; compatible = "altr,rst-mgr";
reg = <0xffd05000 0x1000>; reg = <0xffd05000 0x1000>;
}; };
QCOM GSBI (General Serial Bus Interface) Driver
The GSBI controller is modeled as a node with zero or more child nodes, each
representing a serial sub-node device that is mux'd as part of the GSBI
configuration settings. The mode setting will govern the input/output mode of
the 4 GSBI IOs.
Required properties:
- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064
- reg: Address range for GSBI registers
- clocks: required clock
- clock-names: must contain "iface" entry
- qcom,mode : indicates MUX value for configuration of the serial interface.
Please reference dt-bindings/soc/qcom,gsbi.h for valid mux values.
Optional properties:
- qcom,crci : indicates CRCI MUX value for QUP CRCI ports. Please reference
dt-bindings/soc/qcom,gsbi.h for valid CRCI mux values.
Required properties if child node exists:
- #address-cells: Must be 1
- #size-cells: Must be 1
- ranges: Must be present
Properties for children:
A GSBI controller node can contain 0 or more child nodes representing serial
devices. These serial devices can be a QCOM UART, I2C controller, spi
controller, or some combination of aforementioned devices.
See the following for child node definitions:
Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt
Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
Example for APQ8064:
#include <dt-bindings/soc/qcom,gsbi.h>
gsbi4@16300000 {
compatible = "qcom,gsbi-v1.0.0";
reg = <0x16300000 0x100>;
clocks = <&gcc GSBI4_H_CLK>;
clock-names = "iface";
#address-cells = <1>;
#size-cells = <1>;
ranges;
qcom,mode = <GSBI_PROT_I2C_UART>;
qcom,crci = <GSBI_CRCI_QUP>;
/* child nodes go under here */
i2c_qup4: i2c@16380000 {
compatible = "qcom,i2c-qup-v1.1.1";
reg = <0x16380000 0x1000>;
interrupts = <0 153 0>;
clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>;
clock-names = "core", "iface";
clock-frequency = <200000>;
#address-cells = <1>;
#size-cells = <0>;
};
uart4: serial@16340000 {
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x16340000 0x1000>,
<0x16300000 0x1000>;
interrupts = <0 152 0x0>;
clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;
clock-names = "core", "iface";
status = "ok";
};
};
...@@ -44,7 +44,9 @@ Board specific device node entry ...@@ -44,7 +44,9 @@ Board specific device node entry
}; };
OMAP DWC3 GLUE OMAP DWC3 GLUE
- compatible : Should be "ti,dwc3" - compatible : Should be
* "ti,dwc3" for OMAP5 and DRA7
* "ti,am437x-dwc3" for AM437x
- ti,hwmods : Should be "usb_otg_ss" - ti,hwmods : Should be "usb_otg_ss"
- reg : Address and length of the register set for the device. - reg : Address and length of the register set for the device.
- interrupts : The irq number of this device that is used to interrupt the - interrupts : The irq number of this device that is used to interrupt the
......
...@@ -79,6 +79,7 @@ microchip Microchip Technology Inc. ...@@ -79,6 +79,7 @@ microchip Microchip Technology Inc.
mosaixtech Mosaix Technologies, Inc. mosaixtech Mosaix Technologies, Inc.
moxa Moxa moxa Moxa
mpl MPL AG mpl MPL AG
mundoreader Mundo Reader S.L.
mxicy Macronix International Co., Ltd. mxicy Macronix International Co., Ltd.
national National Semiconductor national National Semiconductor
neonode Neonode Inc. neonode Neonode Inc.
...@@ -98,6 +99,7 @@ powervr PowerVR (deprecated, use img) ...@@ -98,6 +99,7 @@ powervr PowerVR (deprecated, use img)
qca Qualcomm Atheros, Inc. qca Qualcomm Atheros, Inc.
qcom Qualcomm Technologies, Inc qcom Qualcomm Technologies, Inc
qnap QNAP Systems, Inc. qnap QNAP Systems, Inc.
radxa Radxa
raidsonic RaidSonic Technology GmbH raidsonic RaidSonic Technology GmbH
ralink Mediatek/Ralink Technology Corp. ralink Mediatek/Ralink Technology Corp.
ramtron Ramtron International ramtron Ramtron International
...@@ -123,10 +125,12 @@ stericsson ST-Ericsson ...@@ -123,10 +125,12 @@ stericsson ST-Ericsson
synology Synology, Inc. synology Synology, Inc.
ti Texas Instruments ti Texas Instruments
tlm Trusted Logic Mobility tlm Trusted Logic Mobility
toradex Toradex AG
toshiba Toshiba Corporation toshiba Toshiba Corporation
toumaz Toumaz toumaz Toumaz
usi Universal Scientifc Industrial Co., Ltd. usi Universal Scientifc Industrial Co., Ltd.
v3 V3 Semiconductor v3 V3 Semiconductor
variscite Variscite Ltd.
via VIA Technologies, Inc. via VIA Technologies, Inc.
voipac Voipac Technologies s.r.o. voipac Voipac Technologies s.r.o.
winbond Winbond Electronics corp. winbond Winbond Electronics corp.
......
...@@ -57,7 +57,8 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ ...@@ -57,7 +57,8 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
bcm21664-garnet.dtb bcm21664-garnet.dtb
dtb-$(CONFIG_ARCH_BERLIN) += \ dtb-$(CONFIG_ARCH_BERLIN) += \
berlin2-sony-nsz-gs7.dtb \ berlin2-sony-nsz-gs7.dtb \
berlin2cd-google-chromecast.dtb berlin2cd-google-chromecast.dtb \
berlin2q-marvell-dmp.dtb
dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
da850-evm.dtb da850-evm.dtb
dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
...@@ -73,11 +74,14 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ ...@@ -73,11 +74,14 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
exynos5250-arndale.dtb \ exynos5250-arndale.dtb \
exynos5250-smdk5250.dtb \ exynos5250-smdk5250.dtb \
exynos5250-snow.dtb \ exynos5250-snow.dtb \
exynos5260-xyref5260.dtb \
exynos5410-smdk5410.dtb \
exynos5420-arndale-octa.dtb \ exynos5420-arndale-octa.dtb \
exynos5420-peach-pit.dtb \ exynos5420-peach-pit.dtb \
exynos5420-smdk5420.dtb \ exynos5420-smdk5420.dtb \
exynos5440-sd5v1.dtb \ exynos5440-sd5v1.dtb \
exynos5440-ssdk5440.dtb exynos5440-ssdk5440.dtb \
exynos5800-peach-pi.dtb
dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
ecx-2000.dtb ecx-2000.dtb
...@@ -129,6 +133,9 @@ kirkwood := \ ...@@ -129,6 +133,9 @@ kirkwood := \
kirkwood-nsa310a.dtb \ kirkwood-nsa310a.dtb \
kirkwood-openblocks_a6.dtb \ kirkwood-openblocks_a6.dtb \
kirkwood-openblocks_a7.dtb \ kirkwood-openblocks_a7.dtb \
kirkwood-openrd-base.dtb \
kirkwood-openrd-client.dtb \
kirkwood-openrd-ultimate.dtb \
kirkwood-rd88f6192.dtb \ kirkwood-rd88f6192.dtb \
kirkwood-rd88f6281-a0.dtb \ kirkwood-rd88f6281-a0.dtb \
kirkwood-rd88f6281-a1.dtb \ kirkwood-rd88f6281-a1.dtb \
...@@ -159,10 +166,12 @@ dtb-$(CONFIG_ARCH_MXC) += \ ...@@ -159,10 +166,12 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx27-phytec-phycard-s-rdk.dtb \ imx27-phytec-phycard-s-rdk.dtb \
imx31-bug.dtb \ imx31-bug.dtb \
imx35-eukrea-mbimxsd35-baseboard.dtb \ imx35-eukrea-mbimxsd35-baseboard.dtb \
imx35-pdk.dtb \
imx50-evk.dtb \ imx50-evk.dtb \
imx51-apf51.dtb \ imx51-apf51.dtb \
imx51-apf51dev.dtb \ imx51-apf51dev.dtb \
imx51-babbage.dtb \ imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
imx51-eukrea-mbimxsd51-baseboard.dtb \ imx51-eukrea-mbimxsd51-baseboard.dtb \
imx53-ard.dtb \ imx53-ard.dtb \
imx53-m53evk.dtb \ imx53-m53evk.dtb \
...@@ -181,6 +190,8 @@ dtb-$(CONFIG_ARCH_MXC) += \ ...@@ -181,6 +190,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-gw54xx.dtb \ imx6dl-gw54xx.dtb \
imx6dl-hummingboard.dtb \ imx6dl-hummingboard.dtb \
imx6dl-nitrogen6x.dtb \ imx6dl-nitrogen6x.dtb \
imx6dl-phytec-pbab01.dtb \
imx6dl-riotboard.dtb \
imx6dl-sabreauto.dtb \ imx6dl-sabreauto.dtb \
imx6dl-sabrelite.dtb \ imx6dl-sabrelite.dtb \
imx6dl-sabresd.dtb \ imx6dl-sabresd.dtb \
...@@ -205,6 +216,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ ...@@ -205,6 +216,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6q-udoo.dtb \ imx6q-udoo.dtb \
imx6q-wandboard.dtb \ imx6q-wandboard.dtb \
imx6sl-evk.dtb \ imx6sl-evk.dtb \
vf610-colibri.dtb \
vf610-cosmic.dtb \ vf610-cosmic.dtb \
vf610-twr.dtb vf610-twr.dtb
dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
...@@ -232,73 +244,80 @@ dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb ...@@ -232,73 +244,80 @@ dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb
dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \
nspire-tp.dtb \ nspire-tp.dtb \
nspire-clp.dtb nspire-clp.dtb
dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \
omap2430-sdp.dtb \
omap2420-n800.dtb \ omap2420-n800.dtb \
omap2420-n810.dtb \ omap2420-n810.dtb \
omap2420-n810-wimax.dtb \ omap2420-n810-wimax.dtb \
omap2430-sdp.dtb
dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \
omap3430-sdp.dtb \ omap3430-sdp.dtb \
omap3-beagle.dtb \ omap3-beagle.dtb \
omap3-beagle-xm.dtb \
omap3-beagle-xm-ab.dtb \
omap3-cm-t3517.dtb \ omap3-cm-t3517.dtb \
omap3-sbc-t3517.dtb \
omap3-cm-t3530.dtb \ omap3-cm-t3530.dtb \
omap3-sbc-t3530.dtb \
omap3-cm-t3730.dtb \ omap3-cm-t3730.dtb \
omap3-sbc-t3730.dtb \
omap3-devkit8000.dtb \ omap3-devkit8000.dtb \
omap3-beagle-xm.dtb \
omap3-beagle-xm-ab.dtb \
omap3-evm.dtb \ omap3-evm.dtb \
omap3-evm-37xx.dtb \ omap3-evm-37xx.dtb \
omap3-gta04.dtb \
omap3-igep0020.dtb \
omap3-igep0030.dtb \
omap3-ldp.dtb \ omap3-ldp.dtb \
omap3-lilly-dbb056.dtb \
omap3-n900.dtb \ omap3-n900.dtb \
omap3-n9.dtb \ omap3-n9.dtb \
omap3-n950.dtb \ omap3-n950.dtb \
omap3-overo-alto35.dtb \ omap3-overo-alto35.dtb \
omap3-overo-storm-alto35.dtb \
omap3-overo-chestnut43.dtb \ omap3-overo-chestnut43.dtb \
omap3-overo-storm-chestnut43.dtb \
omap3-overo-gallop43.dtb \ omap3-overo-gallop43.dtb \
omap3-overo-storm-gallop43.dtb \
omap3-overo-palo43.dtb \ omap3-overo-palo43.dtb \
omap3-overo-storm-alto35.dtb \
omap3-overo-storm-chestnut43.dtb \
omap3-overo-storm-gallop43.dtb \
omap3-overo-storm-palo43.dtb \ omap3-overo-storm-palo43.dtb \
omap3-overo-summit.dtb \
omap3-overo-storm-summit.dtb \ omap3-overo-storm-summit.dtb \
omap3-overo-tobi.dtb \
omap3-overo-storm-tobi.dtb \ omap3-overo-storm-tobi.dtb \
omap3-gta04.dtb \ omap3-overo-summit.dtb \
omap3-igep0020.dtb \ omap3-overo-tobi.dtb \
omap3-igep0030.dtb \ omap3-sbc-t3517.dtb \
omap3-lilly-dbb056.dtb \ omap3-sbc-t3530.dtb \
omap3-zoom3.dtb \ omap3-sbc-t3730.dtb \
omap4-duovero-parlor.dtb \ omap3-zoom3.dtb
dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
am335x-evm.dtb \
am335x-evmsk.dtb \
am335x-nano.dtb
dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
omap4-panda.dtb \ omap4-panda.dtb \
omap4-panda-a4.dtb \ omap4-panda-a4.dtb \
omap4-panda-es.dtb \ omap4-panda-es.dtb \
omap4-var-som.dtb \
omap4-sdp.dtb \ omap4-sdp.dtb \
omap4-sdp-es23plus.dtb \ omap4-sdp-es23plus.dtb \
omap5-uevm.dtb \ omap4-var-dvk-om44.dtb \
am335x-evm.dtb \ omap4-var-stk-om44.dtb
am335x-evmsk.dtb \ dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
am335x-bone.dtb \ am437x-gp-evm.dtb
am335x-boneblack.dtb \ dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
am335x-nano.dtb \ omap5-sbc-t54.dtb \
am335x-base0033.dtb \ omap5-uevm.dtb
am3517-craneboard.dtb \ dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
am3517-evm.dtb \ dra72-evm.dtb
am3517_mt_ventoux.dtb \
am43x-epos-evm.dtb \
am437x-gp-evm.dtb \
dra7-evm.dtb
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
orion5x-lacie-ethernet-disk-mini-v2.dtb \ orion5x-lacie-ethernet-disk-mini-v2.dtb \
orion5x-maxtor-shared-storage-2.dtb \ orion5x-maxtor-shared-storage-2.dtb \
orion5x-rd88f5182-nas.dtb orion5x-rd88f5182-nas.dtb
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8960-cdp.dtb \ qcom-apq8064-ifc6410.dtb \
qcom-apq8074-dragonboard.dtb qcom-apq8074-dragonboard.dtb \
qcom-apq8084-mtp.dtb \
qcom-msm8660-surf.dtb \
qcom-msm8960-cdp.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
s3c6410-smdk6410.dtb s3c6410-smdk6410.dtb
...@@ -318,11 +337,13 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ ...@@ -318,11 +337,13 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
sh7372-mackerel.dtb sh7372-mackerel.dtb
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
r7s72100-genmai.dtb \ r7s72100-genmai.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \ r8a7791-koelsch.dtb \
r8a7790-lager.dtb r8a7790-lager.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_sockit.dtb \
socfpga_cyclone5_socrates.dtb \
socfpga_vt.dtb socfpga_vt.dtb
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
spear1340-evb.dtb spear1340-evb.dtb
...@@ -331,24 +352,33 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ ...@@ -331,24 +352,33 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
spear320-evb.dtb \ spear320-evb.dtb \
spear320-hmi.dtb spear320-hmi.dtb
dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
stih416-b2000.dtb \ stih415-b2000.dtb \
stih415-b2020.dtb \ stih415-b2020.dtb \
stih416-b2020.dtb stih416-b2000.dtb \
dtb-$(CONFIG_ARCH_SUNXI) += \ stih416-b2020.dtb \
stih416-b2020-revE.dtb
dtb-$(CONFIG_MACH_SUN4I) += \
sun4i-a10-a1000.dtb \ sun4i-a10-a1000.dtb \
sun4i-a10-cubieboard.dtb \ sun4i-a10-cubieboard.dtb \
sun4i-a10-mini-xplus.dtb \ sun4i-a10-mini-xplus.dtb \
sun4i-a10-hackberry.dtb \ sun4i-a10-hackberry.dtb \
sun4i-a10-inet97fv2.dtb \ sun4i-a10-inet97fv2.dtb \
sun4i-a10-olinuxino-lime.dtb \ sun4i-a10-olinuxino-lime.dtb \
sun4i-a10-pcduino.dtb \ sun4i-a10-pcduino.dtb
dtb-$(CONFIG_MACH_SUN5I) += \
sun5i-a10s-olinuxino-micro.dtb \ sun5i-a10s-olinuxino-micro.dtb \
sun5i-a10s-r7-tv-dongle.dtb \
sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino.dtb \
sun5i-a13-olinuxino-micro.dtb \ sun5i-a13-olinuxino-micro.dtb
dtb-$(CONFIG_MACH_SUN6I) += \
sun6i-a31-app4-evb1.dtb \
sun6i-a31-colombus.dtb \ sun6i-a31-colombus.dtb \
sun6i-a31-m9.dtb
dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubieboard2.dtb \
sun7i-a20-cubietruck.dtb \ sun7i-a20-cubietruck.dtb \
sun7i-a20-i12-tvbox.dtb \
sun7i-a20-olinuxino-micro.dtb sun7i-a20-olinuxino-micro.dtb
dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra20-iris-512.dtb \ tegra20-iris-512.dtb \
...@@ -363,7 +393,11 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ ...@@ -363,7 +393,11 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra30-beaver.dtb \ tegra30-beaver.dtb \
tegra30-cardhu-a02.dtb \ tegra30-cardhu-a02.dtb \
tegra30-cardhu-a04.dtb \ tegra30-cardhu-a04.dtb \
tegra30-colibri-eval-v3.dtb \
tegra114-dalmore.dtb \ tegra114-dalmore.dtb \
tegra114-roth.dtb \
tegra114-tn7.dtb \
tegra124-jetson-tk1.dtb \
tegra124-venice2.dtb tegra124-venice2.dtb
dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
......
...@@ -182,31 +182,31 @@ &uart0 { ...@@ -182,31 +182,31 @@ &uart0 {
&usb { &usb {
status = "okay"; status = "okay";
};
control@44e10620 { &usb_ctrl_mod {
status = "okay"; status = "okay";
}; };
usb-phy@47401300 { &usb0_phy {
status = "okay"; status = "okay";
}; };
usb-phy@47401b00 { &usb1_phy {
status = "okay"; status = "okay";
}; };
usb@47401000 { &usb0 {
status = "okay"; status = "okay";
}; };
usb@47401800 { &usb1 {
status = "okay"; status = "okay";
dr_mode = "host"; dr_mode = "host";
}; };
dma-controller@47402000 { &cppi41dma {
status = "okay"; status = "okay";
};
}; };
&i2c0 { &i2c0 {
...@@ -280,13 +280,14 @@ &mac { ...@@ -280,13 +280,14 @@ &mac {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&mmc1 { &mmc1 {
......
...@@ -268,34 +268,34 @@ mmc1_pins: pinmux_mmc1_pins { ...@@ -268,34 +268,34 @@ mmc1_pins: pinmux_mmc1_pins {
lcd_pins_s0: lcd_pins_s0 { lcd_pins_s0: lcd_pins_s0 {
pinctrl-single,pins = < pinctrl-single,pins = <
0x20 0x01 /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */ 0x20 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad8.lcd_data23 */
0x24 0x01 /* gpmc_ad9.lcd_data17, OUTPUT | MODE1 */ 0x24 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad9.lcd_data22 */
0x28 0x01 /* gpmc_ad10.lcd_data18, OUTPUT | MODE1 */ 0x28 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad10.lcd_data21 */
0x2c 0x01 /* gpmc_ad11.lcd_data19, OUTPUT | MODE1 */ 0x2c (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad11.lcd_data20 */
0x30 0x01 /* gpmc_ad12.lcd_data20, OUTPUT | MODE1 */ 0x30 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad12.lcd_data19 */
0x34 0x01 /* gpmc_ad13.lcd_data21, OUTPUT | MODE1 */ 0x34 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad13.lcd_data18 */
0x38 0x01 /* gpmc_ad14.lcd_data22, OUTPUT | MODE1 */ 0x38 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad14.lcd_data17 */
0x3c 0x01 /* gpmc_ad15.lcd_data23, OUTPUT | MODE1 */ 0x3c (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad15.lcd_data16 */
0xa0 0x00 /* lcd_data0.lcd_data0, OUTPUT | MODE0 */ 0xa0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */
0xa4 0x00 /* lcd_data1.lcd_data1, OUTPUT | MODE0 */ 0xa4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */
0xa8 0x00 /* lcd_data2.lcd_data2, OUTPUT | MODE0 */ 0xa8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */
0xac 0x00 /* lcd_data3.lcd_data3, OUTPUT | MODE0 */ 0xac (PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */
0xb0 0x00 /* lcd_data4.lcd_data4, OUTPUT | MODE0 */ 0xb0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */
0xb4 0x00 /* lcd_data5.lcd_data5, OUTPUT | MODE0 */ 0xb4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */
0xb8 0x00 /* lcd_data6.lcd_data6, OUTPUT | MODE0 */ 0xb8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */
0xbc 0x00 /* lcd_data7.lcd_data7, OUTPUT | MODE0 */ 0xbc (PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */
0xc0 0x00 /* lcd_data8.lcd_data8, OUTPUT | MODE0 */ 0xc0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */
0xc4 0x00 /* lcd_data9.lcd_data9, OUTPUT | MODE0 */ 0xc4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */
0xc8 0x00 /* lcd_data10.lcd_data10, OUTPUT | MODE0 */ 0xc8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */
0xcc 0x00 /* lcd_data11.lcd_data11, OUTPUT | MODE0 */ 0xcc (PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */
0xd0 0x00 /* lcd_data12.lcd_data12, OUTPUT | MODE0 */ 0xd0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */
0xd4 0x00 /* lcd_data13.lcd_data13, OUTPUT | MODE0 */ 0xd4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */
0xd8 0x00 /* lcd_data14.lcd_data14, OUTPUT | MODE0 */ 0xd8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */
0xdc 0x00 /* lcd_data15.lcd_data15, OUTPUT | MODE0 */ 0xdc (PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */
0xe0 0x00 /* lcd_vsync.lcd_vsync, OUTPUT | MODE0 */ 0xe0 (PIN_OUTPUT | MUX_MODE0) /* lcd_vsync.lcd_vsync */
0xe4 0x00 /* lcd_hsync.lcd_hsync, OUTPUT | MODE0 */ 0xe4 (PIN_OUTPUT | MUX_MODE0) /* lcd_hsync.lcd_hsync */
0xe8 0x00 /* lcd_pclk.lcd_pclk, OUTPUT | MODE0 */ 0xe8 (PIN_OUTPUT | MUX_MODE0) /* lcd_pclk.lcd_pclk */
0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */ 0xec (PIN_OUTPUT | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */
>; >;
}; };
...@@ -330,31 +330,31 @@ tps: tps@2d { ...@@ -330,31 +330,31 @@ tps: tps@2d {
&usb { &usb {
status = "okay"; status = "okay";
};
control@44e10620 { &usb_ctrl_mod {
status = "okay"; status = "okay";
}; };
usb-phy@47401300 { &usb0_phy {
status = "okay"; status = "okay";
}; };
usb-phy@47401b00 { &usb1_phy {
status = "okay"; status = "okay";
}; };
usb@47401000 { &usb0 {
status = "okay"; status = "okay";
}; };
usb@47401800 { &usb1 {
status = "okay"; status = "okay";
dr_mode = "host"; dr_mode = "host";
}; };
dma-controller@47402000 { &cppi41dma {
status = "okay"; status = "okay";
};
}; };
&i2c1 { &i2c1 {
...@@ -614,12 +614,14 @@ &mac { ...@@ -614,12 +614,14 @@ &mac {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -57,6 +57,17 @@ wl12xx_vmmc: fixedregulator@2 { ...@@ -57,6 +57,17 @@ wl12xx_vmmc: fixedregulator@2 {
enable-active-high; enable-active-high;
}; };
vtt_fixed: fixedregulator@3 {
compatible = "regulator-fixed";
regulator-name = "vtt";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
gpio = <&gpio0 7 GPIO_ACTIVE_HIGH>;
regulator-always-on;
regulator-boot-on;
enable-active-high;
};
leds { leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>; pinctrl-0 = <&user_leds_s0>;
...@@ -363,31 +374,31 @@ tlv320aic3106: tlv320aic3106@1b { ...@@ -363,31 +374,31 @@ tlv320aic3106: tlv320aic3106@1b {
&usb { &usb {
status = "okay"; status = "okay";
};
control@44e10620 { &usb_ctrl_mod {
status = "okay"; status = "okay";
}; };
usb-phy@47401300 { &usb0_phy {
status = "okay"; status = "okay";
}; };
usb-phy@47401b00 { &usb1_phy {
status = "okay"; status = "okay";
}; };
usb@47401000 { &usb0 {
status = "okay"; status = "okay";
}; };
usb@47401800 { &usb1 {
status = "okay"; status = "okay";
dr_mode = "host"; dr_mode = "host";
}; };
dma-controller@47402000 { &cppi41dma {
status = "okay"; status = "okay";
};
}; };
&epwmss2 { &epwmss2 {
...@@ -484,12 +495,14 @@ &mac { ...@@ -484,12 +495,14 @@ &mac {
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
dual_emac = <1>; dual_emac = <1>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -95,6 +95,14 @@ leds_pins: pinmux_leds_pins { ...@@ -95,6 +95,14 @@ leds_pins: pinmux_leds_pins {
}; };
}; };
&mac {
status = "okay";
};
&davinci_mdio {
status = "okay";
};
&cpsw_emac0 { &cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>; phy_id = <&davinci_mdio>, <0>;
}; };
...@@ -200,31 +208,31 @@ &uart0 { ...@@ -200,31 +208,31 @@ &uart0 {
&usb { &usb {
status = "okay"; status = "okay";
};
control@44e10620 { &usb_ctrl_mod {
status = "okay"; status = "okay";
}; };
usb-phy@47401300 { &usb0_phy {
status = "okay"; status = "okay";
}; };
usb-phy@47401b00 { &usb1_phy {
status = "okay"; status = "okay";
}; };
usb@47401000 { &usb0 {
status = "okay"; status = "okay";
}; };
usb@47401800 { &usb1 {
status = "okay"; status = "okay";
dr_mode = "host"; dr_mode = "host";
}; };
dma-controller@47402000 { &cppi41dma {
status = "okay"; status = "okay";
};
}; };
#include "tps65910.dtsi" #include "tps65910.dtsi"
......
...@@ -344,6 +344,11 @@ partition@6 { ...@@ -344,6 +344,11 @@ partition@6 {
&mac { &mac {
dual_emac = <1>; dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -96,47 +96,29 @@ rng_fck: rng_fck { ...@@ -96,47 +96,29 @@ rng_fck: rng_fck {
clock-div = <1>; clock-div = <1>;
}; };
ehrpwm0_gate_tbclk: ehrpwm0_gate_tbclk { ehrpwm0_tbclk: ehrpwm0_tbclk@44e10664 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,composite-no-wait-gate-clock"; compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>; clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <0>; ti,bit-shift = <0>;
reg = <0x0664>; reg = <0x0664>;
}; };
ehrpwm0_tbclk: ehrpwm0_tbclk { ehrpwm1_tbclk: ehrpwm1_tbclk@44e10664 {
#clock-cells = <0>;
compatible = "ti,composite-clock";
clocks = <&ehrpwm0_gate_tbclk>;
};
ehrpwm1_gate_tbclk: ehrpwm1_gate_tbclk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,composite-no-wait-gate-clock"; compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>; clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <1>; ti,bit-shift = <1>;
reg = <0x0664>; reg = <0x0664>;
}; };
ehrpwm1_tbclk: ehrpwm1_tbclk { ehrpwm2_tbclk: ehrpwm2_tbclk@44e10664 {
#clock-cells = <0>;
compatible = "ti,composite-clock";
clocks = <&ehrpwm1_gate_tbclk>;
};
ehrpwm2_gate_tbclk: ehrpwm2_gate_tbclk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,composite-no-wait-gate-clock"; compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>; clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <2>; ti,bit-shift = <2>;
reg = <0x0664>; reg = <0x0664>;
}; };
ehrpwm2_tbclk: ehrpwm2_tbclk {
#clock-cells = <0>;
compatible = "ti,composite-clock";
clocks = <&ehrpwm2_gate_tbclk>;
};
}; };
&prcm_clocks { &prcm_clocks {
clk_32768_ck: clk_32768_ck { clk_32768_ck: clk_32768_ck {
......
...@@ -688,6 +688,7 @@ mac: ethernet@4a100000 { ...@@ -688,6 +688,7 @@ mac: ethernet@4a100000 {
*/ */
interrupts = <40 41 42 43>; interrupts = <40 41 42 43>;
ranges; ranges;
status = "disabled";
davinci_mdio: mdio@4a101000 { davinci_mdio: mdio@4a101000 {
compatible = "ti,davinci_mdio"; compatible = "ti,davinci_mdio";
...@@ -696,6 +697,7 @@ davinci_mdio: mdio@4a101000 { ...@@ -696,6 +697,7 @@ davinci_mdio: mdio@4a101000 {
ti,hwmods = "davinci_mdio"; ti,hwmods = "davinci_mdio";
bus_freq = <1000000>; bus_freq = <1000000>;
reg = <0x4a101000 0x100>; reg = <0x4a101000 0x100>;
status = "disabled";
}; };
cpsw_emac0: slave@4a100200 { cpsw_emac0: slave@4a100200 {
......
...@@ -525,6 +525,12 @@ cpsw_emac1: slave@4a100300 { ...@@ -525,6 +525,12 @@ cpsw_emac1: slave@4a100300 {
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
phy_sel: cpsw-phy-sel@44e10650 {
compatible = "ti,am43xx-cpsw-phy-sel";
reg= <0x44e10650 0x4>;
reg-names = "gmii-sel";
};
}; };
epwmss0: epwmss@48300000 { epwmss0: epwmss@48300000 {
...@@ -739,6 +745,121 @@ gpmc: gpmc@50000000 { ...@@ -739,6 +745,121 @@ gpmc: gpmc@50000000 {
#size-cells = <1>; #size-cells = <1>;
status = "disabled"; status = "disabled";
}; };
am43xx_control_usb2phy1: control-phy@44e10620 {
compatible = "ti,control-phy-usb2-am437";
reg = <0x44e10620 0x4>;
reg-names = "power";
};
am43xx_control_usb2phy2: control-phy@0x44e10628 {
compatible = "ti,control-phy-usb2-am437";
reg = <0x44e10628 0x4>;
reg-names = "power";
};
ocp2scp0: ocp2scp@483a8000 {
compatible = "ti,omap-ocp2scp";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp0";
usb2_phy1: phy@483a8000 {
compatible = "ti,am437x-usb2";
reg = <0x483a8000 0x8000>;
ctrl-module = <&am43xx_control_usb2phy1>;
clocks = <&usb_phy0_always_on_clk32k>,
<&usb_otg_ss0_refclk960m>;
clock-names = "wkupclk", "refclk";
#phy-cells = <0>;
status = "disabled";
};
};
ocp2scp1: ocp2scp@483e8000 {
compatible = "ti,omap-ocp2scp";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp1";
usb2_phy2: phy@483e8000 {
compatible = "ti,am437x-usb2";
reg = <0x483e8000 0x8000>;
ctrl-module = <&am43xx_control_usb2phy2>;
clocks = <&usb_phy1_always_on_clk32k>,
<&usb_otg_ss1_refclk960m>;
clock-names = "wkupclk", "refclk";
#phy-cells = <0>;
status = "disabled";
};
};
dwc3_1: omap_dwc3@48380000 {
compatible = "ti,am437x-dwc3";
ti,hwmods = "usb_otg_ss0";
reg = <0x48380000 0x10000>;
interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <1>;
utmi-mode = <1>;
ranges;
usb1: usb@48390000 {
compatible = "synopsys,dwc3";
reg = <0x48390000 0x17000>;
interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usb2_phy1>;
phy-names = "usb2-phy";
maximum-speed = "high-speed";
dr_mode = "otg";
status = "disabled";
};
};
dwc3_2: omap_dwc3@483c0000 {
compatible = "ti,am437x-dwc3";
ti,hwmods = "usb_otg_ss1";
reg = <0x483c0000 0x10000>;
interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <1>;
utmi-mode = <1>;
ranges;
usb2: usb@483d0000 {
compatible = "synopsys,dwc3";
reg = <0x483d0000 0x17000>;
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usb2_phy2>;
phy-names = "usb2-phy";
maximum-speed = "high-speed";
dr_mode = "otg";
status = "disabled";
};
};
qspi: qspi@47900000 {
compatible = "ti,am4372-qspi";
reg = <0x47900000 0x100>;
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "qspi";
interrupts = <0 138 0x4>;
num-cs = <4>;
status = "disabled";
};
hdq: hdq@48347000 {
compatible = "ti,am43xx-hdq";
reg = <0x48347000 0x1000>;
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&func_12m_clk>;
clock-names = "fck";
ti,hwmods = "hdq1w";
status = "disabled";
};
}; };
}; };
......
...@@ -27,6 +27,17 @@ vmmcsd_fixed: fixedregulator-sd { ...@@ -27,6 +27,17 @@ vmmcsd_fixed: fixedregulator-sd {
enable-active-high; enable-active-high;
}; };
vtt_fixed: fixedregulator-vtt {
compatible = "regulator-fixed";
regulator-name = "vtt_fixed";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
regulator-always-on;
regulator-boot-on;
enable-active-high;
gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
};
backlight { backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>; pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>;
...@@ -81,6 +92,85 @@ ecap0_pins: backlight_pins { ...@@ -81,6 +92,85 @@ ecap0_pins: backlight_pins {
0x164 MUX_MODE0 /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */ 0x164 MUX_MODE0 /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
>; >;
}; };
pixcir_ts_pins: pixcir_ts_pins {
pinctrl-single,pins = <
0x264 (PIN_INPUT_PULLUP | MUX_MODE7) /* spi2_d0.gpio3_22 */
>;
};
cpsw_default: cpsw_default {
pinctrl-single,pins = <
/* Slave 1 */
0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_txen */
0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rxctl */
0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_txd3 */
0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_txd2 */
0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_txd1 */
0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_txd0 */
0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rmii1_tclk */
0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rmii1_rclk */
0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rxd3 */
0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rxd2 */
0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rxd1 */
0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rxd0 */
>;
};
cpsw_sleep: cpsw_sleep {
pinctrl-single,pins = <
/* Slave 1 reset value */
0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
>;
};
davinci_mdio_default: davinci_mdio_default {
pinctrl-single,pins = <
/* MDIO */
0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
>;
};
davinci_mdio_sleep: davinci_mdio_sleep {
pinctrl-single,pins = <
/* MDIO reset value */
0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
>;
};
nand_flash_x8: nand_flash_x8 {
pinctrl-single,pins = <
0x26c(PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* spi2_cs0.gpio/eMMCorNANDsel */
0x0 (PIN_INPUT | MUX_MODE0) /* gpmc_ad0.gpmc_ad0 */
0x4 (PIN_INPUT | MUX_MODE0) /* gpmc_ad1.gpmc_ad1 */
0x8 (PIN_INPUT | MUX_MODE0) /* gpmc_ad2.gpmc_ad2 */
0xc (PIN_INPUT | MUX_MODE0) /* gpmc_ad3.gpmc_ad3 */
0x10 (PIN_INPUT | MUX_MODE0) /* gpmc_ad4.gpmc_ad4 */
0x14 (PIN_INPUT | MUX_MODE0) /* gpmc_ad5.gpmc_ad5 */
0x18 (PIN_INPUT | MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */
0x1c (PIN_INPUT | MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */
0x70 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */
0x74 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpmc_wpn */
0x7c (PIN_OUTPUT | MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */
0x90 (PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */
0x94 (PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */
0x98 (PIN_OUTPUT | MUX_MODE0) /* gpmc_wen.gpmc_wen */
0x9c (PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle.gpmc_be0n_cle */
>;
};
}; };
&i2c0 { &i2c0 {
...@@ -93,6 +183,20 @@ &i2c1 { ...@@ -93,6 +183,20 @@ &i2c1 {
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>; pinctrl-0 = <&i2c1_pins>;
pixcir_ts@5c {
compatible = "pixcir,pixcir_tangoc";
pinctrl-names = "default";
pinctrl-0 = <&pixcir_ts_pins>;
reg = <0x5c>;
interrupt-parent = <&gpio3>;
interrupts = <22 0>;
attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
x-size = <1024>;
y-size = <600>;
};
}; };
&epwmss0 { &epwmss0 {
...@@ -130,3 +234,128 @@ &mmc1 { ...@@ -130,3 +234,128 @@ &mmc1 {
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
}; };
&usb2_phy1 {
status = "okay";
};
&usb1 {
dr_mode = "peripheral";
status = "okay";
};
&usb2_phy2 {
status = "okay";
};
&usb2 {
dr_mode = "host";
status = "okay";
};
&mac {
slaves = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
};
&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
};
&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "rgmii";
};
&elm {
status = "okay";
};
&gpmc {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&nand_flash_x8>;
ranges = <0 0 0 0x01000000>; /* minimum GPMC partition = 16MB */
nand@0,0 {
reg = <0 0 4>; /* device IO registers */
ti,nand-ecc-opt = "bch8";
ti,elm-id = <&elm>;
nand-bus-width = <8>;
gpmc,device-width = <1>;
gpmc,sync-clk-ps = <0>;
gpmc,cs-on-ns = <0>;
gpmc,cs-rd-off-ns = <40>;
gpmc,cs-wr-off-ns = <40>;
gpmc,adv-on-ns = <0>;
gpmc,adv-rd-off-ns = <25>;
gpmc,adv-wr-off-ns = <25>;
gpmc,we-on-ns = <0>;
gpmc,we-off-ns = <20>;
gpmc,oe-on-ns = <3>;
gpmc,oe-off-ns = <30>;
gpmc,access-ns = <30>;
gpmc,rd-cycle-ns = <40>;
gpmc,wr-cycle-ns = <40>;
gpmc,wait-pin = <0>;
gpmc,wait-on-read;
gpmc,wait-on-write;
gpmc,bus-turnaround-ns = <0>;
gpmc,cycle2cycle-delay-ns = <0>;
gpmc,clk-activation-ns = <0>;
gpmc,wait-monitoring-ns = <0>;
gpmc,wr-access-ns = <40>;
gpmc,wr-data-mux-bus-ns = <0>;
/* MTD partition table */
/* All SPL-* partitions are sized to minimal length
* which can be independently programmable. For
* NAND flash this is equal to size of erase-block */
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "NAND.SPL";
reg = <0x00000000 0x00040000>;
};
partition@1 {
label = "NAND.SPL.backup1";
reg = <0x00040000 0x00040000>;
};
partition@2 {
label = "NAND.SPL.backup2";
reg = <0x00080000 0x00040000>;
};
partition@3 {
label = "NAND.SPL.backup3";
reg = <0x000c0000 0x00040000>;
};
partition@4 {
label = "NAND.u-boot-spl-os";
reg = <0x00100000 0x00080000>;
};
partition@5 {
label = "NAND.u-boot";
reg = <0x00180000 0x00100000>;
};
partition@6 {
label = "NAND.u-boot-env";
reg = <0x00280000 0x00040000>;
};
partition@7 {
label = "NAND.u-boot-env.backup1";
reg = <0x002c0000 0x00040000>;
};
partition@8 {
label = "NAND.kernel";
reg = <0x00300000 0x00700000>;
};
partition@9 {
label = "NAND.file-system";
reg = <0x00a00000 0x1f600000>;
};
};
};
...@@ -138,6 +138,29 @@ mmc1_pins: pinmux_mmc1_pins { ...@@ -138,6 +138,29 @@ mmc1_pins: pinmux_mmc1_pins {
0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ 0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
>; >;
}; };
qspi1_default: qspi1_default {
pinctrl-single,pins = <
0x7c (PIN_INPUT_PULLUP | MUX_MODE3)
0x88 (PIN_INPUT_PULLUP | MUX_MODE2)
0x90 (PIN_INPUT_PULLUP | MUX_MODE3)
0x94 (PIN_INPUT_PULLUP | MUX_MODE3)
0x98 (PIN_INPUT_PULLUP | MUX_MODE3)
0x9c (PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
pixcir_ts_pins: pixcir_ts_pins {
pinctrl-single,pins = <
0x44 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_a1.gpio1_17 */
>;
};
hdq_pins: pinmux_hdq_pins {
pinctrl-single,pins = <
0x234 (PIN_INPUT_PULLUP | MUX_MODE1) /* cam1_wen.hdq_gpio */
>;
};
}; };
matrix_keypad: matrix_keypad@0 { matrix_keypad: matrix_keypad@0 {
...@@ -226,7 +249,9 @@ at24@50 { ...@@ -226,7 +249,9 @@ at24@50 {
}; };
pixcir_ts@5c { pixcir_ts@5c {
compatible = "pixcir,pixcir_ts"; compatible = "pixcir,pixcir_tangoc";
pinctrl-names = "default";
pinctrl-0 = <&pixcir_ts_pins>;
reg = <0x5c>; reg = <0x5c>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <17 0>; interrupts = <17 0>;
...@@ -234,7 +259,7 @@ pixcir_ts@5c { ...@@ -234,7 +259,7 @@ pixcir_ts@5c {
attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>; attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
x-size = <1024>; x-size = <1024>;
y-size = <768>; y-size = <600>;
}; };
}; };
...@@ -367,3 +392,79 @@ &spi1 { ...@@ -367,3 +392,79 @@ &spi1 {
pinctrl-0 = <&spi1_pins>; pinctrl-0 = <&spi1_pins>;
status = "okay"; status = "okay";
}; };
&usb2_phy1 {
status = "okay";
};
&usb1 {
dr_mode = "peripheral";
status = "okay";
};
&usb2_phy2 {
status = "okay";
};
&usb2 {
dr_mode = "host";
status = "okay";
};
&qspi {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&qspi1_default>;
spi-max-frequency = <48000000>;
m25p80@0 {
compatible = "mx66l51235l";
spi-max-frequency = <48000000>;
reg = <0>;
spi-cpol;
spi-cpha;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
/* MTD partition table.
* The ROM checks the first 512KiB
* for a valid file to boot(XIP).
*/
partition@0 {
label = "QSPI.U_BOOT";
reg = <0x00000000 0x000080000>;
};
partition@1 {
label = "QSPI.U_BOOT.backup";
reg = <0x00080000 0x00080000>;
};
partition@2 {
label = "QSPI.U-BOOT-SPL_OS";
reg = <0x00100000 0x00010000>;
};
partition@3 {
label = "QSPI.U_BOOT_ENV";
reg = <0x00110000 0x00010000>;
};
partition@4 {
label = "QSPI.U-BOOT-ENV.backup";
reg = <0x00120000 0x00010000>;
};
partition@5 {
label = "QSPI.KERNEL";
reg = <0x00130000 0x0800000>;
};
partition@6 {
label = "QSPI.FILESYSTEM";
reg = <0x00930000 0x36D0000>;
};
};
};
&hdq {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&hdq_pins>;
};
...@@ -9,6 +9,22 @@ ...@@ -9,6 +9,22 @@
*/ */
&scrm_clocks { &scrm_clocks {
sys_clkin_ck: sys_clkin_ck { sys_clkin_ck: sys_clkin_ck {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&sysboot_freq_sel_ck>, <&crystal_freq_sel_ck>;
ti,bit-shift = <31>;
reg = <0x0040>;
};
crystal_freq_sel_ck: crystal_freq_sel_ck {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>;
ti,bit-shift = <29>;
reg = <0x0040>;
};
sysboot_freq_sel_ck: sysboot_freq_sel_ck@44e10040 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,mux-clock"; compatible = "ti,mux-clock";
clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>;
...@@ -87,6 +103,54 @@ aes0_fck: aes0_fck { ...@@ -87,6 +103,54 @@ aes0_fck: aes0_fck {
clock-mult = <1>; clock-mult = <1>;
clock-div = <1>; clock-div = <1>;
}; };
ehrpwm0_tbclk: ehrpwm0_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <0>;
reg = <0x0664>;
};
ehrpwm1_tbclk: ehrpwm1_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <1>;
reg = <0x0664>;
};
ehrpwm2_tbclk: ehrpwm2_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <2>;
reg = <0x0664>;
};
ehrpwm3_tbclk: ehrpwm3_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <4>;
reg = <0x0664>;
};
ehrpwm4_tbclk: ehrpwm4_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <5>;
reg = <0x0664>;
};
ehrpwm5_tbclk: ehrpwm5_tbclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_m2_ck>;
ti,bit-shift = <6>;
reg = <0x0664>;
};
}; };
&prcm_clocks { &prcm_clocks {
clk_32768_ck: clk_32768_ck { clk_32768_ck: clk_32768_ck {
...@@ -229,6 +293,7 @@ dpll_disp_m2_ck: dpll_disp_m2_ck { ...@@ -229,6 +293,7 @@ dpll_disp_m2_ck: dpll_disp_m2_ck {
reg = <0x2e30>; reg = <0x2e30>;
ti,index-starts-at-one; ti,index-starts-at-one;
ti,invert-autoidle-bit; ti,invert-autoidle-bit;
ti,set-rate-parent;
}; };
dpll_per_ck: dpll_per_ck { dpll_per_ck: dpll_per_ck {
...@@ -511,6 +576,7 @@ disp_clk: disp_clk { ...@@ -511,6 +576,7 @@ disp_clk: disp_clk {
compatible = "ti,mux-clock"; compatible = "ti,mux-clock";
clocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>; clocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>;
reg = <0x4244>; reg = <0x4244>;
ti,set-rate-parent;
}; };
dpll_extdev_ck: dpll_extdev_ck { dpll_extdev_ck: dpll_extdev_ck {
...@@ -609,10 +675,13 @@ dpll_ddr_m4_ck: dpll_ddr_m4_ck { ...@@ -609,10 +675,13 @@ dpll_ddr_m4_ck: dpll_ddr_m4_ck {
dpll_per_clkdcoldo: dpll_per_clkdcoldo { dpll_per_clkdcoldo: dpll_per_clkdcoldo {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-factor-clock"; compatible = "ti,fixed-factor-clock";
clocks = <&dpll_per_ck>; clocks = <&dpll_per_ck>;
clock-mult = <1>; ti,clock-mult = <1>;
clock-div = <1>; ti,clock-div = <1>;
ti,autoidle-shift = <8>;
reg = <0x2e14>;
ti,invert-autoidle-bit;
}; };
dll_aging_clk_div: dll_aging_clk_div { dll_aging_clk_div: dll_aging_clk_div {
...@@ -653,4 +722,36 @@ usbphy_32khz_clkmux: usbphy_32khz_clkmux { ...@@ -653,4 +722,36 @@ usbphy_32khz_clkmux: usbphy_32khz_clkmux {
clocks = <&clk_32768_ck>, <&clk_32k_tpm_ck>; clocks = <&clk_32768_ck>, <&clk_32k_tpm_ck>;
reg = <0x4260>; reg = <0x4260>;
}; };
usb_phy0_always_on_clk32k: usb_phy0_always_on_clk32k {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&usbphy_32khz_clkmux>;
ti,bit-shift = <8>;
reg = <0x2a40>;
};
usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&usbphy_32khz_clkmux>;
ti,bit-shift = <8>;
reg = <0x2a48>;
};
usb_otg_ss0_refclk960m: usb_otg_ss0_refclk960m {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_clkdcoldo>;
ti,bit-shift = <8>;
reg = <0x8a60>;
};
usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_per_clkdcoldo>;
ti,bit-shift = <8>;
reg = <0x8a68>;
};
}; };
...@@ -35,7 +35,6 @@ soc { ...@@ -35,7 +35,6 @@ soc {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
sata@a0000 { sata@a0000 {
......
...@@ -47,7 +47,6 @@ pcie@2,0 { ...@@ -47,7 +47,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
timer@20300 { timer@20300 {
......
...@@ -50,7 +50,6 @@ pcie@2,0 { ...@@ -50,7 +50,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -50,7 +50,6 @@ pcie@2,0 { ...@@ -50,7 +50,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -51,7 +51,6 @@ pcie@2,0 { ...@@ -51,7 +51,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
sata@a0000 { sata@a0000 {
......
...@@ -157,6 +157,7 @@ serial@12000 { ...@@ -157,6 +157,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <41>; interrupts = <41>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
serial@12100 { serial@12100 {
...@@ -165,6 +166,7 @@ serial@12100 { ...@@ -165,6 +166,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <42>; interrupts = <42>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -203,6 +205,11 @@ watchdog@20300 { ...@@ -203,6 +205,11 @@ watchdog@20300 {
reg = <0x20300 0x34>, <0x20704 0x4>; reg = <0x20300 0x34>, <0x20704 0x4>;
}; };
pmsu@22000 {
compatible = "marvell,armada-370-pmsu";
reg = <0x22000 0x1000>;
};
usb@50000 { usb@50000 {
compatible = "marvell,orion-ehci"; compatible = "marvell,orion-ehci";
reg = <0x50000 0x500>; reg = <0x50000 0x500>;
......
...@@ -220,6 +220,11 @@ watchdog@20300 { ...@@ -220,6 +220,11 @@ watchdog@20300 {
clocks = <&coreclk 2>; clocks = <&coreclk 2>;
}; };
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x8>;
};
audio_controller: audio-controller@30000 { audio_controller: audio-controller@30000 {
compatible = "marvell,armada370-audio"; compatible = "marvell,armada370-audio";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
......
...@@ -68,7 +68,6 @@ i2c@11100 { ...@@ -68,7 +68,6 @@ i2c@11100 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
...@@ -107,6 +106,14 @@ partition@1000000 { ...@@ -107,6 +106,14 @@ partition@1000000 {
}; };
}; };
usb@54000 {
status = "okay";
};
usb3@58000 {
status = "okay";
};
mvsdio@d4000 { mvsdio@d4000 {
pinctrl-0 = <&sdio_pins &sdio_st_pins>; pinctrl-0 = <&sdio_pins &sdio_st_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -39,6 +39,8 @@ mainpll: mainpll { ...@@ -39,6 +39,8 @@ mainpll: mainpll {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-375-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
...@@ -128,6 +130,11 @@ L2: cache-controller@8000 { ...@@ -128,6 +130,11 @@ L2: cache-controller@8000 {
cache-level = <2>; cache-level = <2>;
}; };
scu@c000 {
compatible = "arm,cortex-a9-scu";
reg = <0xc000 0x58>;
};
timer@c600 { timer@c600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xc600 0x20>; reg = <0xc600 0x20>;
...@@ -194,6 +201,7 @@ serial@12000 { ...@@ -194,6 +201,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -203,6 +211,7 @@ serial@12100 { ...@@ -203,6 +211,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -320,6 +329,46 @@ timer@20300 { ...@@ -320,6 +329,46 @@ timer@20300 {
clocks = <&coreclk 0>; clocks = <&coreclk 0>;
}; };
watchdog@20300 {
compatible = "marvell,armada-375-wdt";
reg = <0x20300 0x34>, <0x20704 0x4>, <0x18254 0x4>;
clocks = <&coreclk 0>;
};
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x10>;
};
coherency-fabric@21010 {
compatible = "marvell,armada-375-coherency-fabric";
reg = <0x21010 0x1c>;
};
usb@50000 {
compatible = "marvell,orion-ehci";
reg = <0x50000 0x500>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 18>;
status = "disabled";
};
usb@54000 {
compatible = "marvell,orion-ehci";
reg = <0x54000 0x500>;
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 26>;
status = "disabled";
};
usb3@58000 {
compatible = "marvell,armada-375-xhci";
reg = <0x58000 0x20000>,<0x5b880 0x80>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 16>;
status = "disabled";
};
xor@60800 { xor@60800 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60800 0x100 reg = <0x60800 0x100
...@@ -391,6 +440,12 @@ mvsdio@d4000 { ...@@ -391,6 +440,12 @@ mvsdio@d4000 {
status = "disabled"; status = "disabled";
}; };
thermal@e8078 {
compatible = "marvell,armada375-thermal";
reg = <0xe8078 0x4>, <0xe807c 0x8>;
status = "okay";
};
coreclk: mvebu-sar@e8204 { coreclk: mvebu-sar@e8204 {
compatible = "marvell,armada-375-core-clock"; compatible = "marvell,armada-375-core-clock";
reg = <0xe8204 0x04>; reg = <0xe8204 0x04>;
......
...@@ -21,6 +21,8 @@ / { ...@@ -21,6 +21,8 @@ / {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-380-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
......
...@@ -55,7 +55,6 @@ i2c@11100 { ...@@ -55,7 +55,6 @@ i2c@11100 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
...@@ -65,6 +64,10 @@ ethernet@30000 { ...@@ -65,6 +64,10 @@ ethernet@30000 {
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
usb@50000 {
status = "ok";
};
ethernet@70000 { ethernet@70000 {
status = "okay"; status = "okay";
phy = <&phy0>; phy = <&phy0>;
...@@ -81,6 +84,14 @@ phy1: ethernet-phy@1 { ...@@ -81,6 +84,14 @@ phy1: ethernet-phy@1 {
}; };
}; };
sata@a8000 {
status = "okay";
};
sata@e0000 {
status = "okay";
};
flash@d0000 { flash@d0000 {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;
...@@ -101,6 +112,22 @@ partition@1000000 { ...@@ -101,6 +112,22 @@ partition@1000000 {
reg = <0x1000000 0x3f000000>; reg = <0x1000000 0x3f000000>;
}; };
}; };
sdhci@d8000 {
clock-frequency = <200000000>;
broken-cd;
wp-inverted;
bus-width = <8>;
status = "okay";
};
usb3@f0000 {
status = "okay";
};
usb3@f8000 {
status = "okay";
};
}; };
pcie-controller { pcie-controller {
......
...@@ -51,7 +51,6 @@ i2c@11000 { ...@@ -51,7 +51,6 @@ i2c@11000 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
...@@ -77,6 +76,10 @@ phy1: ethernet-phy@1 { ...@@ -77,6 +76,10 @@ phy1: ethernet-phy@1 {
reg = <1>; reg = <1>;
}; };
}; };
usb3@f0000 {
status = "okay";
};
}; };
pcie-controller { pcie-controller {
......
...@@ -21,6 +21,8 @@ / { ...@@ -21,6 +21,8 @@ / {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-380-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
......
...@@ -108,6 +108,11 @@ L2: cache-controller@8000 { ...@@ -108,6 +108,11 @@ L2: cache-controller@8000 {
cache-level = <2>; cache-level = <2>;
}; };
scu@c000 {
compatible = "arm,cortex-a9-scu";
reg = <0xc000 0x58>;
};
timer@c600 { timer@c600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xc600 0x20>; reg = <0xc600 0x20>;
...@@ -174,6 +179,7 @@ serial@12000 { ...@@ -174,6 +179,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -183,6 +189,7 @@ serial@12100 { ...@@ -183,6 +189,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -267,6 +274,28 @@ timer@20300 { ...@@ -267,6 +274,28 @@ timer@20300 {
clock-names = "nbclk", "fixed"; clock-names = "nbclk", "fixed";
}; };
watchdog@20300 {
compatible = "marvell,armada-380-wdt";
reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>;
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x10>;
};
coherency-fabric@21010 {
compatible = "marvell,armada-380-coherency-fabric";
reg = <0x21010 0x1c>;
};
pmsu@22000 {
compatible = "marvell,armada-380-pmsu";
reg = <0x22000 0x1000>;
};
eth1: ethernet@30000 { eth1: ethernet@30000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
...@@ -283,6 +312,14 @@ eth2: ethernet@34000 { ...@@ -283,6 +312,14 @@ eth2: ethernet@34000 {
status = "disabled"; status = "disabled";
}; };
usb@50000 {
compatible = "marvell,orion-ehci";
reg = <0x58000 0x500>;
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 18>;
status = "disabled";
};
xor@60800 { xor@60800 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60800 0x100 reg = <0x60800 0x100
...@@ -339,6 +376,22 @@ mdio { ...@@ -339,6 +376,22 @@ mdio {
clocks = <&gateclk 4>; clocks = <&gateclk 4>;
}; };
sata@a8000 {
compatible = "marvell,armada-380-ahci";
reg = <0xa8000 0x2000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 15>;
status = "disabled";
};
sata@e0000 {
compatible = "marvell,armada-380-ahci";
reg = <0xe0000 0x2000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 30>;
status = "disabled";
};
coredivclk: clock@e4250 { coredivclk: clock@e4250 {
compatible = "marvell,armada-380-corediv-clock"; compatible = "marvell,armada-380-corediv-clock";
reg = <0xe4250 0xc>; reg = <0xe4250 0xc>;
...@@ -347,6 +400,12 @@ coredivclk: clock@e4250 { ...@@ -347,6 +400,12 @@ coredivclk: clock@e4250 {
clock-output-names = "nand"; clock-output-names = "nand";
}; };
thermal@e8078 {
compatible = "marvell,armada380-thermal";
reg = <0xe4078 0x4>, <0xe4074 0x4>;
status = "okay";
};
flash@d0000 { flash@d0000 {
compatible = "marvell,armada370-nand"; compatible = "marvell,armada370-nand";
reg = <0xd0000 0x54>; reg = <0xd0000 0x54>;
...@@ -356,6 +415,31 @@ flash@d0000 { ...@@ -356,6 +415,31 @@ flash@d0000 {
clocks = <&coredivclk 0>; clocks = <&coredivclk 0>;
status = "disabled"; status = "disabled";
}; };
sdhci@d8000 {
compatible = "marvell,armada-380-sdhci";
reg = <0xd8000 0x1000>, <0xdc000 0x100>;
interrupts = <0 25 0x4>;
clocks = <&gateclk 17>;
mrvl,clk-delay-cycles = <0x1F>;
status = "disabled";
};
usb3@f0000 {
compatible = "marvell,armada-380-xhci";
reg = <0xf0000 0x4000>,<0xf4000 0x4000>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 9>;
status = "disabled";
};
usb3@f8000 {
compatible = "marvell,armada-380-xhci";
reg = <0xf8000 0x4000>,<0xfc000 0x4000>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 10>;
status = "disabled";
};
}; };
}; };
......
...@@ -95,12 +95,10 @@ pmx_phy_int: pmx-phy-int { ...@@ -95,12 +95,10 @@ pmx_phy_int: pmx-phy-int {
}; };
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -106,19 +106,15 @@ pcie@10,0 { ...@@ -106,19 +106,15 @@ pcie@10,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -104,19 +104,15 @@ pcie@10,0 { ...@@ -104,19 +104,15 @@ pcie@10,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -37,19 +37,15 @@ soc { ...@@ -37,19 +37,15 @@ soc {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
...@@ -27,6 +27,7 @@ aliases { ...@@ -27,6 +27,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
...@@ -29,6 +29,7 @@ aliases { ...@@ -29,6 +29,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
...@@ -30,6 +30,7 @@ aliases { ...@@ -30,6 +30,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
...@@ -138,7 +138,6 @@ err_led_pin: err-led-pin { ...@@ -138,7 +138,6 @@ err_led_pin: err-led-pin {
}; };
serial@12000 { serial@12000 {
clocks = <&coreclk 0>;
status = "okay"; status = "okay";
}; };
......
...@@ -72,11 +72,9 @@ pcie@1,0 { ...@@ -72,11 +72,9 @@ pcie@1,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
pinctrl { pinctrl {
......
...@@ -58,6 +58,7 @@ serial@12200 { ...@@ -58,6 +58,7 @@ serial@12200 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <43>; interrupts = <43>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
serial@12300 { serial@12300 {
...@@ -66,6 +67,7 @@ serial@12300 { ...@@ -66,6 +67,7 @@ serial@12300 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <44>; interrupts = <44>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -117,9 +119,9 @@ watchdog@20300 { ...@@ -117,9 +119,9 @@ watchdog@20300 {
clock-names = "nbclk", "fixed"; clock-names = "nbclk", "fixed";
}; };
armada-370-xp-pmsu@22000 { cpurst@20800 {
compatible = "marvell,armada-370-xp-pmsu"; compatible = "marvell,armada-370-cpu-reset";
reg = <0x22100 0x400>, <0x20800 0x20>; reg = <0x20800 0x20>;
}; };
eth2: ethernet@30000 { eth2: ethernet@30000 {
......
...@@ -51,11 +51,54 @@ can0: can@f000c000 { ...@@ -51,11 +51,54 @@ can0: can@f000c000 {
}; };
i2c0: i2c@f0014000 { i2c0: i2c@f0014000 {
pinctrl-0 = <&pinctrl_i2c0_pu>;
status = "okay"; status = "okay";
}; };
i2c1: i2c@f0018000 { i2c1: i2c@f0018000 {
status = "okay"; status = "okay";
pmic: act8865@5b {
compatible = "active-semi,act8865";
reg = <0x5b>;
status = "okay";
regulators {
vcc_1v8_reg: DCDC_REG1 {
regulator-name = "VCC_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
vcc_1v2_reg: DCDC_REG2 {
regulator-name = "VCC_1V2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
};
vcc_3v3_reg: DCDC_REG3 {
regulator-name = "VCC_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vddfuse_reg: LDO_REG1 {
regulator-name = "FUSE_2V5";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
};
vddana_reg: LDO_REG2 {
regulator-name = "VDDANA";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
};
}; };
macb0: ethernet@f0028000 { macb0: ethernet@f0028000 {
...@@ -63,6 +106,12 @@ macb0: ethernet@f0028000 { ...@@ -63,6 +106,12 @@ macb0: ethernet@f0028000 {
status = "okay"; status = "okay";
}; };
pwm0: pwm@f002c000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwmh0_0 &pinctrl_pwm0_pwmh1_0>;
status = "okay";
};
usart0: serial@f001c000 { usart0: serial@f001c000 {
status = "okay"; status = "okay";
}; };
...@@ -110,6 +159,7 @@ &pinctrl_adc0_ad9 ...@@ -110,6 +159,7 @@ &pinctrl_adc0_ad9
i2c2: i2c@f801c000 { i2c2: i2c@f801c000 {
dmas = <0>, <0>; /* Do not use DMA for i2c2 */ dmas = <0>, <0>; /* Do not use DMA for i2c2 */
pinctrl-0 = <&pinctrl_i2c2_pu>;
status = "okay"; status = "okay";
}; };
...@@ -124,6 +174,18 @@ dbgu: serial@ffffee00 { ...@@ -124,6 +174,18 @@ dbgu: serial@ffffee00 {
pinctrl@fffff200 { pinctrl@fffff200 {
board { board {
pinctrl_i2c0_pu: i2c0_pu {
atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
<AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
};
pinctrl_i2c2_pu: i2c2_pu {
atmel,pins =
<AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>,
<AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
};
pinctrl_mmc0_cd: mmc0_cd { pinctrl_mmc0_cd: mmc0_cd {
atmel,pins = atmel,pins =
<AT91_PIOE 0 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; <AT91_PIOE 0 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
......
...@@ -29,6 +29,7 @@ aliases { ...@@ -29,6 +29,7 @@ aliases {
i2c0 = &i2c0; i2c0 = &i2c0;
ssc0 = &ssc0; ssc0 = &ssc0;
ssc1 = &ssc1; ssc1 = &ssc1;
ssc2 = &ssc2;
}; };
cpus { cpus {
...@@ -194,6 +195,8 @@ ssc0: ssc@fffbc000 { ...@@ -194,6 +195,8 @@ ssc0: ssc@fffbc000 {
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
clocks = <&ssc0_clk>;
clock-names = "pclk";
status = "disabled"; status = "disabled";
}; };
...@@ -203,6 +206,19 @@ ssc1: ssc@fffc0000 { ...@@ -203,6 +206,19 @@ ssc1: ssc@fffc0000 {
interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
clocks = <&ssc1_clk>;
clock-names = "pclk";
status = "disabled";
};
ssc2: ssc@fffc4000 {
compatible = "atmel,at91rm9200-ssc";
reg = <0xfffc4000 0x4000>;
interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
clocks = <&ssc2_clk>;
clock-names = "pclk";
status = "disabled"; status = "disabled";
}; };
...@@ -397,6 +413,22 @@ pinctrl_ssc1_rx: ssc1_rx-0 { ...@@ -397,6 +413,22 @@ pinctrl_ssc1_rx: ssc1_rx-0 {
}; };
}; };
ssc2 {
pinctrl_ssc2_tx: ssc2_tx-0 {
atmel,pins =
<AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_ssc2_rx: ssc2_rx-0 {
atmel,pins =
<AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
};
spi0 { spi0 {
pinctrl_spi0: spi0-0 { pinctrl_spi0: spi0-0 {
atmel,pins = atmel,pins =
...@@ -564,7 +596,8 @@ plla: pllack { ...@@ -564,7 +596,8 @@ plla: pllack {
reg = <0>; reg = <0>;
atmel,clk-input-range = <1000000 32000000>; atmel,clk-input-range = <1000000 32000000>;
#atmel,pll-clk-output-range-cells = <4>; #atmel,pll-clk-output-range-cells = <4>;
atmel,pll-clk-output-ranges = <80000000 200000000 190000000 240000000>; atmel,pll-clk-output-ranges = <80000000 200000000 0 1>,
<190000000 240000000 2 1>;
}; };
pllb: pllbck { pllb: pllbck {
...@@ -573,9 +606,9 @@ pllb: pllbck { ...@@ -573,9 +606,9 @@ pllb: pllbck {
interrupts-extended = <&pmc AT91_PMC_LOCKB>; interrupts-extended = <&pmc AT91_PMC_LOCKB>;
clocks = <&main>; clocks = <&main>;
reg = <1>; reg = <1>;
atmel,clk-input-range = <1000000 32000000>; atmel,clk-input-range = <1000000 5000000>;
#atmel,pll-clk-output-range-cells = <4>; #atmel,pll-clk-output-range-cells = <4>;
atmel,pll-clk-output-ranges = <80000000 200000000 190000000 240000000>; atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;
}; };
mck: masterck { mck: masterck {
...@@ -584,16 +617,48 @@ mck: masterck { ...@@ -584,16 +617,48 @@ mck: masterck {
interrupts-extended = <&pmc AT91_PMC_MCKRDY>; interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
clocks = <&clk32k>, <&main>, <&plla>, <&pllb>; clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
atmel,clk-output-range = <0 94000000>; atmel,clk-output-range = <0 94000000>;
atmel,clk-divisors = <1 2 4 3>; atmel,clk-divisors = <1 2 4 0>;
}; };
usb: usbck { usb: usbck {
compatible = "atmel,at91rm9200-clk-usb"; compatible = "atmel,at91rm9200-clk-usb";
#clock-cells = <0>; #clock-cells = <0>;
atmel,clk-divisors = <1 2 4 3>; atmel,clk-divisors = <1 2 4 0>;
clocks = <&pllb>; clocks = <&pllb>;
}; };
prog: progck {
compatible = "atmel,at91rm9200-clk-programmable";
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&pmc>;
clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
prog0: prog0 {
#clock-cells = <0>;
reg = <0>;
interrupts = <AT91_PMC_PCKRDY(0)>;
};
prog1: prog1 {
#clock-cells = <0>;
reg = <1>;
interrupts = <AT91_PMC_PCKRDY(1)>;
};
prog2: prog2 {
#clock-cells = <0>;
reg = <2>;
interrupts = <AT91_PMC_PCKRDY(2)>;
};
prog3: prog3 {
#clock-cells = <0>;
reg = <3>;
interrupts = <AT91_PMC_PCKRDY(3)>;
};
};
systemck { systemck {
compatible = "atmel,at91rm9200-clk-system"; compatible = "atmel,at91rm9200-clk-system";
#address-cells = <1>; #address-cells = <1>;
...@@ -611,6 +676,30 @@ udpck: udpck { ...@@ -611,6 +676,30 @@ udpck: udpck {
clocks = <&usb>; clocks = <&usb>;
}; };
pck0: pck0 {
#clock-cells = <0>;
reg = <8>;
clocks = <&prog0>;
};
pck1: pck1 {
#clock-cells = <0>;
reg = <9>;
clocks = <&prog1>;
};
pck2: pck2 {
#clock-cells = <0>;
reg = <10>;
clocks = <&prog2>;
};
pck3: pck3 {
#clock-cells = <0>;
reg = <11>;
clocks = <&prog3>;
};
hclk0: hclk0 { hclk0: hclk0 {
#clock-cells = <0>; #clock-cells = <0>;
reg = <16>; reg = <16>;
...@@ -685,6 +774,21 @@ spi1_clk: spi1_clk { ...@@ -685,6 +774,21 @@ spi1_clk: spi1_clk {
reg = <13>; reg = <13>;
}; };
ssc0_clk: ssc0_clk {
#clock-cells = <0>;
reg = <14>;
};
ssc1_clk: ssc1_clk {
#clock-cells = <0>;
reg = <15>;
};
ssc2_clk: ssc2_clk {
#clock-cells = <0>;
reg = <16>;
};
tc0_clk: tc0_clk { tc0_clk: tc0_clk {
#clock-cells = <0>; #clock-cells = <0>;
reg = <17>; reg = <17>;
......
...@@ -136,6 +136,36 @@ pinctrl@fffff200 { ...@@ -136,6 +136,36 @@ pinctrl@fffff200 {
>; >;
/* shared pinctrl settings */ /* shared pinctrl settings */
adc0 {
pinctrl_adc0_adtrg: adc0_adtrg {
atmel,pins = <AT91_PIOD 28 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad0: adc0_ad0 {
atmel,pins = <AT91_PIOD 20 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad1: adc0_ad1 {
atmel,pins = <AT91_PIOD 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad2: adc0_ad2 {
atmel,pins = <AT91_PIOD 22 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad3: adc0_ad3 {
atmel,pins = <AT91_PIOD 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad4: adc0_ad4 {
atmel,pins = <AT91_PIOD 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad5: adc0_ad5 {
atmel,pins = <AT91_PIOD 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad6: adc0_ad6 {
atmel,pins = <AT91_PIOD 26 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad7: adc0_ad7 {
atmel,pins = <AT91_PIOD 27 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
...@@ -634,10 +664,9 @@ ssc1: ssc@fffa0000 { ...@@ -634,10 +664,9 @@ ssc1: ssc@fffa0000 {
adc0: adc@fffb0000 { adc0: adc@fffb0000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "atmel,at91sam9260-adc"; compatible = "atmel,at91sam9g45-adc";
reg = <0xfffb0000 0x100>; reg = <0xfffb0000 0x100>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
atmel,adc-use-external-triggers;
atmel,adc-channels-used = <0xff>; atmel,adc-channels-used = <0xff>;
atmel,adc-vref = <3300>; atmel,adc-vref = <3300>;
atmel,adc-startup-time = <40>; atmel,adc-startup-time = <40>;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include "at91sam9g45.dtsi" #include "at91sam9g45.dtsi"
#include <dt-bindings/pwm/pwm.h>
/ { / {
model = "Atmel AT91SAM9M10G45-EK"; model = "Atmel AT91SAM9M10G45-EK";
...@@ -130,6 +131,21 @@ usb2: gadget@fff78000 { ...@@ -130,6 +131,21 @@ usb2: gadget@fff78000 {
status = "okay"; status = "okay";
}; };
adc0: adc@fffb0000 {
pinctrl-names = "default";
pinctrl-0 = <
&pinctrl_adc0_ad0
&pinctrl_adc0_ad1
&pinctrl_adc0_ad2
&pinctrl_adc0_ad3
&pinctrl_adc0_ad4
&pinctrl_adc0_ad5
&pinctrl_adc0_ad6
&pinctrl_adc0_ad7>;
atmel,adc-ts-wires = <4>;
status = "okay";
};
pwm0: pwm@fffb8000 { pwm0: pwm@fffb8000 {
status = "okay"; status = "okay";
...@@ -216,14 +232,14 @@ pwmleds { ...@@ -216,14 +232,14 @@ pwmleds {
d6 { d6 {
label = "d6"; label = "d6";
pwms = <&pwm0 3 5000 0>; pwms = <&pwm0 3 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
d7 { d7 {
label = "d7"; label = "d7";
pwms = <&pwm0 1 5000 0>; pwms = <&pwm0 1 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
......
This diff is collapsed.
...@@ -21,6 +21,14 @@ memory { ...@@ -21,6 +21,14 @@ memory {
reg = <0x20000000 0x8000000>; reg = <0x20000000 0x8000000>;
}; };
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <16000000>;
};
clocks { clocks {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pwm/pwm.h>
/ { / {
model = "Atmel AT91SAM9RL family SoC"; model = "Atmel AT91SAM9RL family SoC";
...@@ -32,6 +33,7 @@ aliases { ...@@ -32,6 +33,7 @@ aliases {
i2c1 = &i2c1; i2c1 = &i2c1;
ssc0 = &ssc0; ssc0 = &ssc0;
ssc1 = &ssc1; ssc1 = &ssc1;
pwm0 = &pwm0;
}; };
cpus { cpus {
...@@ -60,12 +62,31 @@ main_xtal: main_xtal { ...@@ -60,12 +62,31 @@ main_xtal: main_xtal {
clock-frequency = <0>; clock-frequency = <0>;
}; };
clocks {
adc_op_clk: adc_op_clk{
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <1000000>;
};
};
ahb { ahb {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
fb0: fb@00500000 {
compatible = "atmel,at91sam9rl-lcdc";
reg = <0x00500000 0x1000>;
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_fb>;
clocks = <&lcd_clk>, <&lcd_clk>;
clock-names = "hclk", "lcdc_clk";
status = "disabled";
};
nand0: nand@40000000 { nand0: nand@40000000 {
compatible = "atmel,at91rm9200-nand"; compatible = "atmel,at91rm9200-nand";
#address-cells = <1>; #address-cells = <1>;
...@@ -199,6 +220,16 @@ ssc1: ssc@fffc4000 { ...@@ -199,6 +220,16 @@ ssc1: ssc@fffc4000 {
status = "disabled"; status = "disabled";
}; };
pwm0: pwm@fffc8000 {
compatible = "atmel,at91sam9rl-pwm";
reg = <0xfffc8000 0x300>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
#pwm-cells = <3>;
clocks = <&pwm_clk>;
clock-names = "pwm_clk";
status = "disabled";
};
spi0: spi@fffcc000 { spi0: spi@fffcc000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -212,6 +243,111 @@ spi0: spi@fffcc000 { ...@@ -212,6 +243,111 @@ spi0: spi@fffcc000 {
status = "disabled"; status = "disabled";
}; };
adc0: adc@fffd0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9rl-adc";
reg = <0xfffd0000 0x100>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
clocks = <&adc_clk>, <&adc_op_clk>;
clock-names = "adc_clk", "adc_op_clk";
atmel,adc-use-external-triggers;
atmel,adc-channels-used = <0x3f>;
atmel,adc-vref = <3300>;
atmel,adc-startup-time = <40>;
atmel,adc-res = <8 10>;
atmel,adc-res-names = "lowres", "highres";
atmel,adc-use-res = "highres";
trigger@0 {
reg = <0>;
trigger-name = "timer-counter-0";
trigger-value = <0x1>;
};
trigger@1 {
reg = <1>;
trigger-name = "timer-counter-1";
trigger-value = <0x3>;
};
trigger@2 {
reg = <2>;
trigger-name = "timer-counter-2";
trigger-value = <0x5>;
};
trigger@3 {
reg = <3>;
trigger-name = "external";
trigger-value = <0x13>;
trigger-external;
};
};
usb0: gadget@fffd4000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9rl-udc";
reg = <0x00600000 0x100000>,
<0xfffd4000 0x4000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&udphs_clk>, <&utmi>;
clock-names = "pclk", "hclk";
status = "disabled";
ep0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
};
ramc0: ramc@ffffea00 { ramc0: ramc@ffffea00 {
compatible = "atmel,at91sam9260-sdramc"; compatible = "atmel,at91sam9260-sdramc";
reg = <0xffffea00 0x200>; reg = <0xffffea00 0x200>;
...@@ -250,6 +386,44 @@ pinctrl@fffff400 { ...@@ -250,6 +386,44 @@ pinctrl@fffff400 {
<0x003fffff 0x0001ff3c>; /* pioD */ <0x003fffff 0x0001ff3c>; /* pioD */
/* shared pinctrl settings */ /* shared pinctrl settings */
adc0 {
pinctrl_adc0_ts: adc0_ts-0 {
atmel,pins =
<AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad0: adc0_ad0-0 {
atmel,pins = <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad1: adc0_ad1-0 {
atmel,pins = <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad2: adc0_ad2-0 {
atmel,pins = <AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad3: adc0_ad3-0 {
atmel,pins = <AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad4: adc0_ad4-0 {
atmel,pins = <AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_ad5: adc0_ad5-0 {
atmel,pins = <AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_adc0_adtrg: adc0_adtrg-0 {
atmel,pins = <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
};
dbgu { dbgu {
pinctrl_dbgu: dbgu-0 { pinctrl_dbgu: dbgu-0 {
atmel,pins = atmel,pins =
...@@ -258,6 +432,33 @@ pinctrl_dbgu: dbgu-0 { ...@@ -258,6 +432,33 @@ pinctrl_dbgu: dbgu-0 {
}; };
}; };
fb {
pinctrl_fb: fb-0 {
atmel,pins =
<AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 3 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 5 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 6 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 7 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 15 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 17 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>,
<AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
};
i2c_gpio0 { i2c_gpio0 {
pinctrl_i2c_gpio0: i2c_gpio0-0 { pinctrl_i2c_gpio0: i2c_gpio0-0 {
atmel,pins = atmel,pins =
...@@ -319,6 +520,61 @@ pinctrl_nand0_cs: nand_cs-0 { ...@@ -319,6 +520,61 @@ pinctrl_nand0_cs: nand_cs-0 {
}; };
}; };
pwm0 {
pinctrl_pwm0_pwm0_0: pwm0_pwm0-0 {
atmel,pins = <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm0_1: pwm0_pwm0-1 {
atmel,pins = <AT91_PIOC 2 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm0_2: pwm0_pwm0-2 {
atmel,pins = <AT91_PIOD 14 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm1_0: pwm0_pwm1-0 {
atmel,pins = <AT91_PIOB 9 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm1_1: pwm0_pwm1-1 {
atmel,pins = <AT91_PIOC 3 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm1_2: pwm0_pwm1-2 {
atmel,pins = <AT91_PIOD 15 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm2_0: pwm0_pwm2-0 {
atmel,pins = <AT91_PIOD 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm2_1: pwm0_pwm2-1 {
atmel,pins = <AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm2_2: pwm0_pwm2-2 {
atmel,pins = <AT91_PIOD 16 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm3_0: pwm0_pwm3-0 {
atmel,pins = <AT91_PIOD 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;
};
pinctrl_pwm0_pwm3_1: pwm0_pwm3-1 {
atmel,pins = <AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
};
spi0 {
pinctrl_spi0: spi0-0 {
atmel,pins =
<AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
};
ssc0 { ssc0 {
pinctrl_ssc0_tx: ssc0_tx-0 { pinctrl_ssc0_tx: ssc0_tx-0 {
atmel,pins = atmel,pins =
...@@ -351,15 +607,6 @@ pinctrl_ssc1_rx: ssc1_rx-0 { ...@@ -351,15 +607,6 @@ pinctrl_ssc1_rx: ssc1_rx-0 {
}; };
}; };
spi0 {
pinctrl_spi0: spi0-0 {
atmel,pins =
<AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
};
tcb0 { tcb0 {
pinctrl_tcb0_tclk0: tcb0_tclk0-0 { pinctrl_tcb0_tclk0: tcb0_tclk0-0 {
atmel,pins = <AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_NONE>; atmel,pins = <AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_NONE>;
...@@ -574,8 +821,9 @@ plla: pllack { ...@@ -574,8 +821,9 @@ plla: pllack {
clocks = <&main>; clocks = <&main>;
reg = <0>; reg = <0>;
atmel,clk-input-range = <1000000 32000000>; atmel,clk-input-range = <1000000 32000000>;
#atmel,pll-clk-output-range-cells = <4>; #atmel,pll-clk-output-range-cells = <3>;
atmel,pll-clk-output-ranges = <80000000 200000000 190000000 240000000>; atmel,pll-clk-output-ranges = <80000000 200000000 0>,
<190000000 240000000 2>;
}; };
utmi: utmick { utmi: utmick {
...@@ -592,7 +840,7 @@ mck: masterck { ...@@ -592,7 +840,7 @@ mck: masterck {
interrupts-extended = <&pmc AT91_PMC_MCKRDY>; interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
clocks = <&clk32k>, <&main>, <&plla>, <&utmi>; clocks = <&clk32k>, <&main>, <&plla>, <&utmi>;
atmel,clk-output-range = <0 94000000>; atmel,clk-output-range = <0 94000000>;
atmel,clk-divisors = <1 2 4 3>; atmel,clk-divisors = <1 2 4 0>;
}; };
prog: progck { prog: progck {
......
...@@ -41,6 +41,37 @@ main_clock: clock { ...@@ -41,6 +41,37 @@ main_clock: clock {
}; };
ahb { ahb {
fb0: fb@00500000 {
display = <&display0>;
status = "okay";
display0: display {
bits-per-pixel = <16>;
atmel,lcdcon-backlight;
atmel,dmacon = <0x1>;
atmel,lcdcon2 = <0x80008002>;
atmel,guard-time = <1>;
atmel,lcd-wiring-mode = "RGB";
display-timings {
native-mode = <&timing0>;
timing0: timing0 {
clock-frequency = <4965000>;
hactive = <240>;
vactive = <320>;
hback-porch = <1>;
hfront-porch = <33>;
vback-porch = <1>;
vfront-porch = <0>;
hsync-len = <5>;
vsync-len = <1>;
hsync-active = <1>;
vsync-active = <1>;
};
};
};
};
nand0: nand@40000000 { nand0: nand@40000000 {
nand-bus-width = <8>; nand-bus-width = <8>;
nand-ecc-mode = "soft"; nand-ecc-mode = "soft";
...@@ -101,6 +132,43 @@ &pinctrl_usart0_rts ...@@ -101,6 +132,43 @@ &pinctrl_usart0_rts
status = "okay"; status = "okay";
}; };
adc0: adc@fffd0000 {
pinctrl-names = "default";
pinctrl-0 = <
&pinctrl_adc0_ad0
&pinctrl_adc0_ad1
&pinctrl_adc0_ad2
&pinctrl_adc0_ad3
&pinctrl_adc0_ad4
&pinctrl_adc0_ad5
&pinctrl_adc0_adtrg>;
atmel,adc-ts-wires = <4>;
status = "okay";
};
usb0: gadget@fffd4000 {
atmel,vbus-gpio = <&pioA 8 GPIO_ACTIVE_HIGH>;
status = "okay";
};
spi0: spi@fffcc000 {
status = "okay";
cs-gpios = <&pioA 28 0>, <0>, <0>, <0>;
mtd_dataflash@0 {
compatible = "atmel,at45", "atmel,dataflash";
spi-max-frequency = <15000000>;
reg = <0>;
};
};
pwm0: pwm@fffc8000 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm1_2>,
<&pinctrl_pwm0_pwm2_2>;
};
dbgu: serial@fffff200 { dbgu: serial@fffff200 {
status = "okay"; status = "okay";
}; };
...@@ -126,18 +194,24 @@ watchdog@fffffd40 { ...@@ -126,18 +194,24 @@ watchdog@fffffd40 {
}; };
}; };
leds { pwmleds {
compatible = "gpio-leds"; compatible = "pwm-leds";
ds1 { ds1 {
label = "ds1"; label = "ds1";
gpios = <&pioD 15 GPIO_ACTIVE_LOW>; pwms = <&pwm0 1 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
}; };
ds2 { ds2 {
label = "ds2"; label = "ds2";
gpios = <&pioD 16 GPIO_ACTIVE_LOW>; pwms = <&pwm0 2 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
}; };
};
leds {
compatible = "gpio-leds";
ds3 { ds3 {
label = "ds3"; label = "ds3";
...@@ -163,4 +237,12 @@ left_click { ...@@ -163,4 +237,12 @@ left_click {
gpio-key,wakeup; gpio-key,wakeup;
}; };
}; };
i2c@0 {
status = "okay";
};
i2c@1 {
status = "okay";
};
}; };
This diff is collapsed.
/*
* at91sam9x5_macb0.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1
* Ethernet interface.
*
* Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
*
* Licensed under GPLv2.
*/
#include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ {
ahb {
apb {
pmc: pmc@fffffc00 {
periphck {
can0_clk: can0_clk {
#clock-cells = <0>;
reg = <29>;
};
can1_clk: can1_clk {
#clock-cells = <0>;
reg = <30>;
};
};
};
};
};
};
/*
* at91sam9x5_isi.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an
* Image Sensor Interface.
*
* Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
*
* Licensed under GPLv2.
*/
#include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ {
ahb {
apb {
pmc: pmc@fffffc00 {
periphck {
isi_clk: isi_clk {
#clock-cells = <0>;
reg = <25>;
};
};
};
};
};
};
/*
* at91sam9x5_lcd.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an
* LCD controller.
*
* Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
*
* Licensed under GPLv2.
*/
#include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ {
ahb {
apb {
pmc: pmc@fffffc00 {
periphck {
lcdc_clk: lcdc_clk {
#clock-cells = <0>;
reg = <25>;
};
};
};
};
};
};
...@@ -43,12 +43,23 @@ AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */ ...@@ -43,12 +43,23 @@ AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */
}; };
}; };
pmc: pmc@fffffc00 {
periphck {
macb0_clk: macb0_clk {
#clock-cells = <0>;
reg = <24>;
};
};
};
macb0: ethernet@f802c000 { macb0: ethernet@f802c000 {
compatible = "cdns,at32ap7000-macb", "cdns,macb"; compatible = "cdns,at32ap7000-macb", "cdns,macb";
reg = <0xf802c000 0x100>; reg = <0xf802c000 0x100>;
interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_macb0_rmii>; pinctrl-0 = <&pinctrl_macb0_rmii>;
clocks = <&macb0_clk>, <&macb0_clk>;
clock-names = "hclk", "pclk";
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -31,12 +31,23 @@ AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */ ...@@ -31,12 +31,23 @@ AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */
}; };
}; };
pmc: pmc@fffffc00 {
periphck {
macb1_clk: macb1_clk {
#clock-cells = <0>;
reg = <27>;
};
};
};
macb1: ethernet@f8030000 { macb1: ethernet@f8030000 {
compatible = "cdns,at32ap7000-macb", "cdns,macb"; compatible = "cdns,at32ap7000-macb", "cdns,macb";
reg = <0xf8030000 0x100>; reg = <0xf8030000 0x100>;
interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_macb1_rmii>; pinctrl-0 = <&pinctrl_macb1_rmii>;
clocks = <&macb1_clk>, <&macb1_clk>;
clock-names = "hclk", "pclk";
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -42,12 +42,23 @@ pinctrl_usart3_sck: usart3_sck-0 { ...@@ -42,12 +42,23 @@ pinctrl_usart3_sck: usart3_sck-0 {
}; };
}; };
pmc: pmc@fffffc00 {
periphck {
usart3_clk: usart3_clk {
#clock-cells = <0>;
reg = <8>;
};
};
};
usart3: serial@f8028000 { usart3: serial@f8028000 {
compatible = "atmel,at91sam9260-usart"; compatible = "atmel,at91sam9260-usart";
reg = <0xf8028000 0x200>; reg = <0xf8028000 0x200>;
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart3>; pinctrl-0 = <&pinctrl_usart3>;
clocks = <&usart3_clk>;
clock-names = "usart";
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -23,6 +23,14 @@ main_clock: clock@0 { ...@@ -23,6 +23,14 @@ main_clock: clock@0 {
}; };
}; };
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <12000000>;
};
ahb { ahb {
apb { apb {
pinctrl@fffff400 { pinctrl@fffff400 {
......
...@@ -39,6 +39,11 @@ cpu@0 { ...@@ -39,6 +39,11 @@ cpu@0 {
}; };
}; };
arm-pmu {
compatible = "arm,cortex-a9-pmu";
interrupts = <29>;
};
axi { axi {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -167,6 +172,7 @@ dspif@a8000000 { ...@@ -167,6 +172,7 @@ dspif@a8000000 {
compatible = "sirf,prima2-dspif"; compatible = "sirf,prima2-dspif";
reg = <0xa8000000 0x10000>; reg = <0xa8000000 0x10000>;
interrupts = <9>; interrupts = <9>;
resets = <&rstc 1>;
}; };
gps@a8010000 { gps@a8010000 {
...@@ -174,6 +180,7 @@ gps@a8010000 { ...@@ -174,6 +180,7 @@ gps@a8010000 {
reg = <0xa8010000 0x10000>; reg = <0xa8010000 0x10000>;
interrupts = <7>; interrupts = <7>;
clocks = <&clks 9>; clocks = <&clks 9>;
resets = <&rstc 2>;
}; };
dsp@a9000000 { dsp@a9000000 {
...@@ -181,6 +188,7 @@ dsp@a9000000 { ...@@ -181,6 +188,7 @@ dsp@a9000000 {
reg = <0xa9000000 0x1000000>; reg = <0xa9000000 0x1000000>;
interrupts = <8>; interrupts = <8>;
clocks = <&clks 8>; clocks = <&clks 8>;
resets = <&rstc 0>;
}; };
}; };
...@@ -298,9 +306,9 @@ spi0: spi@b00d0000 { ...@@ -298,9 +306,9 @@ spi0: spi@b00d0000 {
reg = <0xb00d0000 0x10000>; reg = <0xb00d0000 0x10000>;
interrupts = <15>; interrupts = <15>;
sirf,spi-num-chipselects = <1>; sirf,spi-num-chipselects = <1>;
cs-gpios = <&gpio 0 0>; dmas = <&dmac1 9>,
sirf,spi-dma-rx-channel = <25>; <&dmac1 4>;
sirf,spi-dma-tx-channel = <20>; dma-names = "rx", "tx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&clks 19>; clocks = <&clks 19>;
...@@ -313,8 +321,9 @@ spi1: spi@b0170000 { ...@@ -313,8 +321,9 @@ spi1: spi@b0170000 {
reg = <0xb0170000 0x10000>; reg = <0xb0170000 0x10000>;
interrupts = <16>; interrupts = <16>;
sirf,spi-num-chipselects = <1>; sirf,spi-num-chipselects = <1>;
sirf,spi-dma-rx-channel = <12>; dmas = <&dmac0 12>,
sirf,spi-dma-tx-channel = <13>; <&dmac0 13>;
dma-names = "rx", "tx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&clks 20>; clocks = <&clks 20>;
...@@ -555,6 +564,18 @@ usp0 { ...@@ -555,6 +564,18 @@ usp0 {
sirf,function = "usp0_uart_nostreamctrl"; sirf,function = "usp0_uart_nostreamctrl";
}; };
}; };
usp0_only_utfs_pins_a: usp0@2 {
usp0 {
sirf,pins = "usp0_only_utfs_grp";
sirf,function = "usp0_only_utfs";
};
};
usp0_only_urfs_pins_a: usp0@3 {
usp0 {
sirf,pins = "usp0_only_urfs_grp";
sirf,function = "usp0_only_urfs";
};
};
usp1_pins_a: usp1@0 { usp1_pins_a: usp1@0 {
usp1 { usp1 {
sirf,pins = "usp1grp"; sirf,pins = "usp1grp";
......
...@@ -193,6 +193,14 @@ i2c@3500d000 { ...@@ -193,6 +193,14 @@ i2c@3500d000 {
status = "disabled"; status = "disabled";
}; };
pwm: pwm@3e01a000 {
compatible = "brcm,bcm11351-pwm", "brcm,kona-pwm";
reg = <0x3e01a000 0xcc>;
clocks = <&slave_ccu BCM281XX_SLAVE_CCU_PWM>;
#pwm-cells = <3>;
status = "disabled";
};
clocks { clocks {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -69,6 +69,10 @@ sdio4: sdio@3f1b0000 { ...@@ -69,6 +69,10 @@ sdio4: sdio@3f1b0000 {
status = "okay"; status = "okay";
}; };
pwm: pwm@3e01a000 {
status = "okay";
};
usbotg: usb@3f120000 { usbotg: usb@3f120000 {
vusb_d-supply = <&usbldo_reg>; vusb_d-supply = <&usbldo_reg>;
vusb_a-supply = <&iosr1_reg>; vusb_a-supply = <&iosr1_reg>;
......
...@@ -70,5 +70,26 @@ sdsr2_reg: sdsr2 { ...@@ -70,5 +70,26 @@ sdsr2_reg: sdsr2 {
vsr_reg: vsr { vsr_reg: vsr {
}; };
gpldo1_reg: gpldo1 {
};
gpldo2_reg: gpldo2 {
};
gpldo3_reg: gpldo3 {
};
gpldo4_reg: gpldo4 {
};
gpldo5_reg: gpldo5 {
};
gpldo6_reg: gpldo6 {
};
vbus_reg: vbus {
};
}; };
}; };
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/clock/berlin2.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
...@@ -37,24 +38,10 @@ cpu@1 { ...@@ -37,24 +38,10 @@ cpu@1 {
}; };
}; };
clocks { refclk: oscillator {
smclk: sysmgr-clock { compatible = "fixed-clock";
compatible = "fixed-clock"; #clock-cells = <0>;
#clock-cells = <0>; clock-frequency = <25000000>;
clock-frequency = <25000000>;
};
cfgclk: cfg-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <100000000>;
};
sysclk: system-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <400000000>;
};
}; };
soc { soc {
...@@ -72,6 +59,11 @@ l2: l2-cache-controller@ac0000 { ...@@ -72,6 +59,11 @@ l2: l2-cache-controller@ac0000 {
cache-level = <2>; cache-level = <2>;
}; };
scu: snoop-control-unit@ad0000 {
compatible = "arm,cortex-a9-scu";
reg = <0xad0000 0x58>;
};
gic: interrupt-controller@ad1000 { gic: interrupt-controller@ad1000 {
compatible = "arm,cortex-a9-gic"; compatible = "arm,cortex-a9-gic";
reg = <0xad1000 0x1000>, <0xad0100 0x0100>; reg = <0xad1000 0x1000>, <0xad0100 0x0100>;
...@@ -83,7 +75,7 @@ local-timer@ad0600 { ...@@ -83,7 +75,7 @@ local-timer@ad0600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xad0600 0x20>; reg = <0xad0600 0x20>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sysclk>; clocks = <&chip CLKID_TWD>;
}; };
apb@e80000 { apb@e80000 {
...@@ -94,11 +86,83 @@ apb@e80000 { ...@@ -94,11 +86,83 @@ apb@e80000 {
ranges = <0 0xe80000 0x10000>; ranges = <0 0xe80000 0x10000>;
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
gpio0: gpio@0400 {
compatible = "snps,dw-apb-gpio";
reg = <0x0400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porta: gpio-port@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0>;
};
};
gpio1: gpio@0800 {
compatible = "snps,dw-apb-gpio";
reg = <0x0800 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portb: gpio-port@1 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <1>;
};
};
gpio2: gpio@0c00 {
compatible = "snps,dw-apb-gpio";
reg = <0x0c00 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portc: gpio-port@2 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <2>;
};
};
gpio3: gpio@1000 {
compatible = "snps,dw-apb-gpio";
reg = <0x1000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portd: gpio-port@3 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <3>;
};
};
timer0: timer@2c00 { timer0: timer@2c00 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c00 0x14>; reg = <0x2c00 0x14>;
interrupts = <8>; interrupts = <8>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "okay"; status = "okay";
}; };
...@@ -107,7 +171,7 @@ timer1: timer@2c14 { ...@@ -107,7 +171,7 @@ timer1: timer@2c14 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c14 0x14>; reg = <0x2c14 0x14>;
interrupts = <9>; interrupts = <9>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "okay"; status = "okay";
}; };
...@@ -116,7 +180,7 @@ timer2: timer@2c28 { ...@@ -116,7 +180,7 @@ timer2: timer@2c28 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c28 0x14>; reg = <0x2c28 0x14>;
interrupts = <10>; interrupts = <10>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -125,7 +189,7 @@ timer3: timer@2c3c { ...@@ -125,7 +189,7 @@ timer3: timer@2c3c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c3c 0x14>; reg = <0x2c3c 0x14>;
interrupts = <11>; interrupts = <11>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -134,7 +198,7 @@ timer4: timer@2c50 { ...@@ -134,7 +198,7 @@ timer4: timer@2c50 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c50 0x14>; reg = <0x2c50 0x14>;
interrupts = <12>; interrupts = <12>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -143,7 +207,7 @@ timer5: timer@2c64 { ...@@ -143,7 +207,7 @@ timer5: timer@2c64 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c64 0x14>; reg = <0x2c64 0x14>;
interrupts = <13>; interrupts = <13>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -152,7 +216,7 @@ timer6: timer@2c78 { ...@@ -152,7 +216,7 @@ timer6: timer@2c78 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c78 0x14>; reg = <0x2c78 0x14>;
interrupts = <14>; interrupts = <14>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -161,7 +225,7 @@ timer7: timer@2c8c { ...@@ -161,7 +225,7 @@ timer7: timer@2c8c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c8c 0x14>; reg = <0x2c8c 0x14>;
interrupts = <15>; interrupts = <15>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -176,6 +240,14 @@ aic: interrupt-controller@3000 { ...@@ -176,6 +240,14 @@ aic: interrupt-controller@3000 {
}; };
}; };
chip: chip-control@ea0000 {
compatible = "marvell,berlin2-chip-ctrl";
#clock-cells = <1>;
reg = <0xea0000 0x400>;
clocks = <&refclk>;
clock-names = "refclk";
};
apb@fc0000 { apb@fc0000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -184,13 +256,48 @@ apb@fc0000 { ...@@ -184,13 +256,48 @@ apb@fc0000 {
ranges = <0 0xfc0000 0x10000>; ranges = <0 0xfc0000 0x10000>;
interrupt-parent = <&sic>; interrupt-parent = <&sic>;
sm_gpio1: gpio@5000 {
compatible = "snps,dw-apb-gpio";
reg = <0x5000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portf: gpio-port@5 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
};
};
sm_gpio0: gpio@c000 {
compatible = "snps,dw-apb-gpio";
reg = <0xc000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porte: gpio-port@4 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <11>;
};
};
uart0: serial@9000 { uart0: serial@9000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x9000 0x100>; reg = <0x9000 0x100>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <1>; reg-io-width = <1>;
interrupts = <8>; interrupts = <8>;
clocks = <&smclk>; clocks = <&refclk>;
pinctrl-0 = <&uart0_pmux>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
...@@ -200,7 +307,9 @@ uart1: serial@a000 { ...@@ -200,7 +307,9 @@ uart1: serial@a000 {
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <1>; reg-io-width = <1>;
interrupts = <9>; interrupts = <9>;
clocks = <&smclk>; clocks = <&refclk>;
pinctrl-0 = <&uart1_pmux>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
...@@ -210,10 +319,32 @@ uart2: serial@b000 { ...@@ -210,10 +319,32 @@ uart2: serial@b000 {
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <1>; reg-io-width = <1>;
interrupts = <10>; interrupts = <10>;
clocks = <&smclk>; clocks = <&refclk>;
pinctrl-0 = <&uart2_pmux>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
sysctrl: system-controller@d000 {
compatible = "marvell,berlin2-system-ctrl";
reg = <0xd000 0x100>;
uart0_pmux: uart0-pmux {
groups = "GSM4";
function = "uart0";
};
uart1_pmux: uart1-pmux {
groups = "GSM5";
function = "uart1";
};
uart2_pmux: uart2-pmux {
groups = "GSM3";
function = "uart2";
};
};
sic: interrupt-controller@e000 { sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl"; compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x400>; reg = <0xe000 0x400>;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/clock/berlin2.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
...@@ -30,24 +31,10 @@ cpu@0 { ...@@ -30,24 +31,10 @@ cpu@0 {
}; };
}; };
clocks { refclk: oscillator {
smclk: sysmgr-clock { compatible = "fixed-clock";
compatible = "fixed-clock"; #clock-cells = <0>;
#clock-cells = <0>; clock-frequency = <25000000>;
clock-frequency = <25000000>;
};
cfgclk: cfg-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <75000000>;
};
sysclk: system-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <300000000>;
};
}; };
soc { soc {
...@@ -76,7 +63,7 @@ local-timer@ad0600 { ...@@ -76,7 +63,7 @@ local-timer@ad0600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xad0600 0x20>; reg = <0xad0600 0x20>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sysclk>; clocks = <&chip CLKID_TWD>;
}; };
apb@e80000 { apb@e80000 {
...@@ -87,11 +74,83 @@ apb@e80000 { ...@@ -87,11 +74,83 @@ apb@e80000 {
ranges = <0 0xe80000 0x10000>; ranges = <0 0xe80000 0x10000>;
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
gpio0: gpio@0400 {
compatible = "snps,dw-apb-gpio";
reg = <0x0400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porta: gpio-port@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0>;
};
};
gpio1: gpio@0800 {
compatible = "snps,dw-apb-gpio";
reg = <0x0800 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portb: gpio-port@1 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <1>;
};
};
gpio2: gpio@0c00 {
compatible = "snps,dw-apb-gpio";
reg = <0x0c00 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portc: gpio-port@2 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <2>;
};
};
gpio3: gpio@1000 {
compatible = "snps,dw-apb-gpio";
reg = <0x1000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portd: gpio-port@3 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <3>;
};
};
timer0: timer@2c00 { timer0: timer@2c00 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c00 0x14>; reg = <0x2c00 0x14>;
interrupts = <8>; interrupts = <8>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "okay"; status = "okay";
}; };
...@@ -100,7 +159,7 @@ timer1: timer@2c14 { ...@@ -100,7 +159,7 @@ timer1: timer@2c14 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c14 0x14>; reg = <0x2c14 0x14>;
interrupts = <9>; interrupts = <9>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "okay"; status = "okay";
}; };
...@@ -109,7 +168,7 @@ timer2: timer@2c28 { ...@@ -109,7 +168,7 @@ timer2: timer@2c28 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c28 0x14>; reg = <0x2c28 0x14>;
interrupts = <10>; interrupts = <10>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -118,7 +177,7 @@ timer3: timer@2c3c { ...@@ -118,7 +177,7 @@ timer3: timer@2c3c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c3c 0x14>; reg = <0x2c3c 0x14>;
interrupts = <11>; interrupts = <11>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -127,7 +186,7 @@ timer4: timer@2c50 { ...@@ -127,7 +186,7 @@ timer4: timer@2c50 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c50 0x14>; reg = <0x2c50 0x14>;
interrupts = <12>; interrupts = <12>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -136,7 +195,7 @@ timer5: timer@2c64 { ...@@ -136,7 +195,7 @@ timer5: timer@2c64 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c64 0x14>; reg = <0x2c64 0x14>;
interrupts = <13>; interrupts = <13>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -145,7 +204,7 @@ timer6: timer@2c78 { ...@@ -145,7 +204,7 @@ timer6: timer@2c78 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c78 0x14>; reg = <0x2c78 0x14>;
interrupts = <14>; interrupts = <14>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -154,7 +213,7 @@ timer7: timer@2c8c { ...@@ -154,7 +213,7 @@ timer7: timer@2c8c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c8c 0x14>; reg = <0x2c8c 0x14>;
interrupts = <15>; interrupts = <15>;
clocks = <&cfgclk>; clocks = <&chip CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -169,6 +228,19 @@ aic: interrupt-controller@3000 { ...@@ -169,6 +228,19 @@ aic: interrupt-controller@3000 {
}; };
}; };
chip: chip-control@ea0000 {
compatible = "marvell,berlin2cd-chip-ctrl";
#clock-cells = <1>;
reg = <0xea0000 0x400>;
clocks = <&refclk>;
clock-names = "refclk";
uart0_pmux: uart0-pmux {
groups = "G6";
function = "uart0";
};
};
apb@fc0000 { apb@fc0000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -177,13 +249,45 @@ apb@fc0000 { ...@@ -177,13 +249,45 @@ apb@fc0000 {
ranges = <0 0xfc0000 0x10000>; ranges = <0 0xfc0000 0x10000>;
interrupt-parent = <&sic>; interrupt-parent = <&sic>;
sm_gpio1: gpio@5000 {
compatible = "snps,dw-apb-gpio";
reg = <0x5000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
portf: gpio-port@5 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
};
};
sm_gpio0: gpio@c000 {
compatible = "snps,dw-apb-gpio";
reg = <0xc000 0x400>;
#address-cells = <1>;
#size-cells = <0>;
porte: gpio-port@4 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <8>;
reg = <0>;
};
};
uart0: serial@9000 { uart0: serial@9000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x9000 0x100>; reg = <0x9000 0x100>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <1>; reg-io-width = <1>;
interrupts = <8>; interrupts = <8>;
clocks = <&smclk>; clocks = <&refclk>;
pinctrl-0 = <&uart0_pmux>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
...@@ -193,10 +297,15 @@ uart1: serial@a000 { ...@@ -193,10 +297,15 @@ uart1: serial@a000 {
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <1>; reg-io-width = <1>;
interrupts = <9>; interrupts = <9>;
clocks = <&smclk>; clocks = <&refclk>;
status = "disabled"; status = "disabled";
}; };
sysctrl: system-controller@d000 {
compatible = "marvell,berlin2cd-system-ctrl";
reg = <0xd000 0x100>;
};
sic: interrupt-controller@e000 { sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl"; compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x400>; reg = <0xe000 0x400>;
......
/*
* Copyright (C) 2014 Antoine Ténart <antoine.tenart@free-electrons.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
/dts-v1/;
#include "berlin2q.dtsi"
/ {
model = "Marvell BG2-Q DMP";
compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
memory {
device_type = "memory";
reg = <0x00000000 0x80000000>;
};
choosen {
bootargs = "console=ttyS0,115200 earlyprintk";
};
};
&sdhci1 {
broken-cd;
sdhci,wp-inverted;
status = "okay";
};
&sdhci2 {
non-removable;
status = "okay";
};
&uart0 {
status = "okay";
};
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
/dts-v1/;
#include "dra72x.dtsi"
/ {
model = "TI DRA722";
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1024 MB */
};
};
&uart1 {
status = "okay";
};
/*
* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* Based on "omap4.dtsi"
*/
#include "dra7.dtsi"
/ {
compatible = "ti,dra722", "ti,dra72", "ti,dra7";
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
};
};
};
This diff is collapsed.
...@@ -1386,6 +1386,14 @@ l3init_60m_fclk: l3init_60m_fclk { ...@@ -1386,6 +1386,14 @@ l3init_60m_fclk: l3init_60m_fclk {
ti,dividers = <1>, <8>; ti,dividers = <1>, <8>;
}; };
l3init_960m_gfclk: l3init_960m_gfclk {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&dpll_usb_clkdcoldo>;
ti,bit-shift = <8>;
reg = <0x06c0>;
};
dss_32khz_clk: dss_32khz_clk { dss_32khz_clk: dss_32khz_clk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,gate-clock"; compatible = "ti,gate-clock";
...@@ -1533,7 +1541,7 @@ sata_ref_clk: sata_ref_clk { ...@@ -1533,7 +1541,7 @@ sata_ref_clk: sata_ref_clk {
usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m { usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,gate-clock"; compatible = "ti,gate-clock";
clocks = <&dpll_usb_clkdcoldo>; clocks = <&l3init_960m_gfclk>;
ti,bit-shift = <8>; ti,bit-shift = <8>;
reg = <0x13f0>; reg = <0x13f0>;
}; };
...@@ -1541,7 +1549,7 @@ usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m { ...@@ -1541,7 +1549,7 @@ usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m {
usb_otg_ss2_refclk960m: usb_otg_ss2_refclk960m { usb_otg_ss2_refclk960m: usb_otg_ss2_refclk960m {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,gate-clock"; compatible = "ti,gate-clock";
clocks = <&dpll_usb_clkdcoldo>; clocks = <&l3init_960m_gfclk>;
ti,bit-shift = <8>; ti,bit-shift = <8>;
reg = <0x1340>; reg = <0x1340>;
}; };
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment