mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08: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 ...
187 lines
4.1 KiB
Plaintext
187 lines
4.1 KiB
Plaintext
/dts-v1/;
|
|
|
|
/include/ "kirkwood.dtsi"
|
|
/include/ "kirkwood-6282.dtsi"
|
|
|
|
/ {
|
|
model = "NETGEAR ReadyNAS Duo v2";
|
|
compatible = "netgear,readynas-duo-v2", "netgear,readynas", "marvell,kirkwood-88f6282", "marvell,kirkwood";
|
|
|
|
memory { /* 256 MB */
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x10000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_button_power: pmx-button-power {
|
|
marvell,pins = "mpp47";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_button_backup: pmx-button-backup {
|
|
marvell,pins = "mpp45";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_button_reset: pmx-button-reset {
|
|
marvell,pins = "mpp13";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_blue_power: pmx-led-blue-power {
|
|
marvell,pins = "mpp31";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_blue_activity: pmx-led-blue-activity {
|
|
marvell,pins = "mpp38";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_blue_disk1: pmx-led-blue-disk1 {
|
|
marvell,pins = "mpp23";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_blue_disk2: pmx-led-blue-disk2 {
|
|
marvell,pins = "mpp22";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_blue_backup: pmx-led-blue-backup {
|
|
marvell,pins = "mpp29";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
rs5c372a: rs5c372a@32 {
|
|
compatible = "ricoh,rs5c372a";
|
|
reg = <0x32>;
|
|
};
|
|
};
|
|
|
|
serial@12000 {
|
|
pinctrl-0 = <&pmx_uart0>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
};
|
|
|
|
nand@3000000 {
|
|
status = "okay";
|
|
|
|
partition@0 {
|
|
label = "u-boot";
|
|
reg = <0x0000000 0x180000>;
|
|
read-only;
|
|
};
|
|
|
|
partition@180000 {
|
|
label = "u-boot-env";
|
|
reg = <0x180000 0x20000>;
|
|
};
|
|
|
|
partition@200000 {
|
|
label = "uImage";
|
|
reg = <0x0200000 0x600000>;
|
|
};
|
|
|
|
partition@800000 {
|
|
label = "minirootfs";
|
|
reg = <0x0800000 0x1000000>;
|
|
};
|
|
|
|
partition@1800000 {
|
|
label = "jffs2";
|
|
reg = <0x1800000 0x6800000>;
|
|
};
|
|
};
|
|
|
|
sata@80000 {
|
|
status = "okay";
|
|
nr-ports = <2>;
|
|
};
|
|
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = < &pmx_led_blue_power &pmx_led_blue_activity
|
|
&pmx_led_blue_disk1 &pmx_led_blue_disk2
|
|
&pmx_led_blue_backup >;
|
|
pinctrl-names = "default";
|
|
|
|
power_led {
|
|
label = "status:blue:power_led";
|
|
gpios = <&gpio0 31 1>; /* GPIO 31 Active Low */
|
|
linux,default-trigger = "default-on";
|
|
};
|
|
activity_led {
|
|
label = "status:blue:activity_led";
|
|
gpios = <&gpio1 6 1>; /* GPIO 38 Active Low */
|
|
};
|
|
disk1_led {
|
|
label = "status:blue:disk1_led";
|
|
gpios = <&gpio0 23 1>; /* GPIO 23 Active Low */
|
|
};
|
|
disk2_led {
|
|
label = "status:blue:disk2_led";
|
|
gpios = <&gpio0 22 1>; /* GPIO 22 Active Low */
|
|
};
|
|
backup_led {
|
|
label = "status:blue:backup_led";
|
|
gpios = <&gpio0 29 1>; /* GPIO 29 Active Low*/
|
|
};
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_button_power &pmx_button_backup
|
|
&pmx_button_reset>;
|
|
pinctrl-names = "default";
|
|
|
|
button@1 {
|
|
label = "Power Button";
|
|
linux,code = <116>; /* KEY_POWER */
|
|
gpios = <&gpio1 15 1>;
|
|
};
|
|
button@2 {
|
|
label = "Reset Button";
|
|
linux,code = <0x198>; /* KEY_RESTART */
|
|
gpios = <&gpio0 13 1>;
|
|
};
|
|
button@3 {
|
|
label = "Backup Button";
|
|
linux,code = <133>; /* KEY_COPY */
|
|
gpios = <&gpio1 13 1>;
|
|
};
|
|
};
|
|
|
|
regulators {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
usb_power: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
reg = <1>;
|
|
regulator-name = "USB 3.0 Power";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio1 14 0>;
|
|
};
|
|
};
|
|
};
|