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

Commit 30aae739 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'kumar/kumar-next' into next

parents 37a76bd4 6fd8be4b

arch/powerpc/boot/dts/mpc8544ds.dts

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ 
			  0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */
@@ -350,7 +350,7 @@ 
			  0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <25 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds.dts

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ 
			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */
@@ -761,7 +761,7 @@ 
			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <27 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ 
			  0x1000000 0x0 0x0 0xffc10000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
			  0x1000000 0x0 0x0 0xffc20000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <27 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/include/asm/qe.h

+18 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ struct ucc_slow_pram { 
#define UCC_GETH_UCCE_RXF1      0x00000002

#define UCC_GETH_UCCE_RXF0      0x00000001



/* UPSMR, when used as a UART */

/* UCC Protocol Specific Mode Register (UPSMR), when used for UART */

#define UCC_UART_UPSMR_FLC		0x8000

#define UCC_UART_UPSMR_SL		0x4000

#define UCC_UART_UPSMR_CL_MASK		0x3000
@@ -652,6 +652,23 @@ struct ucc_slow_pram { 
#define UCC_UART_UPSMR_TPM_EVEN		0x0002

#define UCC_UART_UPSMR_TPM_HIGH		0x0003



/* UCC Protocol Specific Mode Register (UPSMR), when used for Ethernet */

#define UCC_GETH_UPSMR_FTFE     0x80000000

#define UCC_GETH_UPSMR_PTPE     0x40000000

#define UCC_GETH_UPSMR_ECM      0x04000000

#define UCC_GETH_UPSMR_HSE      0x02000000

#define UCC_GETH_UPSMR_PRO      0x00400000

#define UCC_GETH_UPSMR_CAP      0x00200000

#define UCC_GETH_UPSMR_RSH      0x00100000

#define UCC_GETH_UPSMR_RPM      0x00080000

#define UCC_GETH_UPSMR_R10M     0x00040000

#define UCC_GETH_UPSMR_RLPB     0x00020000

#define UCC_GETH_UPSMR_TBIM     0x00010000

#define UCC_GETH_UPSMR_RES1     0x00002000

#define UCC_GETH_UPSMR_RMM      0x00001000

#define UCC_GETH_UPSMR_CAM      0x00000400

#define UCC_GETH_UPSMR_BRO      0x00000200



/* UCC Transmit On Demand Register (UTODR) */

#define UCC_SLOW_TOD	0x8000

#define UCC_FAST_TOD	0x8000