Sync rk3288-vyasa board dts from Linux for proper updates and maintenance - rk3288-vyasa.dts: Similar to Linux dts - rk3288-vyasa-u-boot.dtsi: u-boot dts changes
Also updated MAINTAINERS for these dts files.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com --- arch/arm/dts/rk3288-vyasa-u-boot.dtsi | 29 +++++++ arch/arm/dts/rk3288-vyasa.dts | 134 ++++++++++++++++++--------------- board/amarula/vyasa-rk3288/MAINTAINERS | 2 + 3 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 arch/arm/dts/rk3288-vyasa-u-boot.dtsi
diff --git a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi new file mode 100644 index 0000000..b3a56e9 --- /dev/null +++ b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2017 Jagan Teki jagan@amarulasolutions.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa + 0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7 + 0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0 + 0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0 + 0x5 0x0>; + rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 + 0xa60 0x40 0x10 0x0>; + /* Add a dummy value to cause of-platdata think this is bytes */ + rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>; +}; + +&sdmmc { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts index 93a9c5e..932311c 100644 --- a/arch/arm/dts/rk3288-vyasa.dts +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -52,8 +52,8 @@ };
memory { + reg = <0x0 0x0 0x0 0x80000000>; device_type = "memory"; - reg = <0 0x80000000>; };
vcc_sd: sdmmc-regulator { @@ -78,22 +78,20 @@ }; };
-&dmc { - rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa - 0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7 - 0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0 - 0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0 - 0x5 0x0>; - rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 - 0xa60 0x40 0x10 0x0>; - /* Add a dummy value to cause of-platdata think this is bytes */ - rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>; -}; - &cpu0 { cpu0-supply = <&vdd_cpu>; };
+&gpu { + mali-supply = <&vdd_gpu>; + status = "okay"; +}; + +&hdmi { + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + &i2c0 { clock-frequency = <400000>; status = "okay"; @@ -103,12 +101,12 @@ reg = <0x1b>; interrupt-parent = <&gpio0>; interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default"; pinctrl-0 = <&pmic_int &global_pwroff>; - wakeup-source; rockchip,system-power-controller; - #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + wakeup-source;
vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; @@ -124,22 +122,22 @@
regulators { vdd_cpu: vdd_log: DCDC_REG1 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vdd_log"; regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; - regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-off-in-suspend; }; };
vdd_gpu: DCDC_REG2 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vdd_gpu"; regulator-min-microvolt = <850000>; regulator-max-microvolt = <1250000>; - regulator-name = "vdd_gpu"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; @@ -147,20 +145,20 @@ };
vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; regulator-always-on; regulator-boot-on; - regulator-name = "vcc_ddr"; regulator-state-mem { regulator-on-in-suspend; }; };
vcc_io: DCDC_REG4 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_io"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_io"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; @@ -168,11 +166,11 @@ };
vcca_tp: LDO_REG1 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_tp"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_tp"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; @@ -180,22 +178,22 @@ };
vcc_codec: LDO_REG2 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_codec"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_codec"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-off-in-suspend; }; };
vdd_10: LDO_REG3 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; - regulator-name = "vdd_10"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; @@ -203,11 +201,11 @@ };
vcc_gps: LDO_REG4 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_gps"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_gps"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; @@ -215,11 +213,11 @@ };
vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-name = "vccio_sd"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; @@ -227,11 +225,11 @@ };
vcc10_lcd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc10_lcd"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; - regulator-name = "vcc10_lcd"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; @@ -239,11 +237,11 @@ };
vcc_18: LDO_REG7 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_18"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; @@ -251,11 +249,11 @@ };
vcc18_lcd: LDO_REG8 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc18_lcd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc18_lcd"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; @@ -263,22 +261,22 @@ };
vcc33_sd: SWITCH_REG1 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc33_sd"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc33_sd"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; }; };
vcc_lan: SWITCH_REG2 { - regulator-always-on; - regulator-boot-on; + regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_lan"; + regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; }; @@ -287,10 +285,11 @@ }; };
-&sdmmc { - u-boot,dm-pre-reloc; +&i2c2 { status = "okay"; +};
+&sdmmc { bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; @@ -300,10 +299,26 @@ pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; vmmc-supply = <&vcc_sd>; vqmmc-supply = <&vccio_sd>; + status = "okay"; };
&uart2 { - u-boot,dm-pre-reloc; + status = "okay"; +}; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { status = "okay"; };
@@ -312,7 +327,6 @@ };
&pinctrl { - u-boot,dm-pre-reloc; pmic { pmic_int: pmic-int { rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; diff --git a/board/amarula/vyasa-rk3288/MAINTAINERS b/board/amarula/vyasa-rk3288/MAINTAINERS index 10397fc..08ea208 100644 --- a/board/amarula/vyasa-rk3288/MAINTAINERS +++ b/board/amarula/vyasa-rk3288/MAINTAINERS @@ -4,3 +4,5 @@ S: Maintained F: board/amarula/vyasa-rk3288 F: include/configs/vyasa-rk3288.h F: configs/vyasa-rk3288_defconfig +F: arch/arm/dts/rk3288-vyasa.dts +F: arch/arm/dts/rk3288-vyasa-u-boot.dtsi