Commit d828e978 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt64-v4.13' of... 

Merge tag 'uniphier-dt64-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64

UniPhier ARM64 SoC DT updates for v4.13

- specify timing delay properties of eMMC
- fix W=1 build warnings
- increase memory reserve size
- use SPDX License Identifier
- add new board support (LD11/LD20 global)

* tag 'uniphier-dt64-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier

:
  arm64: dts: uniphier: add support for LD20 Global board
  arm64: dts: uniphier: add support for LD11 Global board
  arm64: dts: uniphier: use SPDX-License-Identifier
  arm64: dts: uniphier: reserve more memory for LD11/LD20
  arm64: dts: uniphier: fix simple-bus unit address format error
  arm64: dts: uniphier: Use - instead of @ for DT OPP entries
  arm64: dts: uniphier: add cdns, phy-dll-delay-sdclk(-hsmmc) for eMMC
  arm64: dts: uniphier: add input-delay properties to Cadence eMMC node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d8a41096 1b6d58ac

arch/arm64/boot/dts/socionext/Makefile

+2 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_UNIPHIER) += \

	uniphier-ld11-global.dtb \

	uniphier-ld11-ref.dtb \

	uniphier-ld20-global.dtb \

	uniphier-ld20-ref.dtb



always		:= $(dtb-y)

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD11 Global Board

 *

 * Copyright (C) 2016-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

 *

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/dts-v1/;

/include/ "uniphier-ld11.dtsi"



/ {

	model = "UniPhier LD11 Global Board (REF_LD11_GP)";

	compatible = "socionext,uniphier-ld11-global",

		     "socionext,uniphier-ld11";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	aliases {

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0 0x80000000 0 0x40000000>;

	};

};



&serial0 {

	status = "okay";

};



&serial1 {

	status = "okay";

};



&i2c0 {

	status = "okay";



	eeprom@50 {

		compatible = "st,24c64", "atmel,24c64";

		reg = <0x50>;

		pagesize = <32>;

	};

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};



&usb2 {

	status = "okay";

};

arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

+1 −37
Original line number Diff line number Diff line
@@ -4,43 +4,7 @@ 
 * Copyright (C) 2016 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 * 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.

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/dts-v1/;

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+15 −46
Original line number Diff line number Diff line
@@ -4,46 +4,10 @@ 
 * Copyright (C) 2016 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 * 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.

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/memreserve/ 0x80000000 0x00080000;

/memreserve/ 0x80000000 0x02000000;



/ {

	compatible = "socionext,uniphier-ld11";
@@ -89,31 +53,31 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp@245000000 {

		opp-245000000 {

			opp-hz = /bits/ 64 <245000000>;

			clock-latency-ns = <300>;

		};

		opp@250000000 {

		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			clock-latency-ns = <300>;

		};

		opp@490000000 {

		opp-490000000 {

			opp-hz = /bits/ 64 <490000000>;

			clock-latency-ns = <300>;

		};

		opp@500000000 {

		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			clock-latency-ns = <300>;

		};

		opp@653334000 {

		opp-653334000 {

			opp-hz = /bits/ 64 <653334000>;

			clock-latency-ns = <300>;

		};

		opp@666667000 {

		opp-666667000 {

			opp-hz = /bits/ 64 <666667000>;

			clock-latency-ns = <300>;

		};

		opp@980000000 {

		opp-980000000 {

			opp-hz = /bits/ 64 <980000000>;

			clock-latency-ns = <300>;

		};
@@ -268,7 +232,7 @@ 
			pinctrl-0 = <&pinctrl_system_bus>;

		};



		smpctrl@59800000 {

		smpctrl@59801000 {

			compatible = "socionext,uniphier-smpctrl";

			reg = <0x59801000 0x400>;

		};
@@ -310,6 +274,11 @@ 
			bus-width = <8>;

			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;

			cdns,phy-dll-delay-sdclk = <21>;

			cdns,phy-dll-delay-sdclk-hsmmc = <21>;

		};



		usb0: usb@5a800100 {

arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD20 Global Board

 *

 * Copyright (C) 2015-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

 *

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/dts-v1/;

/include/ "uniphier-ld20.dtsi"



/ {

	model = "UniPhier LD20 Global Board (REF_LD20_GP)";

	compatible = "socionext,uniphier-ld20-global",

		     "socionext,uniphier-ld20";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	aliases {

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0 0x80000000 0 0xc0000000>;

	};

};



&serial0 {

	status = "okay";

};



&serial1 {

	status = "okay";

};



&i2c0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE