Please add at least a small real commit message Am Donnerstag, 15. Januar 2015, 11:40:58 schrieb FUKAUMI Naoki: > Signed-off-by: FUKAUMI Naoki <[email protected]> > --- > arch/arm/boot/dts/Makefile | 4 +- > arch/arm/boot/dts/rk3288-firefly-beta.dts | 70 +++++ > arch/arm/boot/dts/rk3288-firefly.dts | 70 +++++ > arch/arm/boot/dts/rk3288-firefly.dtsi | 498 > ++++++++++++++++++++++++++++++ 4 files changed, 641 insertions(+), 1 > deletion(-) > create mode 100644 arch/arm/boot/dts/rk3288-firefly-beta.dts > create mode 100644 arch/arm/boot/dts/rk3288-firefly.dts > create mode 100644 arch/arm/boot/dts/rk3288-firefly.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index cb686e6..fb03a2b 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -447,7 +447,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ > rk3066a-marsboard.dtb \ > rk3188-radxarock.dtb \ > rk3288-evb-act8846.dtb \ > - rk3288-evb-rk808.dtb > + rk3288-evb-rk808.dtb \ > + rk3288-firefly-beta.dtb \ > + rk3288-firefly.dtb > dtb-$(CONFIG_ARCH_S3C24XX) += \ > s3c2416-smdk2416.dtb > dtb-$(CONFIG_ARCH_S3C64XX) += \ > diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts > b/arch/arm/boot/dts/rk3288-firefly-beta.dts new file mode 100644 > index 0000000..d640569 > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts > @@ -0,0 +1,70 @@ > +/* > + * Copyright (c) 2014, 2015 FUKAUMI Naoki <[email protected]> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "rk3288-firefly.dtsi" > + > +/ { > + model = "Firefly-RK3288 Beta"; > +}; > + > +&ir { > + gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; > +}; > + > +&pwm0 { > + status = "okay"; > +}; > + > +&pinctrl { > + ir { > + ir_int: ir-int { > + rockchip,pins = <7 5 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + act8846 { > + pmic_vsel: pmic-vsel { > + rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>; > + }; > + }; > +};
please order nodes a bit more. Nodes having an address (foo@ff908000 etc) should of course be ordered by this memory address or their i2c address. Nodes without address element should be ordered alphabetically, so here, act8846 before ir. Same with &pinctrl before &pwm (= phandles should also be sorted). > diff --git a/arch/arm/boot/dts/rk3288-firefly.dts > b/arch/arm/boot/dts/rk3288-firefly.dts new file mode 100644 > index 0000000..0bdc37c > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-firefly.dts > @@ -0,0 +1,70 @@ > +/* > + * Copyright (c) 2014, 2015 FUKAUMI Naoki <[email protected]> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "rk3288-firefly.dtsi" > + > +/ { > + model = "Firefly-RK3288"; > +}; > + > +&ir { > + gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; > +}; > + > +&pwm1 { > + status = "okay"; > +}; > + > +&pinctrl { > + ir { > + ir_int: ir-int { > + rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + act8846 { > + pmic_vsel: pmic-vsel { > + rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>; > + }; > + }; > +}; again ordering > diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi > b/arch/arm/boot/dts/rk3288-firefly.dtsi new file mode 100644 > index 0000000..5996778 > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi > @@ -0,0 +1,498 @@ > +/* > + * Copyright (c) 2014, 2015 FUKAUMI Naoki <[email protected]> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include "rk3288.dtsi" > + > +/ { > + compatible = "firefly,firefly-rk3288", "rockchip,rk3288"; > + > + memory { > + reg = <0 0x80000000>; > + }; > + > + ext_gmac: external-gmac-clock { > + compatible = "fixed-clock"; > + clock-frequency = <125000000>; > + clock-output-names = "ext_gmac"; > + #clock-cells = <0>; > + }; > + > + ir: ir-receiver { > + compatible = "gpio-ir-receiver"; > + pinctrl-names = "default"; > + pinctrl-0 = <&ir_int>; > + }; > + > + keys: gpio-keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + button@0 { > + gpio-key,wakeup = <1>; > + gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; > + label = "GPIO Power"; > + linux,code = <116>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pwr_key>; > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + work { > + gpios = <&gpio8 1 GPIO_ACTIVE_LOW>; > + label = "firefly:blue:user"; > + linux,default-trigger = "rc-feedback"; > + pinctrl-names = "default"; > + pinctrl-0 = <&work_led>; > + }; > + > + power { > + gpios = <&gpio8 2 GPIO_ACTIVE_LOW>; > + label = "firefly:green:power"; > + linux,default-trigger = "default-on"; > + pinctrl-names = "default"; > + pinctrl-0 = <&power_led>; > + }; > + }; > + > + vcc_sys: vsys-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_sys"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + vcc_sd: sdmmc-regulator { > + compatible = "regulator-fixed"; > + gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc_pwr>; > + regulator-name = "vcc_sd"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + startup-delay-us = <100000>; > + vin-supply = <&vcc_io>; > + }; > + > + vcc_flash: flash-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_flash"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + vin-supply = <&vcc_io>; > + }; > + > + vcc_5v: usb-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_5v"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc_sys>; > + }; > + > + vcc_host_5v: usb-host-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&host_vbus_drv>; > + regulator-name = "vcc_host_5v"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + vin-supply = <&vcc_5v>; > + }; > + > + vcc_otg_5v: usb-otg-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&otg_vbus_drv>; > + regulator-name = "vcc_otg_5v"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + vin-supply = <&vcc_5v>; > + }; > +}; > + > +&cpu0 { > + cpu0-supply = <&vdd_cpu>; > +}; > + from here on downwards, ordering issues > +&sdmmc { > + bus-width = <4>; > + cap-mmc-highspeed; > + cap-sd-highspeed; > + card-detect-delay = <200>; > + disable-wp; > + num-slots = <1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; > + status = "okay"; > + vmmc-supply = <&vcc_sd>; > + vqmmc-supply = <&vccio_sd>; > +}; > + > +&sdio0 { > + broken-cd; > + bus-width = <4>; > + disable-wp; > + non-removable; > + num-slots = <1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>; > + status = "okay"; > + vmmc-supply = <&vcc_18>; > +}; > + > +&emmc { > + broken-cd; > + bus-width = <8>; > + cap-mmc-highspeed; > + disable-wp; > + non-removable; > + num-slots = <1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>; > + status = "okay"; > + vmmc-supply = <&vcc_io>; > + vqmmc-supply = <&vcc_flash>; > +}; > + > +&saradc { > + status = "okay"; > + vref-supply = <&vcc_18>; > +}; > + > +&spi0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&spi0_clk>, <&spi0_cs0>, <&spi0_tx>, <&spi0_rx>, > <&spi0_cs1>; > + status = "okay"; > +}; > + > +&spi2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&spi2_clk>, <&spi2_cs0>; > + status = "okay"; > +}; > + > +&i2c1 { > + status = "okay"; > +}; > + > +&i2c4 { > + status = "okay"; > +}; > + > +&i2c5 { > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>; > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&uart3 { > + status = "okay"; > +}; > + > +&tsadc { > + rockchip,hw-tshut-mode = <0>; > + /* status = "okay"; */ please don't add disabled or commented-out elements. In this case you want to keep the tsadc disabled, so the whole &tsadc nodes should not be present > +}; > + > +&gmac { > + assigned-clocks = <&cru SCLK_MAC>; > + assigned-clock-parents = <&ext_gmac>; > + clock_in_out = "input"; > + pinctrl-names = "default"; > + pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; > + phy_regulator = "vcc_lan"; > + phy-mode = "rgmii"; > + snps,reset-active-low; > + snps,reset-delays-us = <0 10000 1000000>; > + snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>; > + tx_delay = <0x30>; > + rx_delay = <0x10>; > + status = "ok"; > +}; > + > +&usb_host1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&usbhub_rst>; > + status = "okay"; > +}; > + > +&usb_otg { > + status = "okay"; > +}; > + > +&i2c0 { > + clock-frequency = <400000>; > + status = "okay"; > + > + vdd_cpu: syr827@40 { > + compatible = "silergy,syr827"; > + fcs,suspend-voltage-selector = <1>; > + reg = <0x40>; > + regulator-name = "vdd_cpu"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1350000>; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc_sys>; > + }; > + > + vdd_gpu: syr828@41 { > + compatible = "silergy,syr828"; > + fcs,suspend-voltage-selector = <1>; > + reg = <0x41>; > + regulator-name = "vdd_gpu"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1350000>; > + regulator-always-on; > + vin-supply = <&vcc_sys>; > + }; > + > + hym8563: hym8563@51 { > + compatible = "haoyu,hym8563"; > + reg = <0x51>; > + interrupt-parent = <&gpio7>; > + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; > + pinctrl-names = "default"; > + pinctrl-0 = <&rtc_int>; > + #clock-cells = <0>; > + clock-output-names = "xin32k"; > + }; > + > + act8846: act8846@5a { > + compatible = "active-semi,act8846"; > + reg = <0x5a>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pmic_vsel>, <&pwr_hold>; > + system-power-controller; > + > + regulators { > + vcc_ddr: REG1 { > + regulator-name = "vcc_ddr"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-always-on; > + }; > + > + vcc_io: REG2 { > + regulator-name = "vcc_io"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vdd_log: REG3 { > + regulator-name = "vdd_log"; > + regulator-min-microvolt = <1100000>; > + regulator-max-microvolt = <1100000>; > + regulator-always-on; > + }; > + > + vcc_20: REG4 { > + regulator-name = "vcc_20"; > + regulator-min-microvolt = <2000000>; > + regulator-max-microvolt = <2000000>; > + regulator-always-on; > + }; > + > + vccio_sd: REG5 { > + regulator-name = "vccio_sd"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vdd10_lcd: REG6 { > + regulator-name = "vdd10_lcd"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + }; > + > + vcca_18: REG7 { > + regulator-name = "vcca_18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + }; > + > + vcca_33: REG8 { > + regulator-name = "vcca_33"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + vcc_lan: REG9 { > + regulator-name = "vcc_lan"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vdd_10: REG10 { > + regulator-name = "vdd_10"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + }; > + > + vcc_18: REG11 { > + regulator-name = "vcc_18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + }; > + > + vcc18_lcd: REG12 { > + regulator-name = "vcc18_lcd"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + }; > + }; > + }; > +}; > + > +&i2c2 { > + status = "okay"; > +}; > + > +&wdt { > + status = "okay"; > +}; > + > +&pinctrl { > + pcfg_output_high: pcfg-output-high { > + output-high; > + }; > + > + pcfg_output_low: pcfg-output-low { > + output-low; > + }; > + > + keys { > + pwr_key: pwr-key { > + rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + leds { > + work_led: work-led { > + rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + > + power_led: power-led { > + rockchip,pins = <8 2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > + sdmmc { > + sdmmc_pwr: sdmmc-pwr { > + rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > + gmac { > + phy_rst: phy-rst { > + rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; > + }; > + > + phy_pmeb: phy-pmeb { > + rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + > + phy_int: phy-int { > + rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + > + }; > + > + usb_host { > + host_vbus_drv: host-vbus-drv { > + rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + > + usbhub_rst: usbhub-rst { > + rockchip,pins = <8 3 RK_FUNC_GPIO &pcfg_output_high>; > + }; > + }; > + > + usb_otg { > + otg_vbus_drv: otg-vbus-drv { > + rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > + hym8563 { > + rtc_int: rtc-int { > + rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + act8846 { > + pwr_hold: pwr-hold { > + rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>; > + }; > + }; ordering of pinctrl subnodes > +}; -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
