Unverified Commit 52c1a896 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'cix-dt-v6.20-rc1' of... 

Merge tag 'cix-dt-v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix into soc/dt

- add OrangePi 6 Plus board
- one small improvement

* tag 'cix-dt-v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix

:
  arm64: dts: cix: Add OrangePi 6 Plus board support
  arm64: dts: cix: Use lowercase hex

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d5f4e01e e39fadd6

arch/arm64/boot/dts/cix/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_CIX) += sky1-orion-o6.dtb

dtb-$(CONFIG_ARCH_CIX) += sky1-xcp.dtb

arch/arm64/boot/dts/cix/sky1-xcp.dts

0 → 100644
+83 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright 2025 Cix Technology Group Co., Ltd.

 *

 */



/dts-v1/;



#include "sky1.dtsi"

#include "sky1-pinfunc.h"



/ {

	model = "Xunlong,OrangePi 6 Plus";

	compatible = "xunlong,orangepi-6-plus", "cix,sky1";



	aliases {

		serial2 = &uart2;

	};



	chosen {

		stdout-path = &uart2;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		linux,cma {

			compatible = "shared-dma-pool";

			reusable;

			size = <0x0 0x28000000>;

			linux,cma-default;

		};

	};



};



&iomuxc {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hog>;



	pinctrl_hog: hog-cfg {

		pins {

			pinmux = <CIX_PAD_GPIO144_FUNC_GPIO144>,

				<CIX_PAD_GPIO145_FUNC_GPIO145>,

				<CIX_PAD_GPIO146_FUNC_GPIO146>,

				<CIX_PAD_GPIO147_FUNC_GPIO147>;

			bias-pull-down;

			drive-strength = <8>;

		};

	};

};



&iomuxc_s5 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hog_s5>;



	pinctrl_hog_s5: hog-s5-cfg {

		pins {

			pinmux = <CIX_PAD_GPIO014_FUNC_GPIO014>;

			bias-pull-up;

			drive-strength = <8>;



		};

	};

};



&pcie_x8_rc {

	status = "okay";

};



&pcie_x2_rc {

	status = "okay";

};



&pcie_x1_1_rc {

	status = "okay";

};



&uart2 {

	status = "okay";

};

arch/arm64/boot/dts/cix/sky1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ pcie_x1_1_rc: pcie@a0e0000 { 
			reg-names = "reg", "cfg", "rcsu_strap", "rcsu_status", "msg";

			ranges = <0x01000000 0x0 0x38100000 0x0 0x38100000 0x0 0x00100000>,

				 <0x02000000 0x0 0x38200000 0x0 0x38200000 0x0 0x07e00000>,

				 <0x43000000 0x0C 0x00000000 0x0C 0x00000000 0x04 0x00000000>;

				 <0x43000000 0x0c 0x00000000 0x0c 0x00000000 0x04 0x00000000>;

			#address-cells = <3>;

			#size-cells = <2>;

			bus-range = <0x30 0x5f>;