Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6075a130 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.4-rockchip-dts32-2' of... 

Merge tag 'v5.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Removal of the rk3288-fennec board which never made it to
any market.

* tag 'v5.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  dt-bindings: arm: rockchip: remove reference to fennec board
  ARM: dts: rockchip: remove rk3288 fennec board support

Link: https://lore.kernel.org/r/1718334.9BoTfW0Ujv@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 48f3a832 9f72a1d0

Documentation/devicetree/bindings/arm/rockchip.yaml

+0 −5
Original line number Diff line number Diff line
@@ -464,11 +464,6 @@ properties: 
              - rockchip,rk3288-evb-rk808

          - const: rockchip,rk3288



      - description: Rockchip RK3288 Fennec

        items:

          - const: rockchip,rk3288-fennec

          - const: rockchip,rk3288



      - description: Rockchip RK3328 Evaluation board

        items:

          - const: rockchip,rk3328-evb

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -914,7 +914,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3229-xms6.dtb \

	rk3288-evb-act8846.dtb \

	rk3288-evb-rk808.dtb \

	rk3288-fennec.dtb \

	rk3288-firefly-beta.dtb \

	rk3288-firefly.dtb \

	rk3288-firefly-reload.dtb \

arch/arm/boot/dts/rk3288-fennec.dts

deleted100644 → 0
+0 −347
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)



/dts-v1/;



#include "rk3288.dtsi"



/ {

	model = "Rockchip RK3288 Fennec Board";

	compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";



	memory@0 {

		reg = <0x0 0x0 0x0 0x80000000>;

		device_type = "memory";

	};



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

	};



	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;

	};

};



&cpu0 {

	cpu0-supply = <&vdd_cpu>;

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;

	status = "okay";

};



&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-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "okay";

};



&gpu {

	mali-supply = <&vdd_gpu>;

	status = "okay";

};



&hdmi {

	status = "okay";

};



&i2c0 {

	status = "okay";

	clock-frequency = <400000>;



	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		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>;

		rockchip,system-power-controller;

		wakeup-source;



		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

		vcc3-supply = <&vcc_sys>;

		vcc4-supply = <&vcc_sys>;

		vcc6-supply = <&vcc_sys>;

		vcc7-supply = <&vcc_sys>;

		vcc8-supply = <&vcc_io>;

		vcc9-supply = <&vcc_io>;

		vcc10-supply = <&vcc_io>;

		vcc11-supply = <&vcc_io>;

		vcc12-supply = <&vcc_io>;

		vddio-supply = <&vcc_io>;



		regulators {

			vdd_cpu: DCDC_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-name = "vdd_arm";

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vdd_gpu: DCDC_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <850000>;

				regulator-max-microvolt = <1250000>;

				regulator-name = "vdd_gpu";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vcc_ddr: DCDC_REG3 {

				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-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc_io";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vccio_pmu: LDO_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_pmu";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcca_33: LDO_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcca_33";

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vdd_10: LDO_REG3 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd_10";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vcc_wl: LDO_REG4 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc_wl";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vccio_sd: LDO_REG5 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_sd";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vdd10_lcd: LDO_REG6 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd10_lcd";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vcc_18: LDO_REG7 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc_18";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc18_lcd: LDO_REG8 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc18_lcd";

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc_sd: SWITCH_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_sd";

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};



			vcc_lan: SWITCH_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_lan";

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};

		};

	};

};



&pinctrl {

	pcfg_output_high: pcfg-output-high {

		output-high;

	};



	pcfg_output_low: pcfg-output-low {

		output-low;

	};



	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {

		drive-strength = <8>;

	};



	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {

		bias-pull-up;

		drive-strength = <8>;

	};



	gmac {

		phy_int: phy-int {

			rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		phy_pmeb: phy-pmeb {

			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		phy_rst: phy-rst {

			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};



	pmic {

		pmic_int: pmic-int {

			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	usbphy {

		host_drv: host-drv {

			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&uart2 {

	status = "okay";

};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&host_drv>;

	vbus_drv-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host1 {

	status = "okay";

};



&usb_otg {

	status = "okay";

};



&usb_hsic {

	status = "okay";

};



&vopb {

	status = "okay";

};



&vopb_mmu {

	status = "okay";

};



&vopl {

	status = "okay";

};



&vopl_mmu {

	status = "okay";

};