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

Commit f3ccc2b4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt-v4.17' of... 

Merge tag 'uniphier-dt-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.17" from Masahiro Yamada:

- add sound support
- add ethernet support
- use proper SPDX-License-Identifier style

* tag 'uniphier-dt-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add sound node for PXs2
  arm64: dts: uniphier: use proper SPDX-License-Identifier style
  ARM: dts: uniphier: use proper SPDX-License-Identifier style
  arm64: dts: uniphier: add fixed regulators for audio codec
  arm64: dts: uniphier: add AVE ethernet node
  ARM: dts: uniphier: add AVE ethernet node
  arm64: dts: uniphier: add compress audio out for LD11/LD20
  arm64: dts: uniphier: add speaker out for LD11/LD20 boards
  arm64: dts: uniphier: add sound node
  ARM: dts: uniphier: add audio in/out pin-mux node
parents 5b5c7ffe 7f9f76b1

arch/arm/boot/dts/uniphier-ld4-ref.dts

+6 −8
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD4 Reference Board

 *

 * Copyright (C) 2015-2016 Socionext Inc.

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

 *

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

 */

// SPDX-License-Identifier: GPL-2.0+ OR MIT

//

// Device Tree Source for UniPhier LD4 Reference Board

//

// Copyright (C) 2015-2016 Socionext Inc.

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



/dts-v1/;

#include "uniphier-ld4.dtsi"

arch/arm/boot/dts/uniphier-ld4.dtsi

+6 −8
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD4 SoC

 *

 * Copyright (C) 2015-2016 Socionext Inc.

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

 *

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

 */

// SPDX-License-Identifier: GPL-2.0+ OR MIT

//

// Device Tree Source for UniPhier LD4 SoC

//

// Copyright (C) 2015-2016 Socionext Inc.

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



#include <dt-bindings/gpio/uniphier-gpio.h>

arch/arm/boot/dts/uniphier-ld6b-ref.dts

+17 −8
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD6b Reference Board

 *

 * Copyright (C) 2015-2016 Socionext Inc.

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

 *

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

 */

// SPDX-License-Identifier: GPL-2.0+ OR MIT

//

// Device Tree Source for UniPhier LD6b Reference Board

//

// Copyright (C) 2015-2016 Socionext Inc.

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



/dts-v1/;

#include "uniphier-ld6b.dtsi"
@@ -67,6 +65,17 @@ 
	status = "okay";

};



&eth {

	status = "okay";

	phy-handle = <&ethphy>;

};



&mdio {

	ethphy: ethphy@0 {

		reg = <0>;

	};

};



&nand {

	status = "okay";

};

arch/arm/boot/dts/uniphier-ld6b.dtsi

+6 −8
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier LD6b SoC

 *

 * Copyright (C) 2015-2016 Socionext Inc.

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

 *

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

 */

// SPDX-License-Identifier: GPL-2.0+ OR MIT

//

// Device Tree Source for UniPhier LD6b SoC

//

// Copyright (C) 2015-2016 Socionext Inc.

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



/*

 * LD6b consists of two silicon dies: D-chip and A-chip.

arch/arm/boot/dts/uniphier-pinctrl.dtsi

+46 −8
Original line number Diff line number Diff line 
/*

 * Device Tree Source for UniPhier SoCs default pinctrl settings

 *

 * Copyright (C) 2015-2017 Socionext Inc.

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

 *

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

 */

// SPDX-License-Identifier: GPL-2.0+ OR MIT

//

// Device Tree Source for UniPhier SoCs default pinctrl settings

//

// Copyright (C) 2015-2017 Socionext Inc.

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



&pinctrl {

	pinctrl_aout: aout {
@@ -13,6 +11,46 @@ 
		function = "aout";

	};



	pinctrl_ain1: ain1 {

		groups = "ain1";

		function = "ain1";

	};



	pinctrl_ain2: ain2 {

		groups = "ain2";

		function = "ain2";

	};



	pinctrl_ainiec1: ainiec1 {

		groups = "ainiec1";

		function = "ainiec1";

	};



	pinctrl_aout1: aout1 {

		groups = "aout1";

		function = "aout1";

	};



	pinctrl_aout2: aout2 {

		groups = "aout2";

		function = "aout2";

	};



	pinctrl_aout3: aout3 {

		groups = "aout3";

		function = "aout3";

	};



	pinctrl_aoutiec1: aoutiec1 {

		groups = "aoutiec1";

		function = "aoutiec1";

	};



	pinctrl_aoutiec2: aoutiec2 {

		groups = "aoutiec2";

		function = "aoutiec2";

	};



	pinctrl_emmc: emmc {

		groups = "emmc", "emmc_dat8";

		function = "emmc";