mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-03 21:36:41 +07:00
ee1a8d402e
These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once. There are a few conflicts with the other branches unfortunately: * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added from multiple branches. Need to be careful to have the right set of closing braces as git gets this one wrong. * In kirkwood.dtsi, one 'ranges' line got split into two lines, while another line got added. Order of the lines does not matter. * in sama5d3.dtsi, some cleanup was merged the wrong way, causing a bogus conflict. We want the 'dmas' and 'dma-names' properties to get added here. * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1 Bgy9PnJTNo8= =8PtJ -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device tree changes from Arnd Bergmann: "These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits) ARM: at91: dt: rm9200ek: add spi support ARM: at91: dt: rm9200: add spi support ARM: at91/DT: at91sam9n12: add SPI DMA client infos ARM: at91/DT: sama5d3: add SPI DMA client infos ARM: at91/DT: fix SPI compatibility string ARM: Kirkwood: Fix the internal register ranges translation ARM: dts: bcm281xx: change comment to C89 style ARM: mmc: bcm281xx SDHCI driver (dt mods) ARM: nomadik: add the new clocks to the device tree clk: nomadik: implement the Nomadik clocks properly ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency ARM: dts: omap4-panda: Fix DVI EDID reads ARM: dts: omap4-panda: Add USB Host support arm: mvebu: enable mini-PCIe connectors on Armada 370 RD ARM: shmobile: irqpin: add a DT property to enable masking on parent ARM: dts: AM43x EPOS EVM support ARM: dts: OMAP5: Add bandgap DT entry ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone ...
179 lines
3.3 KiB
Plaintext
179 lines
3.3 KiB
Plaintext
/dts-v1/;
|
|
|
|
/include/ "kirkwood.dtsi"
|
|
/include/ "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
model = "Iomega Iconnect";
|
|
compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x10000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
linux,initrd-start = <0x4500040>;
|
|
linux,initrd-end = <0x4800000>;
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_button_reset: pmx-button-reset {
|
|
marvell,pins = "mpp12";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_button_otb: pmx-button-otb {
|
|
marvell,pins = "mpp35";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_level: pmx-led-level {
|
|
marvell,pins = "mpp41";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_power_blue: pmx-led-power-blue {
|
|
marvell,pins = "mpp42";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_power_red: pmx-power-red {
|
|
marvell,pins = "mpp43";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_usb1: pmx-led-usb1 {
|
|
marvell,pins = "mpp44";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_usb2: pmx-led-usb2 {
|
|
marvell,pins = "mpp45";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_usb3: pmx-led-usb3 {
|
|
marvell,pins = "mpp46";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_usb4: pmx-led-usb4 {
|
|
marvell,pins = "mpp47";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_otb: pmx-led-otb {
|
|
marvell,pins = "mpp48";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
lm63: lm63@4c {
|
|
compatible = "national,lm63";
|
|
reg = <0x4c>;
|
|
};
|
|
};
|
|
serial@12000 {
|
|
status = "ok";
|
|
};
|
|
|
|
nand@3000000 {
|
|
status = "okay";
|
|
|
|
partition@0 {
|
|
label = "uboot";
|
|
reg = <0x0000000 0xc0000>;
|
|
};
|
|
|
|
partition@a0000 {
|
|
label = "env";
|
|
reg = <0xa0000 0x20000>;
|
|
};
|
|
|
|
partition@100000 {
|
|
label = "zImage";
|
|
reg = <0x100000 0x300000>;
|
|
};
|
|
|
|
partition@540000 {
|
|
label = "initrd";
|
|
reg = <0x540000 0x300000>;
|
|
};
|
|
|
|
partition@980000 {
|
|
label = "boot";
|
|
reg = <0x980000 0x1f400000>;
|
|
};
|
|
};
|
|
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = < &pmx_led_level &pmx_led_power_blue
|
|
&pmx_led_power_red &pmx_led_usb1
|
|
&pmx_led_usb2 &pmx_led_usb3
|
|
&pmx_led_usb4 &pmx_led_otb >;
|
|
pinctrl-names = "default";
|
|
|
|
led-level {
|
|
label = "led_level";
|
|
gpios = <&gpio1 9 0>;
|
|
linux,default-trigger = "default-on";
|
|
};
|
|
power-blue {
|
|
label = "power:blue";
|
|
gpios = <&gpio1 10 0>;
|
|
linux,default-trigger = "timer";
|
|
};
|
|
power-red {
|
|
label = "power:red";
|
|
gpios = <&gpio1 11 0>;
|
|
};
|
|
usb1 {
|
|
label = "usb1:blue";
|
|
gpios = <&gpio1 12 0>;
|
|
};
|
|
usb2 {
|
|
label = "usb2:blue";
|
|
gpios = <&gpio1 13 0>;
|
|
};
|
|
usb3 {
|
|
label = "usb3:blue";
|
|
gpios = <&gpio1 14 0>;
|
|
};
|
|
usb4 {
|
|
label = "usb4:blue";
|
|
gpios = <&gpio1 15 0>;
|
|
};
|
|
otb {
|
|
label = "otb:blue";
|
|
gpios = <&gpio1 16 0>;
|
|
};
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
|
|
pinctrl-names = "default";
|
|
|
|
button@1 {
|
|
label = "OTB Button";
|
|
linux,code = <133>;
|
|
gpios = <&gpio1 3 1>;
|
|
debounce-interval = <100>;
|
|
};
|
|
button@2 {
|
|
label = "Reset";
|
|
linux,code = <0x198>;
|
|
gpios = <&gpio0 12 1>;
|
|
debounce-interval = <100>;
|
|
};
|
|
};
|
|
};
|