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

Commit f2d32db3 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mackerras
Browse files

[POWERPC] Fix RTC and device tree on linkstation machines 



This fixes the RTC on linkstation ppc machines again, and updates the
device tree: add rtc nodes on i2c, remove bogus 0-size cache-line
declarations, rename interrupt-controller nodes, remove erroneous
interrupt-parent line, accidentally introduced by a recent patch.

Signed-off-by: default avatarG. Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d13ae862

arch/powerpc/boot/dts/kuroboxHD.dts

+12 −6
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
		PowerPC,603e { /* Really 8241 */

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <bebc200>;	/* Fixed by bootwrapper */

			timebase-frequency = <1743000>; /* Fixed by bootwrapper */

			bus-frequency = <0>;		/* From bootloader */

			clock-frequency = <bebc200>;	/* Fixed by bootloader */

			timebase-frequency = <1743000>; /* Fixed by bootloader */

			bus-frequency = <0>;		/* Fixed by bootloader */

			/* Following required by dtc but not used */

			i-cache-line-size = <0>;

			d-cache-line-size = <0>;

			i-cache-size = <4000>;

			d-cache-size = <4000>;

		};
@@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <&mpic>;



			rtc@32 {

				device_type = "rtc";

				compatible = "ricoh,rs5c372b";

				reg = <32>;

			};

		};



		serial@80004500 {
@@ -91,7 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
			interrupt-parent = <&mpic>;

		};



		mpic: pic@80040000 {

		mpic: interrupt-controller@80040000 {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";

arch/powerpc/boot/dts/kuroboxHG.dts

+12 −7
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
		PowerPC,603e { /* Really 8241 */

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <fdad680>;	/* Fixed by bootwrapper */

			timebase-frequency = <1F04000>; /* Fixed by bootwrapper */

			bus-frequency = <0>;		/* From bootloader */

			clock-frequency = <fdad680>;	/* Fixed by bootloader */

			timebase-frequency = <1F04000>; /* Fixed by bootloader */

			bus-frequency = <0>;		/* Fixed by bootloader */

			/* Following required by dtc but not used */

			i-cache-line-size = <0>;

			d-cache-line-size = <0>;

			i-cache-size = <4000>;

			d-cache-size = <4000>;

		};
@@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <&mpic>;



			rtc@32 {

				device_type = "rtc";

				compatible = "ricoh,rs5c372b";

				reg = <32>;

			};

		};



		serial@80004500 {
@@ -91,8 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
			interrupt-parent = <&mpic>;

		};



		mpic: pic@80040000 {

			interrupt-parent = <&mpic>;

		mpic: interrupt-controller@80040000 {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";