diff mbox series

powerpc/83xx: update kmeter1 defconfig and dts

Message ID 20191216095006.13590-1-holger.brunck@ch.abb.com (mailing list archive)
State Changes Requested
Headers show
Series powerpc/83xx: update kmeter1 defconfig and dts | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success Successfully applied on branch powerpc/merge (270c0c3e491684893e7250f6c32f4f2eb2e4c3b2)
snowpatch_ozlabs/build-ppc64le success Build succeeded
snowpatch_ozlabs/build-ppc64be success Build succeeded
snowpatch_ozlabs/build-ppc64e success Build succeeded
snowpatch_ozlabs/build-pmac32 success Build succeeded
snowpatch_ozlabs/checkpatch success total: 0 errors, 0 warnings, 0 checks, 99 lines checked

Commit Message

Holger Brunck Dec. 16, 2019, 9:50 a.m. UTC 
From: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>

The defconfig is synchronized and the missing
MTD_PHYSMAP, DEVTMPFS and I2C MUX support are switched on.

Additionally the I2C mux device is added to the DTS with
its attached temperature sensors and I2C clock frequency
is lowered.

Signed-off-by: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
CC: Heiko Schocher <hs@denx.de>
CC: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/boot/dts/kmeter1.dts           | 40 ++++++++++++++++++++++++++++-
 arch/powerpc/configs/83xx/kmeter1_defconfig | 20 +++++++++------
 2 files changed, 51 insertions(+), 9 deletions(-)

Comments

Christophe Leroy Sept. 7, 2022, 5:25 p.m. UTC | #1 
Le 16/12/2019 à 10:50, Holger Brunck a écrit :
> From: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
> 
> The defconfig is synchronized and the missing
> MTD_PHYSMAP, DEVTMPFS and I2C MUX support are switched on.
> 
> Additionally the I2C mux device is added to the DTS with
> its attached temperature sensors and I2C clock frequency
> is lowered.

This patch doesn't apply.

Is it still relevant ?

Thanks
Christophe

> 
> Signed-off-by: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
> Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
> CC: Heiko Schocher <hs@denx.de>
> CC: Michael Ellerman <mpe@ellerman.id.au>
> ---
>   arch/powerpc/boot/dts/kmeter1.dts           | 40 ++++++++++++++++++++++++++++-
>   arch/powerpc/configs/83xx/kmeter1_defconfig | 20 +++++++++------
>   2 files changed, 51 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/kmeter1.dts b/arch/powerpc/boot/dts/kmeter1.dts
> index 154f5d293fd3..bc33f3ad19a3 100644
> --- a/arch/powerpc/boot/dts/kmeter1.dts
> +++ b/arch/powerpc/boot/dts/kmeter1.dts
> @@ -70,7 +70,45 @@
>   			reg = <0x3000 0x100>;
>   			interrupts = <14 0x8>;
>   			interrupt-parent = <&ipic>;
> -			clock-frequency = <400000>;
> +			clock-frequency = <100000>;
> +
> +			mux@70 {
> +				compatible = "nxp,pca9547";
> +				reg = <0x70>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				i2c@2 {
> +					reg = <2>;
> +					#address-cells = <1>;
> +					#size-cells = <0>;
> +
> +					/* Temperature sensors */
> +					temp@48 {
> +						label = "Top";
> +						compatible = "national,lm75";
> +						reg = <0x48>;
> +					};
> +
> +					temp@49 {
> +						label = "Control";
> +						compatible = "national,lm75";
> +						reg = <0x49>;
> +					};
> +
> +					temp@4a {
> +						label = "Power";
> +						compatible = "national,lm75";
> +						reg = <0x4a>;
> +					};
> +
> +					temp@4b {
> +						label = "Front";
> +						compatible = "national,lm75";
> +						reg = <0x4b>;
> +					};
> +				};
> +			};
>   		};
>   
>   		serial0: serial@4500 {
> diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
> index 648c6b3dccf9..72abd8ae654a 100644
> --- a/arch/powerpc/configs/83xx/kmeter1_defconfig
> +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
> @@ -3,22 +3,20 @@ CONFIG_SYSVIPC=y
>   CONFIG_POSIX_MQUEUE=y
>   CONFIG_NO_HZ=y
>   CONFIG_HIGH_RES_TIMERS=y
> +CONFIG_PREEMPT=y
>   CONFIG_LOG_BUF_SHIFT=14
>   CONFIG_EXPERT=y
>   CONFIG_SLAB=y
> -CONFIG_MODULES=y
> -CONFIG_MODULE_UNLOAD=y
> -# CONFIG_BLK_DEV_BSG is not set
> -CONFIG_PARTITION_ADVANCED=y
> -# CONFIG_MSDOS_PARTITION is not set
> -# CONFIG_IOSCHED_DEADLINE is not set
> -# CONFIG_IOSCHED_CFQ is not set
>   # CONFIG_PPC_CHRP is not set
>   # CONFIG_PPC_PMAC is not set
>   CONFIG_PPC_83xx=y
>   CONFIG_KMETER1=y
> -CONFIG_PREEMPT=y
>   # CONFIG_SECCOMP is not set
> +CONFIG_MODULES=y
> +CONFIG_MODULE_UNLOAD=y
> +# CONFIG_BLK_DEV_BSG is not set
> +CONFIG_PARTITION_ADVANCED=y
> +# CONFIG_MSDOS_PARTITION is not set
>   CONFIG_NET=y
>   CONFIG_PACKET=y
>   CONFIG_UNIX=y
> @@ -29,12 +27,15 @@ CONFIG_IP_PNP=y
>   CONFIG_TIPC=y
>   CONFIG_BRIDGE=m
>   CONFIG_VLAN_8021Q=y
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
>   CONFIG_MTD=y
>   CONFIG_MTD_CMDLINE_PARTS=y
>   CONFIG_MTD_BLOCK=y
>   CONFIG_MTD_CFI=y
>   CONFIG_MTD_CFI_INTELEXT=y
>   CONFIG_MTD_CFI_AMDSTD=y
> +CONFIG_MTD_PHYSMAP=y
>   CONFIG_MTD_PHYSMAP_OF=y
>   CONFIG_MTD_PHRAM=y
>   CONFIG_MTD_UBI=y
> @@ -57,7 +58,10 @@ CONFIG_SERIAL_8250_CONSOLE=y
>   CONFIG_HW_RANDOM=y
>   CONFIG_I2C=y
>   CONFIG_I2C_CHARDEV=y
> +CONFIG_I2C_MUX=y
> +CONFIG_I2C_MUX_PCA954x=y
>   CONFIG_I2C_MPC=y
> +CONFIG_GPIOLIB=y
>   # CONFIG_HWMON is not set
>   # CONFIG_USB_SUPPORT is not set
>   CONFIG_UIO=y
Michael Ellerman Sept. 7, 2022, 11:13 p.m. UTC | #2 
Christophe Leroy <christophe.leroy@csgroup.eu> writes:
> Le 16/12/2019 à 10:50, Holger Brunck a écrit :
>> From: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
>> 
>> The defconfig is synchronized and the missing
>> MTD_PHYSMAP, DEVTMPFS and I2C MUX support are switched on.
>> 
>> Additionally the I2C mux device is added to the DTS with
>> its attached temperature sensors and I2C clock frequency
>> is lowered.
>
> This patch doesn't apply.
>
> Is it still relevant ?

If so it should be split into two patches.

cheers
Holger Brunck Sept. 19, 2022, 2:25 p.m. UTC | #3 
> > Le 16/12/2019 à 10:50, Holger Brunck a écrit :
> >> From: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
> >>
> >> The defconfig is synchronized and the missing MTD_PHYSMAP,
> DEVTMPFS
> >> and I2C MUX support are switched on.
> >>
> >> Additionally the I2C mux device is added to the DTS with its attached
> >> temperature sensors and I2C clock frequency is lowered.
> >
> > This patch doesn't apply.
> >
> > Is it still relevant ?
> 
> If so it should be split into two patches.
> 

Ok. Then you can abandon this one. If I find the time I will split it up and
rebase it and send it as a new patch series with two patches.

Best regards
Holger
Michael Ellerman Sept. 19, 2022, 11:34 p.m. UTC | #4 
Holger Brunck <holger.brunck@hitachienergy.com> writes:
>> > Le 16/12/2019 à 10:50, Holger Brunck a écrit :
>> >> From: Matteo Ghidoni <matteo.ghidoni@ch.abb.com>
>> >>
>> >> The defconfig is synchronized and the missing MTD_PHYSMAP,
>> DEVTMPFS
>> >> and I2C MUX support are switched on.
>> >>
>> >> Additionally the I2C mux device is added to the DTS with its attached
>> >> temperature sensors and I2C clock frequency is lowered.
>> >
>> > This patch doesn't apply.
>> >
>> > Is it still relevant ?
>> 
>> If so it should be split into two patches.
>> 
>
> Ok. Then you can abandon this one. If I find the time I will split it up and
> rebase it and send it as a new patch series with two patches.

Thanks.

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/boot/dts/kmeter1.dts b/arch/powerpc/boot/dts/kmeter1.dts
index 154f5d293fd3..bc33f3ad19a3 100644
--- a/arch/powerpc/boot/dts/kmeter1.dts
+++ b/arch/powerpc/boot/dts/kmeter1.dts
@@ -70,7 +70,45 @@ 
 			reg = <0x3000 0x100>;
 			interrupts = <14 0x8>;
 			interrupt-parent = <&ipic>;
-			clock-frequency = <400000>;
+			clock-frequency = <100000>;
+
+			mux@70 {
+				compatible = "nxp,pca9547";
+				reg = <0x70>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				i2c@2 {
+					reg = <2>;
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					/* Temperature sensors */
+					temp@48 {
+						label = "Top";
+						compatible = "national,lm75";
+						reg = <0x48>;
+					};
+
+					temp@49 {
+						label = "Control";
+						compatible = "national,lm75";
+						reg = <0x49>;
+					};
+
+					temp@4a {
+						label = "Power";
+						compatible = "national,lm75";
+						reg = <0x4a>;
+					};
+
+					temp@4b {
+						label = "Front";
+						compatible = "national,lm75";
+						reg = <0x4b>;
+					};
+				};
+			};
 		};
 
 		serial0: serial@4500 {
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 648c6b3dccf9..72abd8ae654a 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -3,22 +3,20 @@  CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EXPERT=y
 CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MSDOS_PARTITION is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_PPC_CHRP is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_83xx=y
 CONFIG_KMETER1=y
-CONFIG_PREEMPT=y
 # CONFIG_SECCOMP is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_MSDOS_PARTITION is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -29,12 +27,15 @@  CONFIG_IP_PNP=y
 CONFIG_TIPC=y
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_PHRAM=y
 CONFIG_MTD_UBI=y
@@ -57,7 +58,10 @@  CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MPC=y
+CONFIG_GPIOLIB=y
 # CONFIG_HWMON is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_UIO=y