Unverified Commit 33f0ceca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-6.5' of... 

Merge tag 'samsung-dt-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt

Samsung DTS ARM changes for v6.5

1. Final cleanups and improvements as a result of dtbs_checks which rely
   on previously merged driver changes thus affecting older or
   out-of-tree kernels.  The changes are necessary to achieve full
   dtbs_check compliance, which justifies affecting out-of-tree users.
   Changes affecting them are:
    - Drop simple-bus compatible from FIMC: Exynos4 and S5PV210,
    - Remove empty camera pinctrl configuration: Exynos4 and S5PV210,
    - Re-order MFC clock names to match Exynos and bindings: S5PV210.

2. Except above few more non-intrusive cleanups for dtbs_check for
   S5PV210.  Fix also some typos.

3. Re-introduce Exynos4212 which was removed because of lack of upstream
   users.  Artur Weber adds now Samsung Galaxy Tab3 with Exynos4212.

* tag 'samsung-dt-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5pv210: Fix typo in comments, fix pinctrl header
  ARM: dts: s3c64xx: Fix some typos in comments
  ARM: dts: exynos: Fix some typos in comments
  dt-bindings: arm: samsung: Add Samsung Galaxy Tab3 family boards
  ARM: dts: exynos: Re-introduce Exynos4212 DTSI
  ARM: dts: exynos: Move common Exynos4x12 definitions to exynos4x12.dtsi
  ARM: dts: s5pv210: remove empty camera pinctrl configuration
  ARM: dts: s5pv210: add dummy 5V regulator for backlight on SMDKv210
  ARM: dts: s5pv210: re-order MFC clock names to match Exynos and bindings
  ARM: dts: s5pv210: align USB node name with bindings
  ARM: dts: s5pv210: align pin configuration nodes with bindings
  ARM: dts: exynos: Remove empty camera pinctrl configuration in Odroid X/U3
  ARM: dts: exynos: Remove empty camera pinctrl configuration in Universal C210
  ARM: dts: exynos: Remove empty camera pinctrl configuration in Trats
  ARM: dts: s5pv210: drop simple-bus from FIMC
  ARM: dts: exynos: drop simple-bus from FIMC in Exynos4

Link: https://lore.kernel.org/r/20230602091501.15178-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4d1010ff 6a988251

Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml

+10 −0
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ properties: 
          - const: samsung,exynos4210

          - const: samsung,exynos4



      - description: Samsung Galaxy Tab3 family boards

        items:

          - enum:

              - samsung,t310                    # Samsung Galaxy Tab 3 8.0 WiFi (SM-T310)

              - samsung,t311                    # Samsung Galaxy Tab 3 8.0 3G (SM-T311)

              - samsung,t315                    # Samsung Galaxy Tab 3 8.0 LTE (SM-T315)

          - const: samsung,tab3

          - const: samsung,exynos4212

          - const: samsung,exynos4



      - description: Exynos4412 based boards

        items:

          - enum:

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

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
 * Copyright (c) 2014 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Samsung's Exynos3250 SoCs pin-mux and pin-config optiosn are listed as device

 * tree nodes are listed in this file.

 * Samsung's Exynos3250 SoCs pin-mux and pin-config options are listed as device

 * tree nodes in this file.

 */



#include "exynos-pinctrl.h"

arch/arm/boot/dts/exynos3250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *		http://www.samsung.com

 *

 * Samsung's Exynos3250 SoC device nodes are listed in this file. Exynos3250

 * based board files can include this file and provide values for board specfic

 * based board files can include this file and provide values for board specific

 * bindings.

 *

 * Note: This file does not include device nodes for all the controllers in

arch/arm/boot/dts/exynos4.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 *

 * Samsung's Exynos4 SoC series device nodes are listed in this file.  Particular

 * SoCs from Exynos4 series can include this file and provide values for SoCs

 * specfic bindings.

 * specific bindings.

 *

 * Note: This file does not include device nodes for all the controllers in

 * Exynos4 SoCs. As device tree coverage for Exynos4 increases, additional
@@ -201,8 +201,8 @@ dsi_0: dsi@11c80000 { 
			#size-cells = <0>;

		};



		camera: camera {

			compatible = "samsung,fimc", "simple-bus";

		camera: camera@11800000 {

			compatible = "samsung,fimc";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <1>;

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

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
 * Copyright (c) 2011-2012 Linaro Ltd.

 *		www.linaro.org

 *

 * Samsung's Exynos4210 SoC pin-mux and pin-config optiosn are listed as device

 * tree nodes are listed in this file.

 * Samsung's Exynos4210 SoC pin-mux and pin-config options are listed as device

 * tree nodes in this file.

 */



#include "exynos-pinctrl.h"