Commit 406ca449 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt2-for-v4.5' of... 

Merge tag 'renesas-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman:

* sh73a0, r8a7740: Add L2 cache-controller node
* r8a7791, r8a7794: remove deprecated #gpio-range-cells
* r8a7793: Add DU support and enable for VGA port
* r8a7790: switch console back to scif0
* alt: Correct ether and scif2 pinmux
* koelsch: Correct hdmi pinmux
* silk, lager, porter, bockw: Move SPI FLASH partitions to subnode
* bockw: Add schi0 pinmux

* tag 'renesas-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node
  ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node
  ARM: shmobile: alt: Correct ether pfc
  ARM: shmobile: alt: Correct scif2 pfc
  ARM: shmobile: silk: Move SPI FLASH partitions to subnode
  ARM: shmobile: lager: Move SPI FLASH partitions to subnode
  ARM: shmobile: porter: Move SPI FLASH partitions to subnode
  ARM: shmobile: bockw: Move SPI FLASH partition to subnode
  ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI
  ARM: shmobile: r8a7794: remove deprecated #gpio-range-cells from dtsi
  ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi
  ARM: shmobile: r8a7793: Add DU node to device tree
  ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port
  ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups
  ARM: shmobile: r8a7790: switch console back to scif0
parents 6da06083 c8d9fdbe

arch/arm/boot/dts/r8a7740.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
			reg = <0x0>;

			clock-frequency = <800000000>;

			power-domains = <&pd_a3sm>;

			next-level-cache = <&L2>;

		};

	};
@@ -37,6 +38,18 @@ 
		      <0xc2000000 0x1000>;

	};



	L2: cache-controller {

		compatible = "arm,pl310-cache";

		reg = <0xf0100000 0x1000>;

		interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;

		power-domains = <&pd_a3sm>;

		arm,data-latency = <3 3 3>;

		arm,tag-latency = <2 2 2>;

		arm,shared-override;

		cache-unified;

		cache-level = <2>;

	};



	dbsc3: memory-controller@fe400000 {

		compatible = "renesas,dbsc3-r8a7740";

		reg = <0xfe400000 0x400>;

arch/arm/boot/dts/r8a7778-bockw.dts

+15 −8
Original line number Diff line number Diff line
@@ -137,10 +137,14 @@ 
	};



	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl",

				  "sdhi0_cd";

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";

		renesas,function = "sdhi0";

	};

	sdhi0_pup_pins: sd0_pup {

		renesas,groups = "sdhi0_cd", "sdhi0_wp";

		renesas,function = "sdhi0";

		bias-pull-up;

	};



	hspi0_pins: hspi0 {

		renesas,groups = "hspi0_a";
@@ -169,7 +173,7 @@ 
};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&fixedregulator3v3>;
@@ -184,19 +188,22 @@ 
	status = "okay";



	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl008k", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <104000000>;

		m25p,fast-read;



		partitions {

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "data(spi)";

				reg = <0x00000000 0x00100000>;

			};

		};

	};

};



&scif0 {

	pinctrl-0 = <&scif0_pins>;

arch/arm/boot/dts/r8a7790-lager.dts

+25 −22
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ 
	compatible = "renesas,lager", "renesas,r8a7790";



	aliases {

		serial0 = &scifa0;

		serial0 = &scif0;

		serial1 = &scifa1;

	};



	chosen {

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = &scifa0;

		stdout-path = &scif0;

	};



	memory@40000000 {
@@ -296,9 +296,9 @@ 
		renesas,function = "du";

	};



	scifa0_pins: serial0 {

		renesas,groups = "scifa0_data";

		renesas,function = "scifa0";

	scif0_pins: serial0 {

		renesas,groups = "scif0_data";

		renesas,function = "scif0";

	};



	ether_pins: ether {
@@ -439,8 +439,6 @@ 
	status = "okay";



	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl512s", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <30000000>;
@@ -450,6 +448,10 @@ 
		spi-cpol;

		m25p,fast-read;



		partitions {

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "loader";

				reg = <0x00000000 0x00040000>;
@@ -466,9 +468,10 @@ 
			};

		};

	};

};



&scifa0 {

	pinctrl-0 = <&scifa0_pins>;

&scif0 {

	pinctrl-0 = <&scif0_pins>;

	pinctrl-names = "default";



	status = "okay";

arch/arm/boot/dts/r8a7791-koelsch.dts

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ 
	};



	du_pins: du {

		renesas,groups = "du_rgb666", "du_sync", "du_disp", "du_clk_out_0";

		renesas,groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";

		renesas,function = "du";

	};

arch/arm/boot/dts/r8a7791-porter.dts

+18 −15
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ 
	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl512s", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <30000000>;
@@ -201,6 +199,10 @@ 
		spi-rx-bus-width = <4>;

		m25p,fast-read;



		partitions {

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "loader_prg";

				reg = <0x00000000 0x00040000>;
@@ -217,6 +219,7 @@ 
			};

		};

	};

};



&i2c2 {

	pinctrl-0 = <&i2c2_pins>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE