Merge tag 'gxbb-dt64' of https://github.com/carlocaione/linux-meson into next/dt64 (be0b0700) · Commits · 戴 / test

Documentation/devicetree/bindings/arm/amlogic.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,3 +25,6 @@ Board compatible values:
		- "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)
		- "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)
		- "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)
		- "hardkernel,odroid-c2" (Meson gxbb)
		- "amlogic,p200" (Meson gxbb)
		- "amlogic,p201" (Meson gxbb)

arch/arm64/boot/dts/amlogic/Makefile

+3 −0

Original line number	Diff line number	Diff line
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
		dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016 Andreas Färber
		* Copyright (c) 2016 BayLibre, Inc.
		* Author: Kevin Hilman <khilman@kernel.org>
		*
		* 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 library 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 library 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 "meson-gxbb.dtsi"

		/ {
		compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb";
		model = "Hardkernel ODROID-C2";

		aliases {
		serial0 = &uart_AO;
		};

		chosen {
		stdout-path = "serial0:115200n8";
		};

		memory@0 {
		device_type = "memory";
		reg = <0x0 0x0 0x0 0x80000000>;
		};
		};

		&uart_AO {
		status = "okay";
		};

arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016 Andreas Färber
		* Copyright (c) 2016 BayLibre, Inc.
		* Author: Kevin Hilman <khilman@kernel.org>
		*
		* 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 library 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 library 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 "meson-gxbb-p20x.dtsi"

		/ {
		compatible = "amlogic,p200", "amlogic,meson-gxbb";
		model = "Amlogic Meson GXBB P200 Development Board";
		};

arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016 Andreas Färber
		* Copyright (c) 2016 BayLibre, Inc.
		* Author: Kevin Hilman <khilman@kernel.org>
		*
		* 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 library 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 library 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 "meson-gxbb-p20x.dtsi"

		/ {
		compatible = "amlogic,p201", "amlogic,meson-gxbb";
		model = "Amlogic Meson GXBB P201 Development Board";
		};

Admin message