forked from Minki/linux
00e729c933
These are as usual a very large number of mostly boring updates to enable devices in existing machines, or to fix minor bugs. Notably, an ongoing treewide effort to fix warnings caused by an update to the device tree compiler. These are enabled with "make W=1" at the moment but can hopefully become the default once all issues have been addressed. No new SoC platform is added this time around (Armada 395 and Orion mv88f5181 are slight variations of existing ones), but a significant number of new dts files are added, which I list by platform: - Allwinner: Empire Electronix M712 and iNet d978 Rev2 tablets; Orange Pi PC Plus, Orange Pi 2, Orange Pi Plus 2E, Orange Pi Lite, Olimex A33-Olinuxino, and Nano Pi Neo single-board computers - ARM Realview: all supported machines (ported from board files) - Broadcom: BCM958525er, BCM958522er, BCM988312hr, BCM958623hr and BCM958622hr reference boards for Northstar platform; Raspberry Pi Zero single-board computer - Marvell EBU: Netgear WNR854T router (ported from board file); Armada 395 SoC platform and GP board Armada 390 DB development board - NXP i.MX: imx7s Warp7 reference board; Gateworks Ventana GW553x single-board computer, Technologic Systems TS-4900 and Engicam IMX6UL GEA M6UL computer-on-module, Inverse Path USB armory board - Qualcomm: LG Nexus 5 Phone - Renesas: r8a7792/wheat and r7s72100/rskrza1 development boards - Rockchip: Rockchip RK3288 Fennec reference board; Firefly RK3288 Reload platform - ST Microelectronics STi: B2260 (96boards) single-board computer - TI Davinci: OMAP-L138 LCDK Development kit - TI OMAP: beagleboard-x15 rev B1 single-board computer Conflicts: vendor-prefixes.txt has conflicting additions, keep all of them in alphabetical order. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAV/g11mCrR//JCVInAQIWbw/9FOrBghI2bFqZkDwFE8E3QCpc9bIiETMx FMdHV6FAo0D6Yp4EqlWjFI0u0Kn9l4FKz0SYWAigpfT6gfeI1THC2Kl31mslvb5U v3QreXI4rKjZS/B1lYECee0os+fNvJcWKj3uFjb4VT1k7T6+MytjHGAQSzwxM66Q 0Lp5HjdFGDrOXoIUx2eEZkZlVXyQ2EFocMoAsj+s/MHnA8fn1tWW08633kjTsC6y 9Xj71joghlDKZjA56htaEQ+/6dYdxAHVlvkN7aL9di+2Sc2/ma6my70Zvs4zwtOv uJDhcJhjwvf3QtDuOoGhTnFtQYQWaONaGUFyEwYyy2kIwiJy0afep4JCq2o+/CZM VMvGXepJpVujE9mg+LwHPgaMYgBhswsJzwQ2ZESrMQcUZ624E18dG2/ei5zat4UN 5/NvzxEoDGmfQFQUpuoZuPqhwLRauXr7I+u4aliIdtSBGeaA2T1yFT4pVgNUOxBQ 0bMtE2QSUKyaF+xAHLTsV7yheDU0S+C7zVkLPwePK0V7vUFuBsdQiXEqXh/6MSq0 iYVPmKwNTIHK3qMiGtm8XDugjR8Pf0tCXRqIWJMlXs75rCAsKfFW4j4XYnlO4wMy dP2fdoe0xA+zthR0hRHD5i8WCmISeUgtPAdFyTid1jZkMk1AzM0AqBUdAqTInvQ3 O4JSYcjBWoo= =/gg/ -----END PGP SIGNATURE----- Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM DT updates from Arnd Bergmann: "These are as usual a very large number of mostly boring updates to enable devices in existing machines, or to fix minor bugs. Notably, an ongoing treewide effort to fix warnings caused by an update to the device tree compiler. These are enabled with "make W=1" at the moment but can hopefully become the default once all issues have been addressed. No new SoC platform is added this time around (Armada 395 and Orion mv88f5181 are slight variations of existing ones), but a significant number of new dts files are added, which I list by platform: - Allwinner: Empire Electronix M712 and iNet d978 Rev2 tablets, Orange Pi PC Plus, Orange Pi 2, Orange Pi Plus 2E, Orange Pi Lite, Olimex A33-Olinuxino, and Nano Pi Neo single-board computers - ARM Realview: all supported machines (ported from board files) - Broadcom: BCM958525er, BCM958522er, BCM988312hr, BCM958623hr and BCM958622hr reference boards for Northstar platform, Raspberry Pi Zero single-board computer - Marvell EBU: Netgear WNR854T router (ported from board file), Armada 395 SoC platform and GP board Armada 390 DB development board - NXP i.MX: imx7s Warp7 reference board, Gateworks Ventana GW553x single-board computer, Technologic Systems TS-4900 and Engicam IMX6UL GEA M6UL computer-on-module, Inverse Path USB armory board - Qualcomm: LG Nexus 5 Phone - Renesas: r8a7792/wheat and r7s72100/rskrza1 development boards - Rockchip: Rockchip RK3288 Fennec reference board, Firefly RK3288 Reload platform - ST Microelectronics STi: B2260 (96boards) single-board computer - TI Davinci: OMAP-L138 LCDK Development kit - TI OMAP: beagleboard-x15 rev B1 single-board computer" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (390 commits) ARM: dts: sony-nsz-gs7: add missing unit name to /memory node ARM: dts: chromecast: add missing unit name to /memory node ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node ARM: dts: berlin2: Add missing unit name to /soc node ARM: dts: berlin2cd: Add missing unit name to /soc node ARM: dts: berlin2q: Add missing unit name to /soc node ARM: dts: berlin2: Remove skeleton.dtsi inclusion ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion ARM: dts: berlin2q: Remove skeleton.dtsi inclusion arm: dts: berlin2q: enable all wdt nodes unconditionally arm: dts: berlin2: enable all wdt nodes unconditionally ARM: dts: omap5-igep0050.dts: Use tabs for indentation ARM: dts: Fix igepv5 power button GPIO direction ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node ARM: dts: s3c64xx: Use macros for pinctrl configuration ARM: dts: s3c2416: Use macros for pinctrl configuration ARM: dts: s5pv210: Use macros for pinctrl configuration ARM: dts: s3c64xx: Use common macros for pinctrl configuration ...
264 lines
7.2 KiB
Plaintext
264 lines
7.2 KiB
Plaintext
/*
|
|
* Copyright (C) 2014 STMicroelectronics Limited.
|
|
* Author: Peter Griffin <peter.griffin@linaro.org>
|
|
*
|
|
* 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
|
|
* publishhed by the Free Software Foundation.
|
|
*/
|
|
#include "stih410-clock.dtsi"
|
|
#include "stih407-family.dtsi"
|
|
#include "stih410-pinctrl.dtsi"
|
|
/ {
|
|
aliases {
|
|
bdisp0 = &bdisp0;
|
|
};
|
|
|
|
soc {
|
|
usb2_picophy1: phy2 {
|
|
compatible = "st,stih407-usb2-phy";
|
|
#phy-cells = <0>;
|
|
st,syscfg = <&syscfg_core 0xf8 0xf4>;
|
|
resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
|
|
<&picophyreset STIH407_PICOPHY0_RESET>;
|
|
reset-names = "global", "port";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
usb2_picophy2: phy3 {
|
|
compatible = "st,stih407-usb2-phy";
|
|
#phy-cells = <0>;
|
|
st,syscfg = <&syscfg_core 0xfc 0xf4>;
|
|
resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
|
|
<&picophyreset STIH407_PICOPHY1_RESET>;
|
|
reset-names = "global", "port";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
ohci0: usb@9a03c00 {
|
|
compatible = "st,st-ohci-300x";
|
|
reg = <0x9a03c00 0x100>;
|
|
interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
|
|
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
|
|
<&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
|
|
resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
|
|
<&softreset STIH407_USB2_PORT0_SOFTRESET>;
|
|
reset-names = "power", "softreset";
|
|
phys = <&usb2_picophy1>;
|
|
phy-names = "usb";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
ehci0: usb@9a03e00 {
|
|
compatible = "st,st-ehci-300x";
|
|
reg = <0x9a03e00 0x100>;
|
|
interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usb0>;
|
|
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
|
|
<&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
|
|
resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
|
|
<&softreset STIH407_USB2_PORT0_SOFTRESET>;
|
|
reset-names = "power", "softreset";
|
|
phys = <&usb2_picophy1>;
|
|
phy-names = "usb";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
ohci1: usb@9a83c00 {
|
|
compatible = "st,st-ohci-300x";
|
|
reg = <0x9a83c00 0x100>;
|
|
interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
|
|
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
|
|
<&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
|
|
resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
|
|
<&softreset STIH407_USB2_PORT1_SOFTRESET>;
|
|
reset-names = "power", "softreset";
|
|
phys = <&usb2_picophy2>;
|
|
phy-names = "usb";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
ehci1: usb@9a83e00 {
|
|
compatible = "st,st-ehci-300x";
|
|
reg = <0x9a83e00 0x100>;
|
|
interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usb1>;
|
|
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
|
|
<&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
|
|
resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
|
|
<&softreset STIH407_USB2_PORT1_SOFTRESET>;
|
|
reset-names = "power", "softreset";
|
|
phys = <&usb2_picophy2>;
|
|
phy-names = "usb";
|
|
|
|
status = "disabled";
|
|
};
|
|
|
|
sti-display-subsystem {
|
|
compatible = "st,sti-display-subsystem";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
assigned-clocks = <&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 1>,
|
|
<&clk_s_c0_pll1 0>,
|
|
<&clk_s_c0_flexgen CLK_COMPO_DVP>,
|
|
<&clk_s_c0_flexgen CLK_MAIN_DISP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP1>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP2>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP3>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP4>;
|
|
|
|
assigned-clock-parents = <0>,
|
|
<0>,
|
|
<0>,
|
|
<&clk_s_c0_pll1 0>,
|
|
<&clk_s_c0_pll1 0>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 1>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 0>;
|
|
|
|
assigned-clock-rates = <297000000>,
|
|
<108000000>,
|
|
<0>,
|
|
<400000000>,
|
|
<400000000>;
|
|
|
|
ranges;
|
|
|
|
sti-compositor@9d11000 {
|
|
compatible = "st,stih407-compositor";
|
|
reg = <0x9d11000 0x1000>;
|
|
|
|
clock-names = "compo_main",
|
|
"compo_aux",
|
|
"pix_main",
|
|
"pix_aux",
|
|
"pix_gdp1",
|
|
"pix_gdp2",
|
|
"pix_gdp3",
|
|
"pix_gdp4",
|
|
"main_parent",
|
|
"aux_parent";
|
|
|
|
clocks = <&clk_s_c0_flexgen CLK_COMPO_DVP>,
|
|
<&clk_s_c0_flexgen CLK_COMPO_DVP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP1>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP2>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP3>,
|
|
<&clk_s_d2_flexgen CLK_PIX_GDP4>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 1>;
|
|
|
|
reset-names = "compo-main", "compo-aux";
|
|
resets = <&softreset STIH407_COMPO_SOFTRESET>,
|
|
<&softreset STIH407_COMPO_SOFTRESET>;
|
|
st,vtg = <&vtg_main>, <&vtg_aux>;
|
|
};
|
|
|
|
sti-tvout@8d08000 {
|
|
compatible = "st,stih407-tvout";
|
|
reg = <0x8d08000 0x1000>;
|
|
reg-names = "tvout-reg";
|
|
reset-names = "tvout";
|
|
resets = <&softreset STIH407_HDTVOUT_SOFTRESET>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
assigned-clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,
|
|
<&clk_s_d2_flexgen CLK_TMDS_HDMI>,
|
|
<&clk_s_d2_flexgen CLK_REF_HDMIPHY>,
|
|
<&clk_s_d0_flexgen CLK_PCM_0>,
|
|
<&clk_s_d2_flexgen CLK_PIX_HDDAC>,
|
|
<&clk_s_d2_flexgen CLK_HDDAC>;
|
|
|
|
assigned-clock-parents = <&clk_s_d2_quadfs 0>,
|
|
<&clk_tmdsout_hdmi>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d0_quadfs 0>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 0>;
|
|
};
|
|
|
|
sti-hdmi@8d04000 {
|
|
compatible = "st,stih407-hdmi";
|
|
reg = <0x8d04000 0x1000>;
|
|
reg-names = "hdmi-reg";
|
|
interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
|
|
interrupt-names = "irq";
|
|
clock-names = "pix",
|
|
"tmds",
|
|
"phy",
|
|
"audio",
|
|
"main_parent",
|
|
"aux_parent";
|
|
|
|
clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,
|
|
<&clk_s_d2_flexgen CLK_TMDS_HDMI>,
|
|
<&clk_s_d2_flexgen CLK_REF_HDMIPHY>,
|
|
<&clk_s_d0_flexgen CLK_PCM_0>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 1>;
|
|
|
|
hdmi,hpd-gpio = <&pio5 3>;
|
|
reset-names = "hdmi";
|
|
resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>;
|
|
ddc = <&hdmiddc>;
|
|
};
|
|
|
|
sti-hda@8d02000 {
|
|
compatible = "st,stih407-hda";
|
|
reg = <0x8d02000 0x400>, <0x92b0120 0x4>;
|
|
reg-names = "hda-reg", "video-dacs-ctrl";
|
|
clock-names = "pix",
|
|
"hddac",
|
|
"main_parent",
|
|
"aux_parent";
|
|
clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>,
|
|
<&clk_s_d2_flexgen CLK_HDDAC>,
|
|
<&clk_s_d2_quadfs 0>,
|
|
<&clk_s_d2_quadfs 1>;
|
|
};
|
|
};
|
|
|
|
bdisp0:bdisp@9f10000 {
|
|
compatible = "st,stih407-bdisp";
|
|
reg = <0x9f10000 0x1000>;
|
|
interrupts = <GIC_SPI 38 IRQ_TYPE_NONE>;
|
|
clock-names = "bdisp";
|
|
clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>;
|
|
};
|
|
|
|
hva@8c85000 {
|
|
compatible = "st,st-hva";
|
|
reg = <0x8c85000 0x400>, <0x6000000 0x40000>;
|
|
reg-names = "hva_registers", "hva_esram";
|
|
interrupts = <GIC_SPI 58 IRQ_TYPE_NONE>,
|
|
<GIC_SPI 59 IRQ_TYPE_NONE>;
|
|
clock-names = "clk_hva";
|
|
clocks = <&clk_s_c0_flexgen CLK_HVA>;
|
|
};
|
|
|
|
thermal@91a0000 {
|
|
compatible = "st,stih407-thermal";
|
|
reg = <0x91a0000 0x28>;
|
|
clock-names = "thermal";
|
|
clocks = <&clk_sysin>;
|
|
interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
|
|
};
|
|
};
|
|
};
|